@modern-js/uni-builder 2.51.0 → 2.53.0

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import type { CreateUniBuilderOptions } from './types';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 export { HtmlWebpackPlugin };
 export type { CreateUniBuilderOptions, UniBuilderInstance, UniBuilderWebpackInstance, };
-export type { BundlerChain, RsbuildPlugin, ChainedConfig, CopyPluginOptions, ChainIdentifier, NormalizedConfig, RspackConfig, CacheGroup, } from '@rsbuild/shared';
+export type { BundlerChain, RsbuildPlugin, ConfigChain, CopyPluginOptions, ChainIdentifier, NormalizedConfig, RspackConfig, CacheGroup, } from '@rsbuild/shared';
 export type { UniBuilderConfig, UniBuilderPlugin } from './types';
 export type { StartDevServerOptions } from './shared/devServer';
 export declare function createUniBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderInstance>;

package/dist/shared/devServer.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { StartDevServerOptions as RsbuildStartDevServerOptions, DevConfig, ServerConfig } from '@rsbuild/shared';
-import { RsbuildInstance } from '@rsbuild/core';
+import type { RsbuildInstance } from '@rsbuild/core';
 import type { ModernDevServerOptions } from '@modern-js/server';
 import type { Server } from 'node:http';
 import { type InitProdMiddlewares } from '@modern-js/prod-server';

package/dist/shared/devServer.js

@@ -33,6 +33,7 @@ __export(devServer_exports, {
 });
 module.exports = __toCommonJS(devServer_exports);
 var import_shared = require("@rsbuild/shared");
+var import_utils = require("@modern-js/utils");
 var import_prod_server = require("@modern-js/prod-server");
 const getServerOptions = (builderConfig) => {
   var _builderConfig_output_distPath, _builderConfig_output, _builderConfig_output1, _builderConfig_output2;
@@ -58,22 +59,18 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
   var _newDevServerConfig_devMiddleware, _newDevServerConfig_before, _newDevServerConfig_after;
   const { port = 8080, host, https, ...devConfig } = dev;
   var _dev_hmr;
-  const newDevServerConfig = (0, import_shared.mergeChainedOptions)({
-    defaults: {
-      devMiddleware: {
-        writeToDisk: (file) => !file.includes(".hot-update.")
-      },
-      hot: (_dev_hmr = dev === null || dev === void 0 ? void 0 : dev.hmr) !== null && _dev_hmr !== void 0 ? _dev_hmr : true,
-      liveReload: true,
-      client: {
-        path: "/webpack-hmr",
-        overlay: false,
-        ...devConfig.client || {}
-      }
+  const newDevServerConfig = (0, import_utils.applyOptionsChain)({
+    devMiddleware: {
+      writeToDisk: (file) => !file.includes(".hot-update.")
     },
-    options: devServer,
-    mergeFn: import_shared.deepmerge
-  });
+    hot: (_dev_hmr = dev === null || dev === void 0 ? void 0 : dev.hmr) !== null && _dev_hmr !== void 0 ? _dev_hmr : true,
+    liveReload: true,
+    client: {
+      path: "/webpack-hmr",
+      overlay: false,
+      ...devConfig.client || {}
+    }
+  }, devServer, {}, import_shared.deepmerge);
   const rsbuildDev = {
     ...devConfig,
     writeToDisk: (_newDevServerConfig_devMiddleware = newDevServerConfig.devMiddleware) === null || _newDevServerConfig_devMiddleware === void 0 ? void 0 : _newDevServerConfig_devMiddleware.writeToDisk,

package/dist/shared/plugins/globalVars.js

@@ -21,7 +21,7 @@ __export(globalVars_exports, {
   pluginGlobalVars: () => pluginGlobalVars
 });
 module.exports = __toCommonJS(globalVars_exports);
-var import_shared = require("@rsbuild/shared");
+var import_utils = require("@modern-js/utils");
 const pluginGlobalVars = (options) => ({
   name: "uni-builder:global-vars",
   setup(api) {
@@ -29,13 +29,9 @@ const pluginGlobalVars = (options) => ({
       if (!options) {
         return;
       }
-      const globalVars = (0, import_shared.mergeChainedOptions)({
-        defaults: {},
-        options,
-        utils: {
-          env,
-          target
-        }
+      const globalVars = (0, import_utils.applyOptionsChain)({}, options, {
+        env,
+        target
       });
       const serializedVars = {};
       Object.entries(globalVars).forEach(([key, value]) => {

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import type { NodeEnv, MetaOptions, ServerConfig, ScriptInject, RsbuildTarget, ChainedConfig, ChainedConfigWithUtils, InlineChunkTest, DevConfig, RequestHandler, RsbuildEntry, MaybePromise, RsbuildPluginAPI, ArrayOrNot, HtmlTagDescriptor, Polyfill } from '@rsbuild/shared';
-import type { RsbuildConfig } from '@rsbuild/core';
+import type { NodeEnv, MetaOptions, ConfigChain, ConfigChainWithContext, InlineChunkTest, RequestHandler, MaybePromise, HtmlTagDescriptor } from '@rsbuild/shared';
+import type { DevConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, RsbuildEntry, ServerConfig, RsbuildPluginAPI } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
 import type { PluginRemOptions } from '@rsbuild/plugin-rem';
@@ -16,6 +16,7 @@ import type { AliasOption } from '@modern-js/utils';
 import type { StartDevServerOptions, UniBuilderStartServerResult } from './shared/devServer';
 import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
 import type TerserPlugin from 'terser-webpack-plugin';
+type ArrayOrNot<T> = T | T[];
 export type CreateBuilderCommonOptions = {
     entry?: RsbuildEntry;
     frameworkConfigPath?: string;
@@ -28,7 +29,7 @@ export type CreateUniBuilderOptions = {
     config: UniBuilderConfig;
 } & Partial<CreateBuilderCommonOptions>;
 export type GlobalVars = Record<string, any>;
-export type ChainedGlobalVars = ChainedConfigWithUtils<GlobalVars, {
+export type ChainedGlobalVars = ConfigChainWithContext<GlobalVars, {
     env: NodeEnv;
     target: RsbuildTarget;
 }>;
@@ -42,7 +43,7 @@ export type DisableSourceMapOption = boolean | {
     js?: boolean;
     css?: boolean;
 };
-export type ToolsDevServerConfig = ChainedConfig<{
+export type ToolsDevServerConfig = ConfigChain<{
     before?: RequestHandler[];
     after?: RequestHandler[];
     client?: DevConfig['client'];
@@ -59,7 +60,7 @@ export type ToolsDevServerConfig = ChainedConfig<{
     proxy?: ServerConfig['proxy'];
 }>;
 export type TerserPluginOptions = TerserPlugin.BasePluginOptions & TerserPlugin.DefinedDefaultMinimizerAndOptions<TerserPlugin.TerserOptions>;
-export type ToolsTerserConfig = ChainedConfig<TerserPluginOptions>;
+export type ToolsTerserConfig = ConfigChain<TerserPluginOptions>;
 export type UniBuilderExtraConfig = {
     tools?: {
         styledComponents?: false | PluginStyledComponentsOptions;
@@ -128,7 +129,7 @@ export type UniBuilderExtraConfig = {
          * Restrict importing paths. After configuring this option, all source files can only import code from
          * the specific paths, and import code from other paths is not allowed.
          */
-        moduleScopes?: ChainedConfig<ModuleScopes>;
+        moduleScopes?: ConfigChain<ModuleScopes>;
         /**
          * This configuration will determine which field of `package.json` you use to import the `npm` module.
          * Same as the [resolve.mainFields](https://webpack.js.org/configuration/resolve/#resolvemainfields) config of webpack.
@@ -343,3 +344,4 @@ export type UniBuilderConfig = {
     source?: Omit<NonNullable<RsbuildConfig['source']>, 'alias'>;
     plugins?: RsbuildConfig['plugins'];
 } & UniBuilderExtraConfig;
+export {};

package/dist/webpack/plugins/babel.js

@@ -113,13 +113,9 @@ const pluginBabel = (options, extraOptions) => ({
               }
             ]);
           }
-          const babelConfig = (0, import_shared.mergeChainedOptions)({
-            defaults: baseBabelConfig,
-            options: options === null || options === void 0 ? void 0 : options.babelLoaderOptions,
-            utils: {
-              ...(0, import_plugin_babel.getBabelUtils)(baseBabelConfig),
-              ...babelUtils
-            }
+          const babelConfig = (0, import_utils.applyOptionsChain)(baseBabelConfig, options === null || options === void 0 ? void 0 : options.babelLoaderOptions, {
+            ...(0, import_plugin_babel.getBabelUtils)(baseBabelConfig),
+            ...babelUtils
           });
           const finalOptions = {
             babelrc: false,

package/dist/webpack/plugins/minimize.js

@@ -32,6 +32,7 @@ __export(minimize_exports, {
 });
 module.exports = __toCommonJS(minimize_exports);
 var import_shared = require("@rsbuild/shared");
+var import_utils = require("@modern-js/utils");
 function applyRemoveConsole(options, config) {
   const { removeConsole } = config.performance;
   const compressOptions = typeof options.terserOptions.compress === "boolean" ? {} : options.terserOptions.compress || {};
@@ -76,10 +77,7 @@ async function applyJSMinimizer(chain, config, userTerserConfig) {
     default:
       break;
   }
-  const mergedOptions = (0, import_shared.mergeChainedOptions)({
-    defaults: DEFAULT_OPTIONS,
-    options: userTerserConfig
-  });
+  const mergedOptions = (0, import_utils.applyOptionsChain)(DEFAULT_OPTIONS, userTerserConfig);
   chain.optimization.minimizer(import_shared.CHAIN_ID.MINIMIZER.JS).use(TerserPlugin, [
     // Due to terser-webpack-plugin has changed the type of class, which using a generic type in
     // constructor, leading auto inference of parameters of plugin constructor is not possible, using any instead

package/dist/webpack/plugins/moduleScopes.d.ts

@@ -1,6 +1,6 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-import { type ChainedConfig } from '@rsbuild/shared';
+import { type ConfigChain } from '@rsbuild/shared';
 import type { ModuleScopes } from '../../types';
 export declare const isPrimitiveScope: (items: unknown[]) => items is (string | RegExp)[];
-export declare const applyScopeChain: (defaults: ModuleScopes, options: ChainedConfig<ModuleScopes>) => ModuleScopes;
-export declare const pluginModuleScopes: (moduleScopes?: ChainedConfig<ModuleScopes>) => RsbuildPlugin;
+export declare const applyScopeChain: (defaults: ModuleScopes, options: ConfigChain<ModuleScopes>) => ModuleScopes;
+export declare const pluginModuleScopes: (moduleScopes?: ConfigChain<ModuleScopes>) => RsbuildPlugin;

package/dist/webpack/plugins/styledComponents.d.ts

@@ -1,4 +1,4 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-import { type ChainedConfig } from '@rsbuild/shared';
+import { type ConfigChain } from '@rsbuild/shared';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
-export declare const pluginStyledComponents: (userConfig?: ChainedConfig<PluginStyledComponentsOptions>) => RsbuildPlugin;
+export declare const pluginStyledComponents: (userConfig?: ConfigChain<PluginStyledComponentsOptions>) => RsbuildPlugin;

package/dist/webpack/plugins/styledComponents.js

@@ -33,6 +33,7 @@ __export(styledComponents_exports, {
 module.exports = __toCommonJS(styledComponents_exports);
 var import_core = require("@rsbuild/core");
 var import_shared = require("@rsbuild/shared");
+var import_utils = require("@modern-js/utils");
 const getDefaultStyledComponentsConfig = (isProd, ssr) => {
   return {
     ssr,
@@ -52,10 +53,7 @@ const pluginStyledComponents = (userConfig = {}) => ({
   setup(api) {
     api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd }) => {
       const isSSR = (0, import_shared.isServerTarget)(api.context.targets);
-      const styledComponentsOptions = (0, import_shared.mergeChainedOptions)({
-        defaults: getDefaultStyledComponentsConfig(isProd, isSSR),
-        options: userConfig
-      });
+      const styledComponentsOptions = (0, import_utils.applyOptionsChain)(getDefaultStyledComponentsConfig(isProd, isSSR), userConfig);
       if (!styledComponentsOptions) {
         return;
       }

package/dist/webpack/plugins/tsLoader.d.ts

@@ -1,9 +1,9 @@
-import { type FileFilterUtil, type ChainedConfigWithUtils } from '@rsbuild/shared';
+import { type FileFilterUtil, type ConfigChainWithContext } from '@rsbuild/shared';
 import { PluginBabelOptions } from '@rsbuild/plugin-babel';
 import type { RsbuildPlugin } from '@rsbuild/core';
 import type { Options as RawTSLoaderOptions } from 'ts-loader';
 export type TSLoaderOptions = Partial<RawTSLoaderOptions>;
-export type PluginTsLoaderOptions = ChainedConfigWithUtils<TSLoaderOptions, {
+export type PluginTsLoaderOptions = ConfigChainWithContext<TSLoaderOptions, {
     /**
      * use `source.include` instead
      * @deprecated

package/dist/webpack/plugins/tsLoader.js

@@ -32,6 +32,7 @@ __export(tsLoader_exports, {
 });
 module.exports = __toCommonJS(tsLoader_exports);
 var import_shared = require("@rsbuild/shared");
+var import_utils = require("@modern-js/utils");
 var import_plugin_babel = require("@rsbuild/plugin-babel");
 var import_web = require("@rsbuild/babel-preset/web");
 var import_babel = require("./babel");
@@ -57,11 +58,7 @@ const pluginTsLoader = (options, babelOptions) => {
           });
           (_baseBabelConfig_presets = baseBabelConfig.presets) === null || _baseBabelConfig_presets === void 0 ? void 0 : _baseBabelConfig_presets.push((0, import_babel.getPresetReact)(api.context.rootPath, isProd));
           const babelUtils = (0, import_plugin_babel.getBabelUtils)(baseBabelConfig);
-          const babelLoaderOptions = (0, import_shared.mergeChainedOptions)({
-            defaults: baseBabelConfig,
-            options: babelOptions,
-            utils: babelUtils
-          });
+          const babelLoaderOptions = (0, import_utils.applyOptionsChain)(baseBabelConfig, babelOptions, babelUtils);
           const includes = [];
           const excludes = [];
           const tsLoaderUtils = {
@@ -80,12 +77,12 @@ const pluginTsLoader = (options, babelOptions) => {
             transpileOnly: true,
             allowTsInNodeModules: true
           };
-          const tsLoaderOptions = (0, import_shared.mergeChainedOptions)({
-            defaults: tsLoaderDefaultOptions,
+          const tsLoaderOptions = (0, import_utils.applyOptionsChain)(
             // @ts-expect-error ts-loader has incorrect types for compilerOptions
+            tsLoaderDefaultOptions,
             options,
-            utils: tsLoaderUtils
-          });
+            tsLoaderUtils
+          );
           const rule = chain.module.rule(CHAIN_ID.RULE.TS);
           (0, import_shared.applyScriptCondition)({
             chain,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.51.0",
+  "version": "2.53.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,26 +26,26 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.23.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.7.1",
-    "@rsbuild/core": "0.7.1",
-    "@rsbuild/plugin-sass": "0.7.1",
-    "@rsbuild/plugin-less": "0.7.1",
-    "@rsbuild/plugin-assets-retry": "0.7.1",
-    "@rsbuild/plugin-babel": "0.7.1",
-    "@rsbuild/plugin-check-syntax": "0.7.1",
-    "@rsbuild/plugin-css-minimizer": "0.7.1",
-    "@rsbuild/plugin-pug": "0.7.1",
-    "@rsbuild/plugin-react": "0.7.1",
-    "@rsbuild/plugin-rem": "0.7.1",
-    "@rsbuild/plugin-source-build": "0.7.1",
-    "@rsbuild/plugin-styled-components": "0.7.1",
-    "@rsbuild/plugin-svgr": "0.7.1",
-    "@rsbuild/plugin-type-check": "0.7.1",
-    "@rsbuild/plugin-typed-css-modules": "0.7.1",
-    "@rsbuild/plugin-toml": "0.7.1",
-    "@rsbuild/plugin-yaml": "0.7.1",
-    "@rsbuild/shared": "0.7.1",
-    "@rsbuild/webpack": "0.7.1",
+    "@rsbuild/babel-preset": "0.7.3",
+    "@rsbuild/core": "0.7.3",
+    "@rsbuild/plugin-sass": "0.7.3",
+    "@rsbuild/plugin-less": "0.7.3",
+    "@rsbuild/plugin-assets-retry": "0.7.3",
+    "@rsbuild/plugin-babel": "0.7.3",
+    "@rsbuild/plugin-check-syntax": "0.7.3",
+    "@rsbuild/plugin-css-minimizer": "0.7.3",
+    "@rsbuild/plugin-pug": "0.7.3",
+    "@rsbuild/plugin-react": "0.7.3",
+    "@rsbuild/plugin-rem": "0.7.3",
+    "@rsbuild/plugin-source-build": "0.7.3",
+    "@rsbuild/plugin-styled-components": "0.7.3",
+    "@rsbuild/plugin-svgr": "0.7.3",
+    "@rsbuild/plugin-type-check": "0.7.3",
+    "@rsbuild/plugin-typed-css-modules": "0.7.3",
+    "@rsbuild/plugin-toml": "0.7.3",
+    "@rsbuild/plugin-yaml": "0.7.3",
+    "@rsbuild/shared": "0.7.3",
+    "@rsbuild/webpack": "0.7.3",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -69,18 +69,18 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.91.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/prod-server": "2.51.0",
-    "@modern-js/utils": "2.51.0",
-    "@modern-js/server": "2.51.0"
+    "@modern-js/server": "2.53.0",
+    "@modern-js/utils": "2.53.0",
+    "@modern-js/prod-server": "2.53.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.7.1",
+    "@rsbuild/plugin-swc": "0.7.3",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/build": "2.51.0",
-    "@scripts/vitest-config": "2.51.0"
+    "@scripts/build": "2.53.0",
+    "@scripts/vitest-config": "2.53.0"
   },
   "publishConfig": {
     "access": "public",