@modern-js/uni-builder 2.58.3 → 2.59.0

package/dist/rspack/index.js

@@ -42,6 +42,20 @@ async function parseConfig(uniBuilderConfig, options) {
   if ((_uniBuilderConfig_experiments = uniBuilderConfig.experiments) === null || _uniBuilderConfig_experiments === void 0 ? void 0 : _uniBuilderConfig_experiments.lazyCompilation) {
     rsbuildConfig.dev.lazyCompilation = uniBuilderConfig.experiments.lazyCompilation;
   }
+  const { sri } = uniBuilderConfig.security || {};
+  if (sri) {
+    if (sri === true) {
+      rsbuildConfig.security.sri = {
+        enable: "auto"
+      };
+    } else {
+      const algorithm = Array.isArray(sri.hashFuncNames) ? sri.hashFuncNames[0] : void 0;
+      rsbuildConfig.security.sri = {
+        enable: sri.enabled,
+        algorithm
+      };
+    }
+  }
   if ((_uniBuilderConfig_tools = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools === void 0 ? void 0 : _uniBuilderConfig_tools.babel) {
     var _uniBuilderConfig_tools2;
     const { pluginBabel } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-babel")));

package/dist/shared/devServer.js

@@ -39,7 +39,7 @@ const transformDevSetupMiddlewares = (seuptMiddlewares) => {
 };
 const transformToRsbuildServerOptions = (dev, devServer) => {
   var _newDevServerConfig_devMiddleware;
-  const { port = 8080, host, https, startUrl, beforeStartUrl, ...devConfig } = dev;
+  const { port = 8080, host, https, startUrl, beforeStartUrl, setupMiddlewares, ...devConfig } = dev;
   var _dev_hmr;
   const newDevServerConfig = (0, import_utils.applyOptionsChain)({
     devMiddleware: {
@@ -52,7 +52,8 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
       overlay: false,
       port: "<port>",
       ...devConfig.client || {}
-    }
+    },
+    setupMiddlewares
   }, devServer, {}, import_ts_deepmerge.merge);
   const rsbuildDev = {
     writeToDisk: (_newDevServerConfig_devMiddleware = newDevServerConfig.devMiddleware) === null || _newDevServerConfig_devMiddleware === void 0 ? void 0 : _newDevServerConfig_devMiddleware.writeToDisk,

package/dist/shared/parseCommonConfig.js

@@ -80,9 +80,9 @@ const isUseCssSourceMap = (disableSourceMap = {}) => {
 };
 async function parseCommonConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_output, _uniBuilderConfig_tools;
-  var _rsbuildConfig_tools, _output_distPath, _output, _extraConfig, _html, _extraConfig1;
+  var _rsbuildConfig_tools, _output, _output_distPath, _output1, _extraConfig, _html, _extraConfig1;
   const { frameworkConfigPath } = options;
-  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, enableAssetManifest, disableSourceMap, convertToRem, disableMinimize, polyfill, dataUriLimit = 1e4, distPath = {}, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, appIcon, tags, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {} } = uniBuilderConfig;
+  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, enableAssetManifest, disableSourceMap, convertToRem, disableMinimize, polyfill, dataUriLimit = 1e4, distPath = {}, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, appIcon, tags, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, transformImport, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {} } = uniBuilderConfig;
   const rsbuildConfig = {
     plugins,
     output: {
@@ -104,6 +104,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   var _lightningcssLoader;
   (_lightningcssLoader = (_rsbuildConfig_tools = rsbuildConfig.tools).lightningcssLoader) !== null && _lightningcssLoader !== void 0 ? _lightningcssLoader : _rsbuildConfig_tools.lightningcssLoader = false;
   const { html = {}, output = {}, source = {} } = rsbuildConfig;
+  source.transformImport = transformImport === false ? () => [] : transformImport;
   if (enableLatestDecorators) {
     source.decorators = {
       version: "2022-03"
@@ -115,18 +116,20 @@ async function parseCommonConfig(uniBuilderConfig, options) {
       version: "legacy"
     };
   }
+  var _charset;
+  (_charset = (_output = output).charset) !== null && _charset !== void 0 ? _charset : _output.charset = "ascii";
   if (disableMinimize) {
-    var _output1;
-    (_output1 = output).minify || (_output1.minify = false);
+    var _output2;
+    (_output2 = output).minify || (_output2.minify = false);
   }
   if (cssModuleLocalIdentName) {
-    var _output2;
-    (_output2 = output).cssModules || (_output2.cssModules = {});
+    var _output3;
+    (_output3 = output).cssModules || (_output3.cssModules = {});
     output.cssModules.localIdentName = cssModuleLocalIdentName;
   }
   if (isUseCssSourceMap(disableSourceMap)) {
-    var _output3;
-    (_output3 = output).sourceMap || (_output3.sourceMap = {});
+    var _output4;
+    (_output4 = output).sourceMap || (_output4.sourceMap = {});
     output.sourceMap.css = true;
   }
   const { server: _server, worker, ...rsbuildDistPath } = distPath;
@@ -134,10 +137,10 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   var _html1;
   (_html1 = (_output_distPath = output.distPath).html) !== null && _html1 !== void 0 ? _html1 : _output_distPath.html = "html";
   var _polyfill;
-  (_polyfill = (_output = output).polyfill) !== null && _polyfill !== void 0 ? _polyfill : _output.polyfill = "entry";
+  (_polyfill = (_output1 = output).polyfill) !== null && _polyfill !== void 0 ? _polyfill : _output1.polyfill = "entry";
   if (disableCssModuleExtension) {
-    var _output4, _output_cssModules;
-    (_output4 = output).cssModules || (_output4.cssModules = {});
+    var _output5, _output_cssModules;
+    (_output5 = output).cssModules || (_output5.cssModules = {});
     var _auto;
     (_auto = (_output_cssModules = output.cssModules).auto) !== null && _auto !== void 0 ? _auto : _output_cssModules.auto = isLooseCssModules;
   }
@@ -235,8 +238,8 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     (0, import_emitRouteFile.pluginEmitRouteFile)(),
     (0, import_plugin_toml.pluginToml)(),
     (0, import_plugin_yaml.pluginYaml)(),
-    (0, import_antd.pluginAntd)(),
-    (0, import_arco.pluginArco)(),
+    (0, import_antd.pluginAntd)(transformImport),
+    (0, import_arco.pluginArco)(transformImport),
     (0, import_plugin_sass.pluginSass)({
       sassLoaderOptions: sass
     }),

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

@@ -1,2 +1,2 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-export declare const pluginAntd: () => RsbuildPlugin;
+import type { RsbuildPlugin, SourceConfig } from '@rsbuild/core';
+export declare const pluginAntd: (imports?: SourceConfig['transformImport'] | false) => RsbuildPlugin;

package/dist/shared/plugins/antd.js

@@ -35,26 +35,29 @@ const getAntdMajorVersion = (appDirectory) => {
     return null;
   }
 };
-const pluginAntd = () => ({
+const pluginAntd = (imports) => ({
   name: "uni-builder:antd",
   setup(api) {
-    api.modifyEnvironmentConfig((rsbuildConfig, { name }) => {
-      var _rsbuildConfig_source_transformImport;
-      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"))) {
+    api.modifyEnvironmentConfig((rsbuildConfig, { name, mergeEnvironmentConfig }) => {
+      if (imports === false || Array.isArray(imports) && (imports === null || imports === void 0 ? void 0 : imports.some((item) => typeof item === "object" && item.libraryName === "antd"))) {
         return;
       }
       const useServerEnvironment = (0, import_utils.isServerEnvironment)(rsbuildConfig.output.target, name);
       const antdMajorVersion = getAntdMajorVersion(api.context.rootPath);
       if (antdMajorVersion && antdMajorVersion < 5) {
-        rsbuildConfig.source.transformImport = [
-          ...rsbuildConfig.source.transformImport || [],
-          {
-            libraryName: "antd",
-            libraryDirectory: useServerEnvironment ? "lib" : "es",
-            style: true
+        return mergeEnvironmentConfig({
+          source: {
+            transformImport: [
+              {
+                libraryName: "antd",
+                libraryDirectory: useServerEnvironment ? "lib" : "es",
+                style: true
+              }
+            ]
           }
-        ];
+        }, rsbuildConfig);
       }
+      return rsbuildConfig;
     });
   }
 });

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

@@ -1,2 +1,2 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-export declare const pluginArco: () => RsbuildPlugin;
+import type { RsbuildPlugin, SourceConfig } from '@rsbuild/core';
+export declare const pluginArco: (imports?: SourceConfig['transformImport'] | false) => RsbuildPlugin;

package/dist/shared/plugins/arco.js

@@ -23,33 +23,37 @@ __export(arco_exports, {
 module.exports = __toCommonJS(arco_exports);
 var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
-const pluginArco = () => ({
+const pluginArco = (imports) => ({
   name: "uni-builder:arco",
   setup(api) {
     const ARCO_NAME = "@arco-design/web-react";
     const ARCO_ICON = `${ARCO_NAME}/icon`;
-    api.modifyEnvironmentConfig((rsbuildConfig, { name }) => {
-      const { transformImport = [] } = rsbuildConfig.source;
-      if (transformImport === false || !(0, import_utils.isPackageInstalled)(ARCO_NAME, api.context.rootPath)) {
+    api.modifyEnvironmentConfig((rsbuildConfig, { name, mergeEnvironmentConfig }) => {
+      if (imports === false || !(0, import_utils.isPackageInstalled)(ARCO_NAME, api.context.rootPath)) {
         return;
       }
+      const defaultImports = [];
       const useServerEnvironment = (0, import_utils2.isServerEnvironment)(rsbuildConfig.output.target, name);
-      if (!(transformImport === null || transformImport === void 0 ? void 0 : transformImport.some((item) => item.libraryName === ARCO_NAME))) {
-        transformImport.push({
+      if (typeof imports === "function" || !(imports === null || imports === void 0 ? void 0 : imports.some((item) => typeof item === "object" && item.libraryName === ARCO_NAME))) {
+        defaultImports.push({
           libraryName: ARCO_NAME,
           libraryDirectory: useServerEnvironment ? "lib" : "es",
           camelToDashComponentName: false,
           style: true
         });
       }
-      if (!(transformImport === null || transformImport === void 0 ? void 0 : transformImport.some((item) => item.libraryName === ARCO_ICON))) {
-        transformImport.push({
+      if (typeof imports === "function" || !(imports === null || imports === void 0 ? void 0 : imports.some((item) => typeof item === "object" && item.libraryName === ARCO_ICON))) {
+        defaultImports.push({
           libraryName: ARCO_ICON,
           libraryDirectory: useServerEnvironment ? "react-icon-cjs" : "react-icon",
           camelToDashComponentName: false
         });
       }
-      rsbuildConfig.source.transformImport = transformImport;
+      return defaultImports.length ? mergeEnvironmentConfig({
+        source: {
+          transformImport: defaultImports
+        }
+      }, rsbuildConfig) : rsbuildConfig;
     });
   }
 });

package/dist/shared/plugins/environmentDefaults.js

@@ -35,6 +35,7 @@ const pluginEnvironmentDefaults = (distPath = {}) => ({
         (_environments = (_compatConfig = compatConfig).environments) !== null && _environments !== void 0 ? _environments : _compatConfig.environments = {};
         compatConfig.environments[import_utils.SERVICE_WORKER_ENVIRONMENT_NAME] = {
           output: {
+            polyfill: "off",
             distPath: {
               root: (0, import_node_path.join)(distPath.root || "dist", distPath.worker || "worker"),
               js: "",
@@ -84,6 +85,12 @@ const pluginEnvironmentDefaults = (distPath = {}) => ({
       var _overrideBrowserslist;
       (_overrideBrowserslist = (_config_output = config.output).overrideBrowserslist) !== null && _overrideBrowserslist !== void 0 ? _overrideBrowserslist : _config_output.overrideBrowserslist = await (0, import_utils.getBrowserslistWithDefault)(api.context.rootPath, config, name === import_utils.SERVICE_WORKER_ENVIRONMENT_NAME ? "node" : config.output.target);
     });
+    api.modifyBundlerChain(async (chain, { environment }) => {
+      const isServiceWorker = environment.name === import_utils.SERVICE_WORKER_ENVIRONMENT_NAME;
+      if (isServiceWorker) {
+        chain.output.libraryTarget("commonjs2");
+      }
+    });
   }
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import type { AliasOption } from '@modern-js/utils';
-import type { ConfigChain, ConfigChainWithContext, DevConfig, DistPathConfig, HtmlConfig, HtmlTagDescriptor, OutputConfig, Polyfill, RequestHandler, RsbuildConfig, RsbuildPlugin, RsbuildPluginAPI, RsbuildTarget, Rspack, ScriptInject, ServerConfig } from '@rsbuild/core';
+import type { ConfigChain, ConfigChainWithContext, DevConfig, DistPathConfig, HtmlConfig, HtmlTagDescriptor, OutputConfig, Polyfill, RequestHandler, RsbuildConfig, RsbuildPlugin, RsbuildPluginAPI, RsbuildPlugins, RsbuildTarget, Rspack, ScriptInject, SecurityConfig, ServerConfig, SourceConfig, ToolsConfig } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginBabelOptions } from '@rsbuild/plugin-babel';
 import type { PluginCheckSyntaxOptions } from '@rsbuild/plugin-check-syntax';
@@ -19,9 +19,7 @@ import type { PluginTsLoaderOptions } from './webpack/plugins/tsLoader';
 type ArrayOrNot<T> = T | T[];
 export type Stats = Omit<Rspack.Stats, '#private' | 'hash' | 'startTime' | 'endTime'>;
 export type RspackConfig = Rspack.Configuration;
-export type MultiStats = Omit<Rspack.MultiStats, '#private' | 'hash' | 'stats'> & {
-    stats: Stats[];
-};
+export type MultiStats = Rspack.MultiStats;
 /**
  * custom properties
  * e.g. { name: 'viewport' content: 'width=500, initial-scale=1' }
@@ -151,6 +149,7 @@ export type UniBuilderExtraConfig = {
         port?: number;
     };
     source?: {
+        transformImport?: SourceConfig['transformImport'] | false;
         alias?: AliasOption;
         /**
          * Define global variables. It can replace expressions like `process.env.FOO` in your code after compile.
@@ -367,16 +366,16 @@ export type DistPath = DistPathConfig & {
 };
 export type UniBuilderConfig = {
     dev?: RsbuildConfig['dev'];
-    html?: Omit<NonNullable<RsbuildConfig['html']>, 'appIcon'>;
-    output?: Omit<NonNullable<RsbuildConfig['output']>, 'polyfill' | 'distPath'> & {
+    html?: Omit<HtmlConfig, 'appIcon'>;
+    output?: Omit<OutputConfig, 'polyfill' | 'distPath'> & {
         polyfill?: Polyfill | 'ua';
         distPath?: DistPath;
     };
     performance?: RsbuildConfig['performance'];
-    security?: RsbuildConfig['security'];
-    tools?: Omit<NonNullable<RsbuildConfig['tools']>, 'htmlPlugin'>;
-    source?: Omit<NonNullable<RsbuildConfig['source']>, 'alias'>;
-    plugins?: RsbuildConfig['plugins'];
+    security?: Omit<SecurityConfig, 'sri'>;
+    tools?: Omit<ToolsConfig, 'htmlPlugin'>;
+    source?: Omit<SourceConfig, 'alias' | 'transformImport'>;
+    plugins?: RsbuildPlugins;
     environments?: RsbuildConfig['environments'];
 } & UniBuilderExtraConfig;
 export {};

package/dist/webpack/plugins/babel.js

@@ -164,9 +164,25 @@ function applyPluginLodash(config, transformLodash) {
     ]);
   }
 }
+const reduceTransformImportConfig = (options) => {
+  if (!options) {
+    return [];
+  }
+  let imports = [];
+  for (const item of (0, import_utils2.castArray)(options)) {
+    if (typeof item === "function") {
+      var _item;
+      imports = (_item = item(imports)) !== null && _item !== void 0 ? _item : imports;
+    } else {
+      imports.push(item);
+    }
+  }
+  return imports;
+};
 function applyPluginImport(config, pluginImport) {
-  if (pluginImport !== false && pluginImport) {
-    for (const item of pluginImport) {
+  const finalPluginImport = reduceTransformImportConfig(pluginImport);
+  if (finalPluginImport === null || finalPluginImport === void 0 ? void 0 : finalPluginImport.length) {
+    for (const item of finalPluginImport) {
       var _config_plugins;
       const name = item.libraryName;
       const option = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.58.3",
+  "version": "2.59.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,24 +26,24 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.24.7",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/core": "1.0.1-beta.14",
-    "@rsbuild/plugin-assets-retry": "1.0.1-beta.14",
-    "@rsbuild/plugin-babel": "1.0.1-beta.14",
+    "@rsbuild/core": "1.0.1-rc.4",
+    "@rsbuild/plugin-assets-retry": "1.0.1-rc.4",
+    "@rsbuild/plugin-babel": "1.0.1-rc.4",
     "@rsbuild/plugin-check-syntax": "1.0.1",
     "@rsbuild/plugin-css-minimizer": "1.0.2",
-    "@rsbuild/plugin-less": "1.0.1-beta.14",
+    "@rsbuild/plugin-less": "1.0.1-rc.4",
     "@rsbuild/plugin-pug": "1.0.2",
-    "@rsbuild/plugin-react": "1.0.1-beta.14",
+    "@rsbuild/plugin-react": "1.0.1-rc.4",
     "@rsbuild/plugin-rem": "1.0.1",
-    "@rsbuild/plugin-sass": "1.0.1-beta.14",
+    "@rsbuild/plugin-sass": "1.0.1-rc.4",
     "@rsbuild/plugin-source-build": "1.0.1",
     "@rsbuild/plugin-styled-components": "1.0.1",
-    "@rsbuild/plugin-svgr": "1.0.1-beta.14",
+    "@rsbuild/plugin-svgr": "1.0.1-rc.4",
     "@rsbuild/plugin-toml": "1.0.1",
-    "@rsbuild/plugin-type-check": "1.0.1-beta.14",
+    "@rsbuild/plugin-type-check": "1.0.1-rc.4",
     "@rsbuild/plugin-typed-css-modules": "1.0.2",
     "@rsbuild/plugin-yaml": "1.0.2",
-    "@rsbuild/webpack": "1.0.1-beta.14",
+    "@rsbuild/webpack": "1.0.1-rc.4",
     "@swc/helpers": "0.5.3",
     "autoprefixer": "10.4.19",
     "babel-loader": "9.1.3",
@@ -70,21 +70,21 @@
     "terser-webpack-plugin": "5.3.10",
     "ts-deepmerge": "7.0.0",
     "ts-loader": "9.4.4",
-    "webpack": "^5.93.0",
+    "webpack": "^5.94.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/babel-preset": "2.58.3",
-    "@modern-js/utils": "2.58.3"
+    "@modern-js/babel-preset": "2.59.0",
+    "@modern-js/utils": "2.59.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "1.0.1-beta.14",
+    "@rsbuild/plugin-swc": "1.0.1-rc.4",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@scripts/vitest-config": "2.58.3",
-    "@scripts/build": "2.58.3"
+    "@scripts/build": "2.59.0",
+    "@scripts/vitest-config": "2.59.0"
   },
   "publishConfig": {
     "access": "public",