npm - @modern-js/uni-builder - Versions diffs - 2.46.0 → 2.47.0 - Mend

@modern-js/uni-builder 2.46.0 → 2.47.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/rspack/plugins/babel-post.js +11 -9
package/dist/shared/devServer.js +4 -10
package/dist/shared/parseCommonConfig.js +105 -83
package/dist/shared/plugins/antd.d.ts +2 -0
package/dist/shared/plugins/antd.js +69 -0
package/dist/shared/plugins/arco.d.ts +2 -0
package/dist/shared/plugins/arco.js +61 -0
package/dist/shared/plugins/fallback.js +5 -2
package/dist/shared/plugins/postcssLegacy.js +1 -0
package/dist/shared/plugins/splitChunk.js +5 -4
package/dist/types.d.ts +18 -0
package/dist/webpack/index.js +4 -1
package/dist/webpack/plugins/babel.d.ts +14 -1
package/dist/webpack/plugins/babel.js +114 -102
package/dist/webpack/plugins/styledComponents.js +5 -0
package/dist/webpack/plugins/tsLoader.js +65 -53
package/package.json +25 -25

package/dist/rspack/plugins/babel-post.js CHANGED Viewed

@@ -35,17 +35,19 @@ var import_isEqual = __toESM(require("lodash/isEqual"));
 var import_plugin_babel = require("@rsbuild/plugin-babel");
 const pluginBabelPost = () => ({
   name: "uni-builder:babel-post",
-  pre: [
-    "rsbuild:babel"
-  ],
   setup(api) {
-    api.modifyBundlerChain(async (chain, { CHAIN_ID }) => {
-      if (chain.module.rules.get(CHAIN_ID.RULE.JS)) {
-        const babelLoaderOptions = chain.module.rule(CHAIN_ID.RULE.JS).use(CHAIN_ID.USE.BABEL).get("options");
-        if (babelLoaderOptions && (0, import_isEqual.default)((0, import_plugin_babel.getDefaultBabelOptions)(), babelLoaderOptions)) {
-          chain.module.rule(CHAIN_ID.RULE.JS).uses.delete(CHAIN_ID.USE.BABEL);
+    api.modifyBundlerChain({
+      handler: async (chain, { CHAIN_ID }) => {
+        if (chain.module.rules.get(CHAIN_ID.RULE.JS)) {
+          const babelLoaderOptions = chain.module.rule(CHAIN_ID.RULE.JS).use(CHAIN_ID.USE.BABEL).get("options");
+          const config = api.getNormalizedConfig();
+          if (babelLoaderOptions && (0, import_isEqual.default)((0, import_plugin_babel.getDefaultBabelOptions)(config.source.decorators), babelLoaderOptions)) {
+            chain.module.rule(CHAIN_ID.RULE.JS).uses.delete(CHAIN_ID.USE.BABEL);
+          }
         }
-      }
+      },
+      // other plugins can modify babel config in modifyBundlerChain 'default order'
+      order: "post"
     });
   }
 });

package/dist/shared/devServer.js CHANGED Viewed

@@ -53,18 +53,12 @@ const getServerOptions = (builderConfig) => {
   };
 };
 const getDevServerOptions = async ({ builderConfig, serverOptions, port }) => {
-  var _builderConfig_dev, _builderConfig_dev1, _builderConfig_dev2, _builderConfig_tools;
-  var _builderConfig_dev_hmr, _builderConfig_dev_hmr1;
+  var _builderConfig_dev, _builderConfig_tools;
   const defaultDevConfig = (0, import_shared.deepmerge)(
     {
-      hot: (_builderConfig_dev_hmr = (_builderConfig_dev = builderConfig.dev) === null || _builderConfig_dev === void 0 ? void 0 : _builderConfig_dev.hmr) !== null && _builderConfig_dev_hmr !== void 0 ? _builderConfig_dev_hmr : true,
       watch: true,
-      client: {
-        port: port.toString()
-      },
       port,
-      liveReload: (_builderConfig_dev_hmr1 = (_builderConfig_dev1 = builderConfig.dev) === null || _builderConfig_dev1 === void 0 ? void 0 : _builderConfig_dev1.hmr) !== null && _builderConfig_dev_hmr1 !== void 0 ? _builderConfig_dev_hmr1 : true,
-      https: (_builderConfig_dev2 = builderConfig.dev) === null || _builderConfig_dev2 === void 0 ? void 0 : _builderConfig_dev2.https
+      https: (_builderConfig_dev = builderConfig.dev) === null || _builderConfig_dev === void 0 ? void 0 : _builderConfig_dev.https
     },
     // merge devServerOptions from serverOptions
     serverOptions.dev || {}
@@ -127,8 +121,8 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
         port,
         routes: [
           {
-            route: "/",
-            name: "index"
+            pathname: "/",
+            entryName: "index"
           }
         ]
       });

package/dist/shared/parseCommonConfig.js CHANGED Viewed

@@ -45,6 +45,8 @@ var import_plugin_css_minimizer = require("@rsbuild/plugin-css-minimizer");
 var import_postcssLegacy = require("./plugins/postcssLegacy");
 var import_devtools = require("./plugins/devtools");
 var import_emitRouteFile = require("./plugins/emitRouteFile");
+var import_antd = require("./plugins/antd");
+var import_arco = require("./plugins/arco");
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
 const isLooseCssModules = (path) => {
   if (import_shared.NODE_MODULES_REGEX.test(path)) {
@@ -92,17 +94,48 @@ async function getBrowserslistWithDefault(path, config, target) {
   }
   return DEFAULT_BROWSERSLIST[target];
 }
+const isUseCssSourceMap = (disableSourceMap = {}) => {
+  if (typeof disableSourceMap === "boolean") {
+    return !disableSourceMap;
+  }
+  if (disableSourceMap.css === void 0) {
+    return process.env.NODE_ENV !== "production";
+  }
+  return !disableSourceMap.css;
+};
 async function parseCommonConfig(uniBuilderConfig, options) {
-  var _uniBuilderConfig_output, _uniBuilderConfig_output1, _uniBuilderConfig_output2, _uniBuilderConfig_html, _uniBuilderConfig_html1, _uniBuilderConfig_html2, _uniBuilderConfig_html3, _uniBuilderConfig_html4, _uniBuilderConfig_html5, _devServer_devMiddleware, _uniBuilderConfig_source, _uniBuilderConfig_output3, _uniBuilderConfig_security, _uniBuilderConfig_output4, _uniBuilderConfig_source1, _uniBuilderConfig_source2, _uniBuilderConfig_output5, _uniBuilderConfig_output6, _uniBuilderConfig_output7, _uniBuilderConfig_tools, _uniBuilderConfig_output8, _uniBuilderConfig_output9, _uniBuilderConfig_tools1;
+  var _newDevServerConfig_devMiddleware, _uniBuilderConfig_output, _uniBuilderConfig_tools;
   var _output, _output_distPath, _output_distPath1, _output1, _extraConfig, _html, _extraConfig1;
   const { cwd, frameworkConfigPath, entry, target } = options;
-  const rsbuildConfig = (0, import_shared.deepmerge)({}, uniBuilderConfig);
-  const { dev = {}, html = {}, output = {}, tools = {} } = rsbuildConfig;
-  if (output.cssModuleLocalIdentName) {
+  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, disableSourceMap, convertToRem, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, ...sourceConfig } = {}, dev: { port, host, https, ...devConfig } = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, ...toolsConfig } = {} } = uniBuilderConfig;
+  const rsbuildConfig = {
+    plugins,
+    output: outputConfig,
+    source: {
+      alias,
+      ...sourceConfig
+    },
+    performance: performanceConfig,
+    html: htmlConfig,
+    tools: toolsConfig,
+    dev: devConfig,
+    security: securityConfig
+  };
+  const { dev = {}, html = {}, output = {}, source = {} } = rsbuildConfig;
+  if (enableLatestDecorators) {
+    source.decorators = {
+      version: "2022-03"
+    };
+  }
+  if (cssModuleLocalIdentName) {
     var _output2;
     (_output2 = output).cssModules || (_output2.cssModules = {});
-    output.cssModules.localIdentName = output.cssModuleLocalIdentName;
-    delete output.cssModuleLocalIdentName;
+    output.cssModules.localIdentName = cssModuleLocalIdentName;
+  }
+  if (isUseCssSourceMap(disableSourceMap)) {
+    var _output3;
+    (_output3 = output).sourceMap || (_output3.sourceMap = {});
+    output.sourceMap.css = true;
   }
   var _distPath;
   (_distPath = (_output = output).distPath) !== null && _distPath !== void 0 ? _distPath : _output.distPath = {};
@@ -112,22 +145,17 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   (_server = (_output_distPath1 = output.distPath).server) !== null && _server !== void 0 ? _server : _output_distPath1.server = "bundles";
   var _polyfill;
   (_polyfill = (_output1 = output).polyfill) !== null && _polyfill !== void 0 ? _polyfill : _output1.polyfill = "entry";
-  if (output.disableCssModuleExtension) {
-    var _output3, _output_cssModules;
-    (_output3 = output).cssModules || (_output3.cssModules = {});
+  if (disableCssModuleExtension) {
+    var _output4, _output_cssModules;
+    (_output4 = output).cssModules || (_output4.cssModules = {});
     var _auto;
     (_auto = (_output_cssModules = output.cssModules).auto) !== null && _auto !== void 0 ? _auto : _output_cssModules.auto = isLooseCssModules;
-    delete output.cssModuleLocalIdentName;
   }
-  if ((_uniBuilderConfig_output = uniBuilderConfig.output) === null || _uniBuilderConfig_output === void 0 ? void 0 : _uniBuilderConfig_output.enableInlineScripts) {
-    var _uniBuilderConfig_output10;
-    output.inlineScripts = (_uniBuilderConfig_output10 = uniBuilderConfig.output) === null || _uniBuilderConfig_output10 === void 0 ? void 0 : _uniBuilderConfig_output10.enableInlineScripts;
-    delete output.enableInlineScripts;
+  if (enableInlineScripts) {
+    output.inlineScripts = enableInlineScripts;
   }
-  if ((_uniBuilderConfig_output1 = uniBuilderConfig.output) === null || _uniBuilderConfig_output1 === void 0 ? void 0 : _uniBuilderConfig_output1.disableCssExtract) {
-    var _uniBuilderConfig_output11;
-    output.injectStyles = (_uniBuilderConfig_output11 = uniBuilderConfig.output) === null || _uniBuilderConfig_output11 === void 0 ? void 0 : _uniBuilderConfig_output11.disableCssExtract;
-    delete output.disableCssExtract;
+  if (disableCssExtract) {
+    output.injectStyles = disableCssExtract;
   }
   const targets = Array.isArray(target) ? target : [
     target || "web"
@@ -138,40 +166,34 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     overrideBrowserslist[target2] = await getBrowserslistWithDefault(cwd, uniBuilderConfig, target2);
   }
   output.overrideBrowserslist = overrideBrowserslist;
-  if ((_uniBuilderConfig_output2 = uniBuilderConfig.output) === null || _uniBuilderConfig_output2 === void 0 ? void 0 : _uniBuilderConfig_output2.enableInlineStyles) {
-    var _uniBuilderConfig_output12;
-    output.inlineStyles = (_uniBuilderConfig_output12 = uniBuilderConfig.output) === null || _uniBuilderConfig_output12 === void 0 ? void 0 : _uniBuilderConfig_output12.enableInlineStyles;
-    delete output.enableInlineStyles;
+  if (enableInlineStyles) {
+    output.inlineStyles = enableInlineStyles;
+  }
+  if (disableFilenameHash !== void 0) {
+    output.filenameHash = !disableFilenameHash;
   }
   const extraConfig = {};
   (_extraConfig = extraConfig).html || (_extraConfig.html = {});
-  extraConfig.html.outputStructure = html.disableHtmlFolder ? "flat" : "nested";
-  delete html.disableHtmlFolder;
-  if ((_uniBuilderConfig_html = uniBuilderConfig.html) === null || _uniBuilderConfig_html === void 0 ? void 0 : _uniBuilderConfig_html.metaByEntries) {
-    extraConfig.html.meta = ({ entryName }) => uniBuilderConfig.html.metaByEntries[entryName];
-    delete html.metaByEntries;
+  extraConfig.html.outputStructure = disableHtmlFolder ? "flat" : "nested";
+  if (metaByEntries) {
+    extraConfig.html.meta = ({ entryName }) => metaByEntries[entryName];
   }
   var _title;
   (_title = (_html = html).title) !== null && _title !== void 0 ? _title : _html.title = "";
-  if ((_uniBuilderConfig_html1 = uniBuilderConfig.html) === null || _uniBuilderConfig_html1 === void 0 ? void 0 : _uniBuilderConfig_html1.titleByEntries) {
-    extraConfig.html.title = ({ entryName }) => uniBuilderConfig.html.titleByEntries[entryName];
-    delete html.titleByEntries;
+  if (titleByEntries) {
+    extraConfig.html.title = ({ entryName }) => titleByEntries[entryName];
   }
-  if ((_uniBuilderConfig_html2 = uniBuilderConfig.html) === null || _uniBuilderConfig_html2 === void 0 ? void 0 : _uniBuilderConfig_html2.faviconByEntries) {
-    extraConfig.html.favicon = ({ entryName }) => uniBuilderConfig.html.faviconByEntries[entryName];
-    delete html.faviconByEntries;
+  if (faviconByEntries) {
+    extraConfig.html.favicon = ({ entryName }) => faviconByEntries[entryName];
   }
-  if ((_uniBuilderConfig_html3 = uniBuilderConfig.html) === null || _uniBuilderConfig_html3 === void 0 ? void 0 : _uniBuilderConfig_html3.injectByEntries) {
-    extraConfig.html.inject = ({ entryName }) => uniBuilderConfig.html.injectByEntries[entryName];
-    delete html.injectByEntries;
+  if (injectByEntries) {
+    extraConfig.html.inject = ({ entryName }) => injectByEntries[entryName];
   }
-  if ((_uniBuilderConfig_html4 = uniBuilderConfig.html) === null || _uniBuilderConfig_html4 === void 0 ? void 0 : _uniBuilderConfig_html4.templateByEntries) {
-    extraConfig.html.template = ({ entryName }) => uniBuilderConfig.html.templateByEntries[entryName];
-    delete html.templateByEntries;
+  if (templateByEntries) {
+    extraConfig.html.template = ({ entryName }) => templateByEntries[entryName];
   }
-  if ((_uniBuilderConfig_html5 = uniBuilderConfig.html) === null || _uniBuilderConfig_html5 === void 0 ? void 0 : _uniBuilderConfig_html5.templateParametersByEntries) {
-    extraConfig.html.templateParameters = (_, { entryName }) => uniBuilderConfig.html.templateParametersByEntries[entryName];
-    delete html.templateParametersByEntries;
+  if (templateParametersByEntries) {
+    extraConfig.html.templateParameters = (_, { entryName }) => templateParametersByEntries[entryName];
   }
   var _tools;
   (_tools = (_extraConfig1 = extraConfig).tools) !== null && _tools !== void 0 ? _tools : _extraConfig1.tools = {};
@@ -191,24 +213,33 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   if (dev.progressBar === void 0) {
     dev.progressBar = true;
   }
-  const devServer = (0, import_shared.mergeChainedOptions)({
+  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"
       }
     },
-    options: tools.devServer,
+    options: devServer,
     mergeFn: import_shared.deepmerge
   });
-  dev.writeToDisk = (_devServer_devMiddleware = devServer.devMiddleware) === null || _devServer_devMiddleware === void 0 ? void 0 : _devServer_devMiddleware.writeToDisk;
-  const server = (0, import_shared.isProd)() ? {} : {
-    port: dev.port,
-    host: dev.host
+  dev.writeToDisk = (_newDevServerConfig_devMiddleware = newDevServerConfig.devMiddleware) === null || _newDevServerConfig_devMiddleware === void 0 ? void 0 : _newDevServerConfig_devMiddleware.writeToDisk;
+  dev.hmr = newDevServerConfig.hot;
+  dev.client = newDevServerConfig.client;
+  dev.liveReload = newDevServerConfig.liveReload;
+  const server = (0, import_shared.isProd)() ? {
+    publicDir: false
+  } : {
+    publicDir: false,
+    port,
+    host,
+    https: https ? https : void 0
   };
-  delete tools.devServer;
-  delete dev.https;
-  delete dev.port;
-  delete dev.host;
   rsbuildConfig.server = removeUndefinedKey(server);
   rsbuildConfig.dev = removeUndefinedKey(dev);
   rsbuildConfig.html = html;
@@ -221,58 +252,50 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   }
   const rsbuildPlugins = [
     (0, import_splitChunk.pluginSplitChunks)(),
-    (0, import_globalVars.pluginGlobalVars)((_uniBuilderConfig_source = uniBuilderConfig.source) === null || _uniBuilderConfig_source === void 0 ? void 0 : _uniBuilderConfig_source.globalVars),
+    (0, import_globalVars.pluginGlobalVars)(globalVars),
     (0, import_devtools.pluginDevtool)({
-      disableSourceMap: (_uniBuilderConfig_output3 = uniBuilderConfig.output) === null || _uniBuilderConfig_output3 === void 0 ? void 0 : _uniBuilderConfig_output3.disableSourceMap
+      disableSourceMap
     }),
     (0, import_emitRouteFile.pluginEmitRouteFile)(),
     (0, import_plugin_toml.pluginToml)(),
-    (0, import_plugin_yaml.pluginYaml)()
+    (0, import_plugin_yaml.pluginYaml)(),
+    (0, import_antd.pluginAntd)(),
+    (0, import_arco.pluginArco)()
   ];
-  const checkSyntaxOptions = (_uniBuilderConfig_security = uniBuilderConfig.security) === null || _uniBuilderConfig_security === void 0 ? void 0 : _uniBuilderConfig_security.checkSyntax;
-  if (checkSyntaxOptions) {
+  if (checkSyntax) {
     const { pluginCheckSyntax } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-check-syntax")));
-    rsbuildPlugins.push(pluginCheckSyntax(typeof checkSyntaxOptions === "boolean" ? {} : checkSyntaxOptions));
+    rsbuildPlugins.push(pluginCheckSyntax(typeof checkSyntax === "boolean" ? {} : checkSyntax));
   }
-  if (!((_uniBuilderConfig_output4 = uniBuilderConfig.output) === null || _uniBuilderConfig_output4 === void 0 ? void 0 : _uniBuilderConfig_output4.disableTsChecker)) {
-    var _uniBuilderConfig_tools2;
+  if (!disableTsChecker) {
     const { pluginTypeCheck } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-type-check")));
     rsbuildPlugins.push(pluginTypeCheck({
-      forkTsCheckerOptions: (_uniBuilderConfig_tools2 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools2 === void 0 ? void 0 : _uniBuilderConfig_tools2.tsChecker
+      forkTsCheckerOptions: tsChecker
     }));
-    delete output.disableTsChecker;
-    delete tools.tsChecker;
   }
-  if ((_uniBuilderConfig_source1 = uniBuilderConfig.source) === null || _uniBuilderConfig_source1 === void 0 ? void 0 : _uniBuilderConfig_source1.resolveMainFields) {
-    var _uniBuilderConfig_source3;
+  if (resolveMainFields) {
     const { pluginMainFields } = await Promise.resolve().then(() => __toESM(require("./plugins/mainFields")));
-    rsbuildPlugins.push(pluginMainFields((_uniBuilderConfig_source3 = uniBuilderConfig.source) === null || _uniBuilderConfig_source3 === void 0 ? void 0 : _uniBuilderConfig_source3.resolveMainFields));
+    rsbuildPlugins.push(pluginMainFields(resolveMainFields));
   }
-  if ((_uniBuilderConfig_source2 = uniBuilderConfig.source) === null || _uniBuilderConfig_source2 === void 0 ? void 0 : _uniBuilderConfig_source2.resolveExtensionPrefix) {
-    var _uniBuilderConfig_source4;
+  if (resolveExtensionPrefix) {
     const { pluginExtensionPrefix } = await Promise.resolve().then(() => __toESM(require("./plugins/extensionPrefix")));
-    rsbuildPlugins.push(pluginExtensionPrefix((_uniBuilderConfig_source4 = uniBuilderConfig.source) === null || _uniBuilderConfig_source4 === void 0 ? void 0 : _uniBuilderConfig_source4.resolveExtensionPrefix));
+    rsbuildPlugins.push(pluginExtensionPrefix(resolveExtensionPrefix));
   }
-  const remOptions = (_uniBuilderConfig_output5 = uniBuilderConfig.output) === null || _uniBuilderConfig_output5 === void 0 ? void 0 : _uniBuilderConfig_output5.convertToRem;
-  if (remOptions) {
+  if (convertToRem) {
     const { pluginRem } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-rem")));
-    rsbuildPlugins.push(pluginRem(typeof remOptions === "boolean" ? {} : remOptions));
+    rsbuildPlugins.push(pluginRem(typeof convertToRem === "boolean" ? {} : convertToRem));
   }
-  rsbuildPlugins.push((0, import_runtimeChunk.pluginRuntimeChunk)((_uniBuilderConfig_output6 = uniBuilderConfig.output) === null || _uniBuilderConfig_output6 === void 0 ? void 0 : _uniBuilderConfig_output6.disableInlineRuntimeChunk));
+  rsbuildPlugins.push((0, import_runtimeChunk.pluginRuntimeChunk)((_uniBuilderConfig_output = uniBuilderConfig.output) === null || _uniBuilderConfig_output === void 0 ? void 0 : _uniBuilderConfig_output.disableInlineRuntimeChunk));
   const { sourceBuild } = uniBuilderConfig.experiments || {};
   if (sourceBuild) {
     const { pluginSourceBuild } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-source-build")));
     rsbuildPlugins.push(pluginSourceBuild(sourceBuild === true ? {} : sourceBuild));
   }
   rsbuildPlugins.push((0, import_plugin_react.pluginReact)());
-  if (!((_uniBuilderConfig_output7 = uniBuilderConfig.output) === null || _uniBuilderConfig_output7 === void 0 ? void 0 : _uniBuilderConfig_output7.disableSvgr)) {
-    var _uniBuilderConfig_output13;
+  if (!disableSvgr) {
     const { pluginSvgr } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-svgr")));
     rsbuildPlugins.push(pluginSvgr({
-      svgDefaultExport: ((_uniBuilderConfig_output13 = uniBuilderConfig.output) === null || _uniBuilderConfig_output13 === void 0 ? void 0 : _uniBuilderConfig_output13.svgDefaultExport) || "url"
+      svgDefaultExport: svgDefaultExport || "url"
     }));
-    delete output.disableSvgr;
-    delete output.svgDefaultExport;
   }
   const pugOptions = (_uniBuilderConfig_tools = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools === void 0 ? void 0 : _uniBuilderConfig_tools.pug;
   if (pugOptions) {
@@ -281,12 +304,11 @@ async function parseCommonConfig(uniBuilderConfig, options) {
       pugOptions
     }));
   }
-  if ((_uniBuilderConfig_output8 = uniBuilderConfig.output) === null || _uniBuilderConfig_output8 === void 0 ? void 0 : _uniBuilderConfig_output8.assetsRetry) {
-    var _uniBuilderConfig_output14;
+  if (assetsRetry) {
     const { pluginAssetsRetry } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-assets-retry")));
-    rsbuildPlugins.push(pluginAssetsRetry((_uniBuilderConfig_output14 = uniBuilderConfig.output) === null || _uniBuilderConfig_output14 === void 0 ? void 0 : _uniBuilderConfig_output14.assetsRetry));
+    rsbuildPlugins.push(pluginAssetsRetry(assetsRetry));
   }
-  if ((_uniBuilderConfig_output9 = uniBuilderConfig.output) === null || _uniBuilderConfig_output9 === void 0 ? void 0 : _uniBuilderConfig_output9.enableAssetFallback) {
+  if (enableAssetFallback) {
     const { pluginFallback } = await Promise.resolve().then(() => __toESM(require("./plugins/fallback")));
     rsbuildPlugins.push(pluginFallback());
   }
@@ -294,7 +316,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     rsbuildPlugins.push((0, import_frameworkConfig.pluginFrameworkConfig)(frameworkConfigPath));
   }
   rsbuildPlugins.push((0, import_plugin_css_minimizer.pluginCssMinimizer)({
-    pluginOptions: (_uniBuilderConfig_tools1 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools1 === void 0 ? void 0 : _uniBuilderConfig_tools1.minifyCss
+    pluginOptions: minifyCss
   }));
   targets.includes("web") && rsbuildPlugins.push((0, import_postcssLegacy.pluginPostcssLegacy)(overrideBrowserslist.web));
   return {

package/dist/shared/plugins/antd.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { type RsbuildPlugin } from '@rsbuild/shared';
2	+ export declare const pluginAntd: () => RsbuildPlugin;

package/dist/shared/plugins/antd.js ADDED Viewed

@@ -0,0 +1,69 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var antd_exports = {};
+__export(antd_exports, {
+  pluginAntd: () => pluginAntd
+});
+module.exports = __toCommonJS(antd_exports);
+var import_shared = require("@rsbuild/shared");
+const getAntdMajorVersion = (appDirectory) => {
+  try {
+    const pkgJsonPath = require.resolve("antd/package.json", {
+      paths: [
+        appDirectory
+      ]
+    });
+    const { version } = require(pkgJsonPath);
+    return Number(version.split(".")[0]);
+  } catch (err) {
+    return null;
+  }
+};
+const pluginAntd = () => ({
+  name: "uni-builder:antd",
+  setup(api) {
+    api.modifyRsbuildConfig((rsbuildConfig) => {
+      var _rsbuildConfig_source_transformImport;
+      var _rsbuildConfig;
+      var _source;
+      (_source = (_rsbuildConfig = rsbuildConfig).source) !== null && _source !== void 0 ? _source : _rsbuildConfig.source = {};
+      if (rsbuildConfig.source.transformImport === false || ((_rsbuildConfig_source_transformImport = rsbuildConfig.source.transformImport) === null || _rsbuildConfig_source_transformImport === void 0 ? void 0 : _rsbuildConfig_source_transformImport.some((item) => item.libraryName === "antd"))) {
+        return;
+      }
+      const antdMajorVersion = getAntdMajorVersion(api.context.rootPath);
+      if (antdMajorVersion && antdMajorVersion < 5) {
+        var _rsbuildConfig1;
+        var _source1;
+        (_source1 = (_rsbuildConfig1 = rsbuildConfig).source) !== null && _source1 !== void 0 ? _source1 : _rsbuildConfig1.source = {};
+        rsbuildConfig.source.transformImport = [
+          ...rsbuildConfig.source.transformImport || [],
+          {
+            libraryName: "antd",
+            libraryDirectory: (0, import_shared.isServerTarget)(api.context.targets) ? "lib" : "es",
+            style: true
+          }
+        ];
+      }
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  pluginAntd
+});

package/dist/shared/plugins/arco.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { type RsbuildPlugin } from '@rsbuild/shared';
2	+ export declare const pluginArco: () => RsbuildPlugin;

package/dist/shared/plugins/arco.js ADDED Viewed

@@ -0,0 +1,61 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var arco_exports = {};
+__export(arco_exports, {
+  pluginArco: () => pluginArco
+});
+module.exports = __toCommonJS(arco_exports);
+var import_shared = require("@rsbuild/shared");
+var import_utils = require("@modern-js/utils");
+const pluginArco = () => ({
+  name: "uni-builder:arco",
+  setup(api) {
+    const ARCO_NAME = "@arco-design/web-react";
+    const ARCO_ICON = `${ARCO_NAME}/icon`;
+    api.modifyRsbuildConfig((rsbuildConfig) => {
+      var _rsbuildConfig;
+      const { transformImport = [] } = rsbuildConfig.source || {};
+      if (transformImport === false || !(0, import_utils.isPackageInstalled)(ARCO_NAME, api.context.rootPath)) {
+        return;
+      }
+      const isUseSSR = (0, import_shared.isServerTarget)(api.context.targets);
+      if (!(transformImport === null || transformImport === void 0 ? void 0 : transformImport.some((item) => item.libraryName === ARCO_NAME))) {
+        transformImport.push({
+          libraryName: ARCO_NAME,
+          libraryDirectory: isUseSSR ? "lib" : "es",
+          camelToDashComponentName: false,
+          style: true
+        });
+      }
+      if (!(transformImport === null || transformImport === void 0 ? void 0 : transformImport.some((item) => item.libraryName === ARCO_ICON))) {
+        transformImport.push({
+          libraryName: ARCO_ICON,
+          libraryDirectory: isUseSSR ? "react-icon-cjs" : "react-icon",
+          camelToDashComponentName: false
+        });
+      }
+      (_rsbuildConfig = rsbuildConfig).source || (_rsbuildConfig.source = {});
+      rsbuildConfig.source.transformImport = transformImport;
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  pluginArco
+});

package/dist/shared/plugins/fallback.js CHANGED Viewed

@@ -87,14 +87,17 @@ const pluginFallback = () => ({
     } else {
       api.modifyRspackConfig((config, { isProd }) => {
         var _config_module;
+        var _config, _config1;
         const rsbuildConfig = api.getNormalizedConfig();
         const distDir = (0, import_shared.getDistPath)(rsbuildConfig, "media");
         const filename = (0, import_shared.getFilename)(rsbuildConfig, "media", isProd);
-        (0, import_shared.setConfig)(config, "output.assetModuleFilename", (0, import_path.join)(distDir, filename));
+        (_config = config).output || (_config.output = {});
+        config.output.assetModuleFilename = (0, import_path.join)(distDir, filename);
         if (!config.module) {
           return;
         }
-        (0, import_shared.setConfig)(config, "module.rules", resourceRuleFallback((_config_module = config.module) === null || _config_module === void 0 ? void 0 : _config_module.rules));
+        (_config1 = config).module || (_config1.module = {});
+        config.module.rules = resourceRuleFallback((_config_module = config.module) === null || _config_module === void 0 ? void 0 : _config_module.rules);
       });
     }
   }

package/dist/shared/plugins/postcssLegacy.js CHANGED Viewed

@@ -31,6 +31,7 @@ const pluginPostcssLegacy = (webBrowserslist) => ({
       const enableExtractCSS = (0, import_shared.isUseCssExtract)(config, "web");
       const enableCssMinify = !enableExtractCSS && import_shared.isProd;
       const plugins = [
+        require("postcss-flexbugs-fixes"),
         !cssSupport.customProperties && require("postcss-custom-properties"),
         !cssSupport.initial && require("postcss-initial"),
         !cssSupport.pageBreak && require("postcss-page-break"),

package/dist/shared/plugins/splitChunk.js CHANGED Viewed

@@ -22,6 +22,7 @@ __export(splitChunk_exports, {
 });
 module.exports = __toCommonJS(splitChunk_exports);
 var import_shared = require("@rsbuild/shared");
+var import_utils = require("@modern-js/utils");
 const pluginSplitChunks = () => ({
   name: "uni-builder:split-chunks",
   setup(api) {
@@ -32,22 +33,22 @@ const pluginSplitChunks = () => ({
         return;
       }
       const currentConfig = chain.optimization.splitChunks.values();
-      if (!(0, import_shared.isPlainObject)(currentConfig)) {
+      if (!(0, import_utils.isPlainObject)(currentConfig)) {
         return;
       }
       const groups = {};
       const { rootPath } = api.context;
-      if ((0, import_shared.isPackageInstalled)("antd", rootPath)) {
+      if ((0, import_utils.isPackageInstalled)("antd", rootPath)) {
         groups.antd = [
           "antd"
         ];
       }
-      if ((0, import_shared.isPackageInstalled)("@arco-design/web-react", rootPath)) {
+      if ((0, import_utils.isPackageInstalled)("@arco-design/web-react", rootPath)) {
         groups.arco = [
           /@?arco-design/
         ];
       }
-      if ((0, import_shared.isPackageInstalled)("@douyinfe/semi-ui", rootPath)) {
+      if ((0, import_utils.isPackageInstalled)("@douyinfe/semi-ui", rootPath)) {
         groups.semi = [
           /@(ies|douyinfe)[\\/]semi-.*/
         ];

package/dist/types.d.ts CHANGED Viewed

@@ -51,6 +51,7 @@ export type UniBuilderExtraConfig = {
             devMiddleware?: {
                 writeToDisk?: DevConfig['writeToDisk'];
             };
+            liveReload?: boolean;
             headers?: ServerConfig['headers'];
             historyApiFallback?: ServerConfig['historyApiFallback'];
             hot?: boolean;
@@ -121,6 +122,14 @@ export type UniBuilderExtraConfig = {
         resolveExtensionPrefix?: string | Partial<Record<RsbuildTarget, string>>;
     };
     output?: {
+        /**
+         * @deprecated use `output.filenameHash` instead
+         */
+        disableFilenameHash?: boolean;
+        /**
+         * @deprecated use `source.decorators` instead
+         */
+        enableLatestDecorators?: boolean;
         /**
          * @deprecated use `output.cssModules.localIdentName` instead
          */
@@ -211,6 +220,15 @@ export type UniBuilderExtraConfig = {
          */
         templateParametersByEntries?: Record<string, Record<string, unknown>>;
     };
+    performance?: {
+        /**
+         * Specifies whether to modularize the import of [lodash](https://npmjs.com/package/lodash)
+         * and remove unused lodash modules to reduce the code size of lodash.
+         *
+         * Tips: this configuration is not yet supported in rspack
+         */
+        transformLodash?: boolean;
+    };
     security?: {
         /**
          * Adding an integrity attribute (`integrity`) to sub-resources introduced by HTML allows the browser to

package/dist/webpack/index.js CHANGED Viewed

@@ -39,10 +39,13 @@ var import_moduleScopes = require("./plugins/moduleScopes");
 var import_babel = require("./plugins/babel");
 var import_react = require("./plugins/react");
 async function parseConfig(uniBuilderConfig, options) {
-  var _uniBuilderConfig_tools, _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;
   const { rsbuildConfig, rsbuildPlugins } = await (0, import_parseCommonConfig.parseCommonConfig)(uniBuilderConfig, options);
+  var _uniBuilderConfig_performance_transformLodash;
   rsbuildPlugins.push((0, import_babel.pluginBabel)({
     babelLoaderOptions: (_uniBuilderConfig_tools = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools === void 0 ? void 0 : _uniBuilderConfig_tools.babel
+  }, {
+    transformLodash: (_uniBuilderConfig_performance_transformLodash = (_uniBuilderConfig_performance = uniBuilderConfig.performance) === null || _uniBuilderConfig_performance === void 0 ? void 0 : _uniBuilderConfig_performance.transformLodash) !== null && _uniBuilderConfig_performance_transformLodash !== void 0 ? _uniBuilderConfig_performance_transformLodash : true
   }));
   rsbuildPlugins.push((0, import_react.pluginReact)());
   if ((_uniBuilderConfig_tools1 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools1 === void 0 ? void 0 : _uniBuilderConfig_tools1.tsLoader) {

package/dist/webpack/plugins/babel.d.ts CHANGED Viewed

@@ -1,3 +1,16 @@
 import { type RsbuildPlugin } from '@rsbuild/shared';
 import { type PluginBabelOptions } from '@rsbuild/plugin-babel';
-export declare const pluginBabel: (options?: PluginBabelOptions) => RsbuildPlugin;
+/**
+ * Plugin order:
+ * rspack mode: rsbuild:swc -> rsbuild:babel
+ * webpack mode: uni-builder:babel -> uni-builder:ts-loader -> rsbuild-webpack:swc
+ */
+export declare const getPresetReact: (rootPath: string, isProd: boolean) => (string | {
+    development: boolean;
+    useBuiltIns: boolean;
+    useSpread: boolean;
+    runtime: string;
+})[];
+export declare const pluginBabel: (options: PluginBabelOptions, extraOptions: {
+    transformLodash: boolean;
+}) => RsbuildPlugin;

package/dist/webpack/plugins/babel.js CHANGED Viewed

@@ -28,124 +28,135 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var babel_exports = {};
 __export(babel_exports, {
+  getPresetReact: () => getPresetReact,
   pluginBabel: () => pluginBabel
 });
 module.exports = __toCommonJS(babel_exports);
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
 var import_web = require("@rsbuild/babel-preset/web");
 var import_node = require("@rsbuild/babel-preset/node");
-var import_plugin_react = require("@rsbuild/plugin-react");
+var import_utils = require("@modern-js/utils");
 var import_shared = require("@rsbuild/shared");
 var import_plugin_babel = require("@rsbuild/plugin-babel");
-const pluginBabel = (options) => ({
+const getPresetReact = (rootPath, isProd) => {
+  const isNewJsx = (0, import_utils.isBeyondReact17)(rootPath);
+  const presetReactOptions = {
+    development: !isProd,
+    // Will use the native built-in instead of trying to polyfill
+    useBuiltIns: true,
+    useSpread: false,
+    runtime: isNewJsx ? "automatic" : "classic"
+  };
+  return [
+    require.resolve("@babel/preset-react"),
+    presetReactOptions
+  ];
+};
+const pluginBabel = (options, extraOptions) => ({
   name: "uni-builder:babel",
+  post: [
+    // will replace the babel rule
+    "rsbuild-webpack:swc",
+    // will replace the babel rule
+    "rsbuild-webpack:esbuild"
+  ],
   setup(api) {
-    api.modifyBundlerChain(async (chain, { CHAIN_ID, target, isProd, isServer, isServiceWorker }) => {
-      const config = api.getNormalizedConfig();
-      const browserslist = await (0, import_shared.getBrowserslistWithDefault)(api.context.rootPath, config, target);
-      const isNewJsx = await (0, import_plugin_react.isBeyondReact17)(api.context.rootPath);
-      const getBabelOptions = (config2) => {
-        var _baseBabelConfig_presets;
-        const includes2 = [];
-        const excludes2 = [];
-        const babelUtils = {
-          addIncludes(items) {
-            if (Array.isArray(items)) {
-              includes2.push(...items);
-            } else {
-              includes2.push(items);
-            }
-          },
-          addExcludes(items) {
-            if (Array.isArray(items)) {
-              excludes2.push(...items);
-            } else {
-              excludes2.push(items);
+    api.modifyBundlerChain({
+      order: "pre",
+      handler: async (chain, { CHAIN_ID, target, isProd, isServer, isServiceWorker }) => {
+        const config = api.getNormalizedConfig();
+        const browserslist = await (0, import_shared.getBrowserslistWithDefault)(api.context.rootPath, config, target);
+        const getBabelOptions = (config2) => {
+          var _baseBabelConfig_presets;
+          const includes2 = [];
+          const excludes2 = [];
+          const babelUtils = {
+            addIncludes(items) {
+              if (Array.isArray(items)) {
+                includes2.push(...items);
+              } else {
+                includes2.push(items);
+              }
+            },
+            addExcludes(items) {
+              if (Array.isArray(items)) {
+                excludes2.push(...items);
+              } else {
+                excludes2.push(items);
+              }
             }
+          };
+          const decoratorConfig = config2.source.decorators;
+          const baseBabelConfig = isServer || isServiceWorker ? (0, import_node.getBabelConfigForNode)({
+            presetEnv: {
+              targets: [
+                "node >= 14"
+              ]
+            },
+            pluginDecorators: decoratorConfig
+          }) : (0, import_web.getBabelConfigForWeb)({
+            presetEnv: {
+              targets: browserslist,
+              useBuiltIns: (0, import_plugin_babel.getUseBuiltIns)(config2)
+            },
+            pluginDecorators: decoratorConfig
+          });
+          applyPluginImport(baseBabelConfig, config2.source.transformImport);
+          applyPluginLodash(baseBabelConfig, extraOptions.transformLodash);
+          (_baseBabelConfig_presets = baseBabelConfig.presets) === null || _baseBabelConfig_presets === void 0 ? void 0 : _baseBabelConfig_presets.push(getPresetReact(api.context.rootPath, isProd));
+          if (isProd) {
+            var _baseBabelConfig_plugins;
+            (_baseBabelConfig_plugins = baseBabelConfig.plugins) === null || _baseBabelConfig_plugins === void 0 ? void 0 : _baseBabelConfig_plugins.push([
+              require.resolve("babel-plugin-transform-react-remove-prop-types"),
+              {
+                removeImport: true
+              }
+            ]);
           }
-        };
-        const decoratorConfig = {
-          version: config2.output.enableLatestDecorators ? "2018-09" : "legacy"
-        };
-        const baseBabelConfig = isServer || isServiceWorker ? (0, import_node.getBabelConfigForNode)({
-          presetEnv: {
-            targets: [
-              "node >= 14"
-            ]
-          },
-          pluginDecorators: decoratorConfig
-        }) : (0, import_web.getBabelConfigForWeb)({
-          presetEnv: {
-            targets: browserslist,
-            useBuiltIns: (0, import_plugin_babel.getUseBuiltIns)(config2)
-          },
-          pluginDecorators: decoratorConfig
-        });
-        applyPluginImport(baseBabelConfig, config2.source.transformImport);
-        applyPluginLodash(baseBabelConfig, config2.performance.transformLodash);
-        const presetReactOptions = {
-          development: !isProd,
-          // Will use the native built-in instead of trying to polyfill
-          useBuiltIns: true,
-          useSpread: false,
-          runtime: isNewJsx ? "automatic" : "classic"
-        };
-        (_baseBabelConfig_presets = baseBabelConfig.presets) === null || _baseBabelConfig_presets === void 0 ? void 0 : _baseBabelConfig_presets.push([
-          require.resolve("@babel/preset-react"),
-          presetReactOptions
-        ]);
-        if (isProd) {
-          var _baseBabelConfig_plugins;
-          (_baseBabelConfig_plugins = baseBabelConfig.plugins) === null || _baseBabelConfig_plugins === void 0 ? void 0 : _baseBabelConfig_plugins.push([
-            require.resolve("babel-plugin-transform-react-remove-prop-types"),
-            {
-              removeImport: true
+          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_shared.mergeChainedOptions)({
-          defaults: baseBabelConfig,
-          options: options === null || options === void 0 ? void 0 : options.babelLoaderOptions,
-          utils: {
-            ...(0, import_plugin_babel.getBabelUtils)(baseBabelConfig),
-            ...babelUtils
+          });
+          const finalOptions = {
+            babelrc: false,
+            configFile: false,
+            compact: isProd,
+            ...babelConfig
+          };
+          if (config2.output.charset === "utf8") {
+            finalOptions.generatorOpts = {
+              jsescOption: {
+                minimal: true
+              }
+            };
           }
-        });
-        const finalOptions = {
-          babelrc: false,
-          configFile: false,
-          compact: isProd,
-          ...babelConfig
-        };
-        if (config2.output.charset === "utf8") {
-          finalOptions.generatorOpts = {
-            jsescOption: {
-              minimal: true
-            }
+          return {
+            babelOptions: finalOptions,
+            includes: includes2,
+            excludes: excludes2
           };
-        }
-        return {
-          babelOptions: finalOptions,
-          includes: includes2,
-          excludes: excludes2
         };
-      };
-      const { babelOptions, includes, excludes } = getBabelOptions(config);
-      const rule = chain.module.rule(CHAIN_ID.RULE.JS);
-      (0, import_shared.applyScriptCondition)({
-        rule,
-        config,
-        context: api.context,
-        includes,
-        excludes
-      });
-      rule.test(import_shared.SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options(babelOptions);
-      chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).mimetype({
-        or: [
-          "text/javascript",
-          "application/javascript"
-        ]
-      }).use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options((0, import_cloneDeep.default)(babelOptions));
+        const { babelOptions, includes, excludes } = getBabelOptions(config);
+        const rule = chain.module.rule(CHAIN_ID.RULE.JS);
+        (0, import_shared.applyScriptCondition)({
+          rule,
+          config,
+          context: api.context,
+          includes,
+          excludes
+        });
+        rule.test(import_shared.SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options(babelOptions);
+        chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).mimetype({
+          or: [
+            "text/javascript",
+            "application/javascript"
+          ]
+        }).resolve.set("fullySpecified", false).end().use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options((0, import_cloneDeep.default)(babelOptions));
+      }
     });
   }
 });
@@ -181,5 +192,6 @@ function applyPluginImport(config, pluginImport) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getPresetReact,
   pluginBabel
 });

package/dist/webpack/plugins/styledComponents.js CHANGED Viewed

@@ -31,9 +31,14 @@ __export(styledComponents_exports, {
   pluginStyledComponents: () => pluginStyledComponents
 });
 module.exports = __toCommonJS(styledComponents_exports);
+var import_core = require("@rsbuild/core");
 var import_shared = require("@rsbuild/shared");
 const pluginStyledComponents = (userConfig = {}) => ({
   name: "uni-builder:styled-components",
+  pre: [
+    import_core.PLUGIN_SWC_NAME,
+    "uni-builder:babel"
+  ],
   setup(api) {
     api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd }) => {
       const isSSR = (0, import_shared.isServerTarget)(api.context.targets);

package/dist/webpack/plugins/tsLoader.js CHANGED Viewed

@@ -34,66 +34,78 @@ module.exports = __toCommonJS(tsLoader_exports);
 var import_shared = require("@rsbuild/shared");
 var import_plugin_babel = require("@rsbuild/plugin-babel");
 var import_web = require("@rsbuild/babel-preset/web");
+var import_babel = require("./babel");
 const pluginTsLoader = (options, babelOptions) => {
   return {
     name: "uni-builder:ts-loader",
     pre: [
       "uni-builder:babel"
     ],
-    post: [
-      "uni-builder:react"
-    ],
     setup(api) {
-      api.modifyBundlerChain(async (chain, { target, CHAIN_ID }) => {
-        const config = api.getNormalizedConfig();
-        const { rootPath } = api.context;
-        const browserslist = await (0, import_shared.getBrowserslistWithDefault)(rootPath, config, target);
-        const baseBabelConfig = (0, import_web.getBabelConfigForWeb)({
-          presetEnv: {
-            targets: browserslist,
-            useBuiltIns: (0, import_plugin_babel.getUseBuiltIns)(config)
-          }
-        });
-        const babelUtils = (0, import_plugin_babel.getBabelUtils)(baseBabelConfig);
-        const babelLoaderOptions = (0, import_shared.mergeChainedOptions)({
-          defaults: baseBabelConfig,
-          options: babelOptions,
-          utils: babelUtils
-        });
-        const includes = [];
-        const excludes = [];
-        const tsLoaderUtils = {
-          addIncludes(items) {
-            includes.push(...(0, import_shared.castArray)(items));
-          },
-          addExcludes(items) {
-            excludes.push(...(0, import_shared.castArray)(items));
-          }
-        };
-        const tsLoaderDefaultOptions = {
-          compilerOptions: {
-            target: "esnext",
-            module: "esnext"
-          },
-          transpileOnly: true,
-          allowTsInNodeModules: true
-        };
-        const tsLoaderOptions = (0, import_shared.mergeChainedOptions)({
-          defaults: tsLoaderDefaultOptions,
-          // @ts-expect-error ts-loader has incorrect types for compilerOptions
-          options,
-          utils: tsLoaderUtils
-        });
-        const rule = chain.module.rule(CHAIN_ID.RULE.TS);
-        (0, import_shared.applyScriptCondition)({
-          rule,
-          config,
-          context: api.context,
-          includes,
-          excludes
-        });
-        chain.module.rule(CHAIN_ID.RULE.JS).test(import_shared.JS_REGEX);
-        rule.test(import_shared.TS_REGEX).use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options(babelLoaderOptions).end().use(CHAIN_ID.USE.TS).loader(require.resolve("ts-loader")).options(tsLoaderOptions);
+      api.modifyBundlerChain({
+        order: "pre",
+        handler: async (chain, { isProd, target, CHAIN_ID }) => {
+          var _baseBabelConfig_presets;
+          const config = api.getNormalizedConfig();
+          const { rootPath } = api.context;
+          const browserslist = await (0, import_shared.getBrowserslistWithDefault)(rootPath, config, target);
+          const baseBabelConfig = (0, import_web.getBabelConfigForWeb)({
+            presetEnv: {
+              targets: browserslist,
+              useBuiltIns: (0, import_plugin_babel.getUseBuiltIns)(config)
+            }
+          });
+          (_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 includes = [];
+          const excludes = [];
+          const tsLoaderUtils = {
+            addIncludes(items) {
+              includes.push(...(0, import_shared.castArray)(items));
+            },
+            addExcludes(items) {
+              excludes.push(...(0, import_shared.castArray)(items));
+            }
+          };
+          const tsLoaderDefaultOptions = {
+            compilerOptions: {
+              target: "esnext",
+              module: "esnext"
+            },
+            transpileOnly: true,
+            allowTsInNodeModules: true
+          };
+          const tsLoaderOptions = (0, import_shared.mergeChainedOptions)({
+            defaults: tsLoaderDefaultOptions,
+            // @ts-expect-error ts-loader has incorrect types for compilerOptions
+            options,
+            utils: tsLoaderUtils
+          });
+          const rule = chain.module.rule(CHAIN_ID.RULE.TS);
+          (0, import_shared.applyScriptCondition)({
+            rule,
+            config,
+            context: api.context,
+            includes,
+            excludes
+          });
+          chain.module.rule(CHAIN_ID.RULE.JS).test(import_shared.JS_REGEX);
+          rule.test(import_shared.TS_REGEX).use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options({
+            ...babelLoaderOptions,
+            // fix repeatedly insert babel plugin in some boundary cases
+            plugins: [
+              ...babelLoaderOptions.plugins || []
+            ],
+            presets: [
+              ...babelLoaderOptions.presets || []
+            ]
+          }).end().use(CHAIN_ID.USE.TS).loader(require.resolve("ts-loader")).options(tsLoaderOptions);
+        }
       });
     }
   };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,23 +26,23 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.23.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.3.3",
-    "@rsbuild/core": "0.3.3",
-    "@rsbuild/plugin-assets-retry": "0.3.3",
-    "@rsbuild/plugin-babel": "0.3.3",
-    "@rsbuild/plugin-check-syntax": "0.3.3",
-    "@rsbuild/plugin-css-minimizer": "0.3.3",
-    "@rsbuild/plugin-pug": "0.3.3",
-    "@rsbuild/plugin-react": "0.3.3",
-    "@rsbuild/plugin-rem": "0.3.3",
-    "@rsbuild/plugin-source-build": "0.3.3",
-    "@rsbuild/plugin-styled-components": "0.3.3",
-    "@rsbuild/plugin-svgr": "0.3.3",
-    "@rsbuild/plugin-type-check": "0.3.3",
-    "@rsbuild/plugin-toml": "0.3.3",
-    "@rsbuild/plugin-yaml": "0.3.3",
-    "@rsbuild/shared": "0.3.3",
-    "@rsbuild/webpack": "0.3.3",
+    "@rsbuild/babel-preset": "0.4.4",
+    "@rsbuild/core": "0.4.4",
+    "@rsbuild/plugin-assets-retry": "0.4.4",
+    "@rsbuild/plugin-babel": "0.4.4",
+    "@rsbuild/plugin-check-syntax": "0.4.4",
+    "@rsbuild/plugin-css-minimizer": "0.4.4",
+    "@rsbuild/plugin-pug": "0.4.4",
+    "@rsbuild/plugin-react": "0.4.4",
+    "@rsbuild/plugin-rem": "0.4.4",
+    "@rsbuild/plugin-source-build": "0.4.4",
+    "@rsbuild/plugin-styled-components": "0.4.4",
+    "@rsbuild/plugin-svgr": "0.4.4",
+    "@rsbuild/plugin-type-check": "0.4.4",
+    "@rsbuild/plugin-toml": "0.4.4",
+    "@rsbuild/plugin-yaml": "0.4.4",
+    "@rsbuild/shared": "0.4.4",
+    "@rsbuild/webpack": "0.4.4",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -53,6 +53,7 @@
     "html-webpack-plugin": "5.5.3",
     "lodash": "^4.17.21",
     "postcss-custom-properties": "13.1.5",
+    "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
     "postcss-initial": "4.0.1",
     "postcss-media-minmax": "5.0.0",
@@ -64,19 +65,18 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.46.0",
-    "@modern-js/server": "2.46.0",
-    "@modern-js/prod-server": "2.46.0"
+    "@modern-js/utils": "2.47.0",
+    "@modern-js/server": "2.47.0",
+    "@modern-js/prod-server": "2.47.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.3.3",
+    "@rsbuild/plugin-swc": "0.4.4",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.46.0",
-    "@scripts/vitest-config": "2.46.0",
-    "@scripts/build": "2.46.0"
+    "@scripts/build": "2.47.0",
+    "@scripts/vitest-config": "2.47.0"
   },
   "publishConfig": {
     "access": "public",