@modern-js/uni-builder 0.0.0-nightly-20240217170621 → 0.0.0-nightly-20240218170609

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

@@ -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/parseCommonConfig.js

@@ -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)) {
@@ -105,7 +107,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   var _newDevServerConfig_devMiddleware, _uniBuilderConfig_output, _uniBuilderConfig_tools;
   var _output, _output_distPath, _output_distPath1, _output1, _extraConfig, _html, _extraConfig1;
   const { cwd, frameworkConfigPath, entry, target } = options;
-  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { 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 { 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,
@@ -119,7 +121,12 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     dev: devConfig,
     security: securityConfig
   };
-  const { dev = {}, html = {}, output = {} } = rsbuildConfig;
+  const { dev = {}, html = {}, output = {}, source = {} } = rsbuildConfig;
+  if (enableLatestDecorators) {
+    source.decorators = {
+      version: "2022-03"
+    };
+  }
   if (cssModuleLocalIdentName) {
     var _output2;
     (_output2 = output).cssModules || (_output2.cssModules = {});
@@ -162,6 +169,9 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   if (enableInlineStyles) {
     output.inlineStyles = enableInlineStyles;
   }
+  if (disableFilenameHash !== void 0) {
+    output.filenameHash = !disableFilenameHash;
+  }
   const extraConfig = {};
   (_extraConfig = extraConfig).html || (_extraConfig.html = {});
   extraConfig.html.outputStructure = disableHtmlFolder ? "flat" : "nested";
@@ -248,7 +258,9 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     }),
     (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)()
   ];
   if (checkSyntax) {
     const { pluginCheckSyntax } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-check-syntax")));

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

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

package/dist/shared/plugins/antd.js

@@ -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

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

package/dist/shared/plugins/arco.js

@@ -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/postcssLegacy.js

@@ -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

@@ -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

@@ -122,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
          */
@@ -212,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

@@ -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

@@ -1,9 +1,16 @@
 import { type RsbuildPlugin } from '@rsbuild/shared';
 import { type PluginBabelOptions } from '@rsbuild/plugin-babel';
+/**
+ * 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) => RsbuildPlugin;
+export declare const pluginBabel: (options: PluginBabelOptions, extraOptions: {
+    transformLodash: boolean;
+}) => RsbuildPlugin;

package/dist/webpack/plugins/babel.js

@@ -52,104 +52,111 @@ const getPresetReact = (rootPath, isProd) => {
     presetReactOptions
   ];
 };
-const pluginBabel = (options) => ({
+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 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);
-        (_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 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));
+      }
     });
   }
 });

package/dist/webpack/plugins/tsLoader.js

@@ -41,71 +41,71 @@ const pluginTsLoader = (options, babelOptions) => {
     pre: [
       "uni-builder:babel"
     ],
-    post: [
-      "uni-builder:react"
-    ],
     setup(api) {
-      api.modifyBundlerChain(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);
+      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

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "0.0.0-nightly-20240217170621",
+  "version": "0.0.0-nightly-20240218170609",
   "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.7",
-    "@rsbuild/core": "0.3.7",
-    "@rsbuild/plugin-assets-retry": "0.3.7",
-    "@rsbuild/plugin-babel": "0.3.7",
-    "@rsbuild/plugin-check-syntax": "0.3.7",
-    "@rsbuild/plugin-css-minimizer": "0.3.7",
-    "@rsbuild/plugin-pug": "0.3.7",
-    "@rsbuild/plugin-react": "0.3.7",
-    "@rsbuild/plugin-rem": "0.3.7",
-    "@rsbuild/plugin-source-build": "0.3.7",
-    "@rsbuild/plugin-styled-components": "0.3.7",
-    "@rsbuild/plugin-svgr": "0.3.7",
-    "@rsbuild/plugin-type-check": "0.3.7",
-    "@rsbuild/plugin-toml": "0.3.7",
-    "@rsbuild/plugin-yaml": "0.3.7",
-    "@rsbuild/shared": "0.3.7",
-    "@rsbuild/webpack": "0.3.7",
+    "@rsbuild/babel-preset": "0.4.3",
+    "@rsbuild/core": "0.4.3",
+    "@rsbuild/plugin-assets-retry": "0.4.3",
+    "@rsbuild/plugin-babel": "0.4.3",
+    "@rsbuild/plugin-check-syntax": "0.4.3",
+    "@rsbuild/plugin-css-minimizer": "0.4.3",
+    "@rsbuild/plugin-pug": "0.4.3",
+    "@rsbuild/plugin-react": "0.4.3",
+    "@rsbuild/plugin-rem": "0.4.3",
+    "@rsbuild/plugin-source-build": "0.4.3",
+    "@rsbuild/plugin-styled-components": "0.4.3",
+    "@rsbuild/plugin-svgr": "0.4.3",
+    "@rsbuild/plugin-type-check": "0.4.3",
+    "@rsbuild/plugin-toml": "0.4.3",
+    "@rsbuild/plugin-yaml": "0.4.3",
+    "@rsbuild/shared": "0.4.3",
+    "@rsbuild/webpack": "0.4.3",
     "@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,19 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "0.0.0-nightly-20240217170621",
-    "@modern-js/server": "0.0.0-nightly-20240217170621",
-    "@modern-js/prod-server": "0.0.0-nightly-20240217170621"
+    "@modern-js/utils": "0.0.0-nightly-20240218170609",
+    "@modern-js/prod-server": "0.0.0-nightly-20240218170609",
+    "@modern-js/server": "0.0.0-nightly-20240218170609"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.3.7",
+    "@rsbuild/plugin-swc": "0.4.3",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@modern-js/builder-plugin-node-polyfill": "0.0.0-nightly-20240217170621",
-    "@scripts/vitest-config": "0.0.0-nightly-20240217170621",
-    "@scripts/build": "0.0.0-nightly-20240217170621"
+    "@scripts/build": "0.0.0-nightly-20240218170609",
+    "@modern-js/builder-plugin-node-polyfill": "0.0.0-nightly-20240218170609",
+    "@scripts/vitest-config": "0.0.0-nightly-20240218170609"
   },
   "publishConfig": {
     "access": "public",