@modern-js/uni-builder 2.62.1 → 2.63.1

package/dist/rspack/index.js

@@ -84,11 +84,14 @@ async function createRspackBuilder(options) {
     ...rest,
     cwd
   });
+  rsbuildConfig.plugins = [
+    ...rsbuildPlugins,
+    ...rsbuildConfig.plugins || []
+  ];
   const rsbuild = await (0, import_core.createRsbuild)({
     cwd,
     rsbuildConfig
   });
-  rsbuild.addPlugins(rsbuildPlugins);
   return {
     ...rsbuild,
     addPlugins: (plugins, options2) => {

package/dist/shared/parseCommonConfig.js

@@ -88,6 +88,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     output: {
       polyfill: polyfill === "ua" ? "off" : polyfill,
       dataUriLimit,
+      sourceMap,
       ...outputConfig
     },
     source: {
@@ -127,7 +128,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     (_output3 = output).cssModules || (_output3.cssModules = {});
     output.cssModules.localIdentName = cssModuleLocalIdentName;
   }
-  if (isUseCssSourceMap(disableSourceMap)) {
+  if (isUseCssSourceMap(disableSourceMap) && output.sourceMap !== true) {
     var _output4;
     (_output4 = output).sourceMap || (_output4.sourceMap = {});
     output.sourceMap.css = true;
@@ -259,7 +260,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   if (!disableTsChecker) {
     const { pluginTypeCheck } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-type-check")));
     rsbuildPlugins.push(pluginTypeCheck({
-      forkTsCheckerOptions: tsChecker
+      tsCheckerOptions: tsChecker
     }));
   }
   if (resolveMainFields) {

package/dist/shared/plugins/devtools.d.ts

@@ -2,5 +2,5 @@ import type { RsbuildPlugin, SourceMap } from '@rsbuild/core';
 import type { DisableSourceMapOption } from '../../types';
 export declare const pluginDevtool: (options: {
     disableSourceMap?: DisableSourceMapOption;
-    sourceMap?: SourceMap;
+    sourceMap?: SourceMap | boolean;
 }) => RsbuildPlugin;

package/dist/shared/plugins/devtools.js

@@ -32,9 +32,10 @@ const pluginDevtool = (options) => ({
   name: "uni-builder:devtool",
   setup(api) {
     var _options_sourceMap;
-    const devtoolJs = (_options_sourceMap = options.sourceMap) === null || _options_sourceMap === void 0 ? void 0 : _options_sourceMap.js;
+    const devtoolJs = typeof options.sourceMap === "boolean" || ((_options_sourceMap = options.sourceMap) === null || _options_sourceMap === void 0 ? void 0 : _options_sourceMap.js) !== void 0;
     if (devtoolJs) {
-      if (!isUseJsSourceMap(options.disableSourceMap)) {
+      var _options_disableSourceMap;
+      if (typeof options.disableSourceMap === "boolean" || ((_options_disableSourceMap = options.disableSourceMap) === null || _options_disableSourceMap === void 0 ? void 0 : _options_disableSourceMap.js) !== void 0) {
         import_utils.logger.warn("Detected that `output.sourceMap` and `output.disableSourceMap` are used together, use the value of `output.sourceMap`");
       }
       return;

package/dist/types.d.ts

@@ -97,7 +97,7 @@ export type UniBuilderExtraConfig = {
         /**
          * Modify the options of [fork-ts-checker-webpack-plugin](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin).
          */
-        tsChecker?: PluginTypeCheckerOptions['forkTsCheckerOptions'];
+        tsChecker?: PluginTypeCheckerOptions['tsCheckerOptions'];
         /**
          * Modify the options of [css-minimizer-webpack-plugin](https://github.com/webpack-contrib/css-minimizer-webpack-plugin).
          */

package/dist/webpack/index.js

@@ -40,7 +40,7 @@ var import_babel = require("./plugins/babel");
 var import_moduleScopes = require("./plugins/moduleScopes");
 var import_react = require("./plugins/react");
 async function parseConfig(uniBuilderConfig, options) {
-  var _uniBuilderConfig_tools, _uniBuilderConfig_performance, _uniBuilderConfig_tools1, _uniBuilderConfig_output, _uniBuilderConfig_security, _uniBuilderConfig_experiments, _uniBuilderConfig_tools2;
+  var _uniBuilderConfig_tools, _uniBuilderConfig_performance, _uniBuilderConfig_tools1, _uniBuilderConfig_output, _uniBuilderConfig_security, _uniBuilderConfig_experiments, _uniBuilderConfig_tools2, _uniBuilderConfig_source;
   const { rsbuildConfig, rsbuildPlugins } = await (0, import_parseCommonConfig.parseCommonConfig)(uniBuilderConfig, options);
   var _uniBuilderConfig_performance_transformLodash;
   rsbuildPlugins.push((0, import_babel.pluginBabel)({
@@ -77,13 +77,13 @@ async function parseConfig(uniBuilderConfig, options) {
     }
     rsbuildPlugins.push(pluginStyledComponents(options2));
   }
+  rsbuildPlugins.push((0, import_moduleScopes.pluginModuleScopes)((_uniBuilderConfig_source = uniBuilderConfig.source) === null || _uniBuilderConfig_source === void 0 ? void 0 : _uniBuilderConfig_source.moduleScopes));
   return {
     rsbuildConfig,
     rsbuildPlugins
   };
 }
 async function createWebpackBuilder(options) {
-  var _options_config_source;
   const { cwd = process.cwd(), config, ...rest } = options;
   const { rsbuildConfig, rsbuildPlugins } = await parseConfig(config, {
     ...rest,
@@ -94,14 +94,14 @@ async function createWebpackBuilder(options) {
   const { default: HtmlWebpackPlugin } = await Promise.resolve().then(() => __toESM(require("html-webpack-plugin")));
   setHTMLPlugin(HtmlWebpackPlugin);
   rsbuildConfig.provider = webpackProvider;
+  rsbuildConfig.plugins = [
+    ...rsbuildPlugins,
+    ...rsbuildConfig.plugins || []
+  ];
   const rsbuild = await (0, import_core.createRsbuild)({
     rsbuildConfig,
     cwd
   });
-  rsbuild.addPlugins([
-    ...rsbuildPlugins,
-    (0, import_moduleScopes.pluginModuleScopes)((_options_config_source = options.config.source) === null || _options_config_source === void 0 ? void 0 : _options_config_source.moduleScopes)
-  ]);
   return {
     ...rsbuild,
     addPlugins: (plugins, options2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.62.1",
+  "version": "2.63.1",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,24 +26,24 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.26.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
-    "@rsbuild/core": "~1.1.0",
-    "@rsbuild/plugin-assets-retry": "~1.0.1",
-    "@rsbuild/plugin-babel": "~1.0.1",
-    "@rsbuild/plugin-check-syntax": "~1.1.0",
-    "@rsbuild/plugin-css-minimizer": "~1.0.2",
-    "@rsbuild/plugin-less": "~1.1.0",
-    "@rsbuild/plugin-pug": "~1.0.2",
-    "@rsbuild/plugin-react": "~1.0.3",
-    "@rsbuild/plugin-rem": "~1.0.1",
-    "@rsbuild/plugin-sass": "~1.1.0",
-    "@rsbuild/plugin-source-build": "~1.0.1",
-    "@rsbuild/plugin-styled-components": "~1.1.0",
-    "@rsbuild/plugin-svgr": "~1.0.3",
-    "@rsbuild/plugin-toml": "~1.0.1",
-    "@rsbuild/plugin-type-check": "~1.0.1",
-    "@rsbuild/plugin-typed-css-modules": "~1.0.2",
-    "@rsbuild/plugin-yaml": "~1.0.2",
-    "@rsbuild/webpack": "~1.1.0",
+    "@rsbuild/core": "1.1.8",
+    "@rsbuild/plugin-assets-retry": "1.0.6",
+    "@rsbuild/plugin-babel": "1.0.3",
+    "@rsbuild/plugin-check-syntax": "1.1.0",
+    "@rsbuild/plugin-css-minimizer": "1.0.2",
+    "@rsbuild/plugin-less": "1.1.0",
+    "@rsbuild/plugin-pug": "1.0.2",
+    "@rsbuild/plugin-react": "1.0.7",
+    "@rsbuild/plugin-rem": "1.0.2",
+    "@rsbuild/plugin-sass": "1.1.1",
+    "@rsbuild/plugin-source-build": "1.0.1",
+    "@rsbuild/plugin-styled-components": "1.1.0",
+    "@rsbuild/plugin-svgr": "1.0.5",
+    "@rsbuild/plugin-toml": "1.0.1",
+    "@rsbuild/plugin-type-check": "1.1.0",
+    "@rsbuild/plugin-typed-css-modules": "1.0.2",
+    "@rsbuild/plugin-yaml": "1.0.2",
+    "@rsbuild/webpack": "1.1.4",
     "@swc/helpers": "0.5.13",
     "autoprefixer": "10.4.20",
     "babel-loader": "9.1.3",
@@ -58,33 +58,33 @@
     "lodash": "^4.17.21",
     "picocolors": "^1.0.1",
     "postcss": "^8.4.35",
-    "postcss-custom-properties": "13.1.5",
+    "postcss-custom-properties": "13.3.12",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
     "postcss-initial": "4.0.1",
     "postcss-media-minmax": "5.0.0",
-    "postcss-nesting": "12.0.1",
+    "postcss-nesting": "12.1.5",
     "postcss-page-break": "3.0.4",
     "react-refresh": "^0.14.0",
     "rspack-manifest-plugin": "5.0.2",
     "terser-webpack-plugin": "5.3.10",
-    "ts-deepmerge": "7.0.1",
+    "ts-deepmerge": "7.0.2",
     "ts-loader": "9.4.4",
     "webpack": "^5.96.1",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/babel-preset": "2.62.1",
-    "@modern-js/utils": "2.62.1"
+    "@modern-js/babel-preset": "2.63.1",
+    "@modern-js/utils": "2.63.1"
   },
   "devDependencies": {
-    "@rsbuild/plugin-webpack-swc": "~1.0.3",
+    "@rsbuild/plugin-webpack-swc": "1.0.9",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/lodash": "^4.14.202",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@scripts/vitest-config": "2.62.1",
-    "@scripts/build": "2.62.1"
+    "@scripts/vitest-config": "2.63.1",
+    "@scripts/build": "2.63.1"
   },
   "publishConfig": {
     "access": "public",