@modern-js/uni-builder 2.48.0 → 2.48.2

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

@@ -39,7 +39,7 @@ const pluginBabelPost = () => ({
     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 { cacheIdentifier, ...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, api.context), babelLoaderOptions)) {
             chain.module.rule(CHAIN_ID.RULE.JS).uses.delete(CHAIN_ID.USE.BABEL);

package/dist/shared/devServer.d.ts

@@ -1,12 +1,15 @@
-import { StartDevServerOptions as RsbuildStartDevServerOptions, StartServerResult, RsbuildInstance } from '@rsbuild/shared';
+import { StartDevServerOptions as RsbuildStartDevServerOptions, StartServerResult, RsbuildInstance, DevConfig, ServerConfig } from '@rsbuild/shared';
 import type { Server, ModernDevServerOptionsNew } from '@modern-js/server';
-import { UniBuilderConfig } from '../types';
+import type { UniBuilderConfig, ToolsDevServerConfig } from '../types';
 type ServerOptions = Partial<Omit<ModernDevServerOptionsNew, 'config'>> & {
     config?: Partial<ModernDevServerOptionsNew['config']>;
 };
+export declare const transformToRsbuildServerOptions: (dev: NonNullable<UniBuilderConfig['dev']>, devServer: ToolsDevServerConfig) => {
+    dev: DevConfig;
+    server: ServerConfig;
+};
 export type StartDevServerOptions = Omit<RsbuildStartDevServerOptions, 'printURLs'> & {
     apiOnly?: boolean;
-    defaultPort?: number;
     serverOptions?: ServerOptions;
 };
 export type UniBuilderStartServerResult = Omit<StartServerResult, 'server'> & {

package/dist/shared/devServer.js

@@ -28,7 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var devServer_exports = {};
 __export(devServer_exports, {
-  startDevServer: () => startDevServer
+  startDevServer: () => startDevServer,
+  transformToRsbuildServerOptions: () => transformToRsbuildServerOptions
 });
 module.exports = __toCommonJS(devServer_exports);
 var import_shared = require("@rsbuild/shared");
@@ -52,55 +53,109 @@ const getServerOptions = (builderConfig) => {
     bff: {}
   };
 };
-const getDevServerOptions = async ({ builderConfig, serverOptions, port }) => {
-  var _builderConfig_dev, _builderConfig_tools;
-  const defaultDevConfig = (0, import_shared.deepmerge)(
-    {
-      watch: true,
-      port,
-      https: (_builderConfig_dev = builderConfig.dev) === null || _builderConfig_dev === void 0 ? void 0 : _builderConfig_dev.https
+const transformToRsbuildServerOptions = (dev, devServer) => {
+  var _newDevServerConfig_devMiddleware, _newDevServerConfig_before, _newDevServerConfig_after;
+  const { port, host, https, ...devConfig } = dev;
+  var _dev_hmr;
+  const newDevServerConfig = (0, import_shared.mergeChainedOptions)({
+    defaults: {
+      devMiddleware: {
+        writeToDisk: (file) => !file.includes(".hot-update.")
+      },
+      hot: (_dev_hmr = dev === null || dev === void 0 ? void 0 : dev.hmr) !== null && _dev_hmr !== void 0 ? _dev_hmr : true,
+      liveReload: true,
+      client: {
+        path: "/webpack-hmr"
+      }
     },
-    // merge devServerOptions from serverOptions
-    serverOptions.dev || {}
-  );
-  const devConfig = (0, import_shared.mergeChainedOptions)({
-    defaults: defaultDevConfig,
-    options: (_builderConfig_tools = builderConfig.tools) === null || _builderConfig_tools === void 0 ? void 0 : _builderConfig_tools.devServer,
+    options: devServer,
     mergeFn: import_shared.deepmerge
   });
+  const rsbuildDev = {
+    ...devConfig,
+    writeToDisk: (_newDevServerConfig_devMiddleware = newDevServerConfig.devMiddleware) === null || _newDevServerConfig_devMiddleware === void 0 ? void 0 : _newDevServerConfig_devMiddleware.writeToDisk,
+    hmr: newDevServerConfig.hot,
+    client: newDevServerConfig.client,
+    liveReload: newDevServerConfig.liveReload
+  };
+  if (dev.progressBar === void 0) {
+    rsbuildDev.progressBar = true;
+  }
+  if (((_newDevServerConfig_before = newDevServerConfig.before) === null || _newDevServerConfig_before === void 0 ? void 0 : _newDevServerConfig_before.length) || ((_newDevServerConfig_after = newDevServerConfig.after) === null || _newDevServerConfig_after === void 0 ? void 0 : _newDevServerConfig_after.length)) {
+    rsbuildDev.setupMiddlewares = [
+      ...newDevServerConfig.setupMiddlewares || [],
+      (middlewares) => {
+        middlewares.unshift(...newDevServerConfig.before || []);
+        middlewares.push(...newDevServerConfig.after || []);
+      }
+    ];
+  } else if (newDevServerConfig.setupMiddlewares) {
+    rsbuildDev.setupMiddlewares = newDevServerConfig.setupMiddlewares;
+  }
+  const server = (0, import_shared.isProd)() ? {
+    publicDir: false,
+    htmlFallback: false
+  } : {
+    publicDir: false,
+    htmlFallback: false,
+    compress: newDevServerConfig.compress,
+    headers: newDevServerConfig.headers,
+    historyApiFallback: newDevServerConfig.historyApiFallback,
+    proxy: newDevServerConfig.proxy,
+    port,
+    host,
+    https: https ? https : void 0
+  };
+  return {
+    dev: rsbuildDev,
+    server
+  };
+};
+const getDevServerOptions = async ({ builderConfig, serverOptions }) => {
   const defaultConfig = getServerOptions(builderConfig);
   const config = serverOptions.config ? (0, import_shared.deepmerge)(defaultConfig, serverOptions.config) : defaultConfig;
   return {
-    config,
-    devConfig
+    config
   };
 };
 async function startDevServer(rsbuild, options = {}, builderConfig) {
+  var _serverOptions_dev, _serverOptions_dev1, _rsbuildConfig_server, _rsbuildConfig_dev;
   (0, import_shared.debug)("create dev server");
   const { ServerForRsbuild } = await Promise.resolve().then(() => __toESM(require("@modern-js/server")));
   const rsbuildServer = await rsbuild.getServerAPIs(options);
   const { serverOptions = {} } = options;
-  const { config, devConfig } = await getDevServerOptions({
+  const { config } = await getDevServerOptions({
     builderConfig,
-    serverOptions,
-    port: rsbuildServer.config.port
+    serverOptions
   });
   const compileMiddlewareAPI = options.apiOnly ? void 0 : await rsbuildServer.startCompile();
+  const rsbuildConfig = rsbuild.getRsbuildConfig();
+  var _serverOptions_dev_https;
+  const https = (_serverOptions_dev_https = (_serverOptions_dev = serverOptions.dev) === null || _serverOptions_dev === void 0 ? void 0 : _serverOptions_dev.https) !== null && _serverOptions_dev_https !== void 0 ? _serverOptions_dev_https : rsbuildServer.config.https;
+  var _serverOptions_dev_watch;
   const server = new ServerForRsbuild({
     pwd: rsbuild.context.rootPath,
     ...serverOptions,
     rsbuild,
     getMiddlewares: (config2) => rsbuildServer.getMiddlewares({
       compileMiddlewareAPI,
+      // TODO: To be removed. should update all rsbuild config in parseCommonConfig stage
       overrides: config2
     }),
-    dev: devConfig,
+    dev: {
+      watch: (_serverOptions_dev_watch = (_serverOptions_dev1 = serverOptions.dev) === null || _serverOptions_dev1 === void 0 ? void 0 : _serverOptions_dev1.watch) !== null && _serverOptions_dev_watch !== void 0 ? _serverOptions_dev_watch : true,
+      compress: (_rsbuildConfig_server = rsbuildConfig.server) === null || _rsbuildConfig_server === void 0 ? void 0 : _rsbuildConfig_server.compress,
+      https,
+      devMiddleware: {
+        writeToDisk: (_rsbuildConfig_dev = rsbuildConfig.dev) === null || _rsbuildConfig_dev === void 0 ? void 0 : _rsbuildConfig_dev.writeToDisk
+      }
+    },
     config
   });
   const { config: { port, host } } = rsbuildServer;
   (0, import_shared.debug)("create dev server done");
   await rsbuildServer.beforeStart();
-  const protocol = devConfig.https ? "https" : "http";
+  const protocol = https ? "https" : "http";
   const urls = (0, import_shared.getAddressUrls)({
     protocol,
     port,
@@ -136,5 +191,6 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  startDevServer
+  startDevServer,
+  transformToRsbuildServerOptions
 });

package/dist/shared/parseCommonConfig.js

@@ -47,6 +47,7 @@ var import_devtools = require("./plugins/devtools");
 var import_emitRouteFile = require("./plugins/emitRouteFile");
 var import_antd = require("./plugins/antd");
 var import_arco = require("./plugins/arco");
+var import_devServer = require("./devServer");
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
 const isLooseCssModules = (path) => {
   if (import_shared.NODE_MODULES_REGEX.test(path)) {
@@ -104,10 +105,10 @@ const isUseCssSourceMap = (disableSourceMap = {}) => {
   return !disableSourceMap.css;
 };
 async function parseCommonConfig(uniBuilderConfig, options) {
-  var _newDevServerConfig_devMiddleware, _uniBuilderConfig_output, _uniBuilderConfig_tools;
+  var _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: { 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 { 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, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, ...toolsConfig } = {} } = uniBuilderConfig;
   const rsbuildConfig = {
     plugins,
     output: outputConfig,
@@ -118,10 +119,9 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     performance: performanceConfig,
     html: htmlConfig,
     tools: toolsConfig,
-    dev: devConfig,
     security: securityConfig
   };
-  const { dev = {}, html = {}, output = {}, source = {} } = rsbuildConfig;
+  const { html = {}, output = {}, source = {} } = rsbuildConfig;
   if (enableLatestDecorators) {
     source.decorators = {
       version: "2022-03"
@@ -193,7 +193,10 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     extraConfig.html.template = ({ entryName }) => templateByEntries[entryName];
   }
   if (templateParametersByEntries) {
-    extraConfig.html.templateParameters = (_, { entryName }) => templateParametersByEntries[entryName];
+    extraConfig.html.templateParameters = (defaultValue, { entryName }) => ({
+      ...defaultValue,
+      ...templateParametersByEntries[entryName] || {}
+    });
   }
   var _tools;
   (_tools = (_extraConfig1 = extraConfig).tools) !== null && _tools !== void 0 ? _tools : _extraConfig1.tools = {};
@@ -210,38 +213,9 @@ async function parseCommonConfig(uniBuilderConfig, options) {
       };
     }
   };
-  if (dev.progressBar === void 0) {
-    dev.progressBar = true;
-  }
-  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: devServer,
-    mergeFn: import_shared.deepmerge
-  });
-  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
-  };
+  const { dev: RsbuildDev, server } = (0, import_devServer.transformToRsbuildServerOptions)(dev || {}, devServer || {});
   rsbuildConfig.server = removeUndefinedKey(server);
-  rsbuildConfig.dev = removeUndefinedKey(dev);
+  rsbuildConfig.dev = removeUndefinedKey(RsbuildDev);
   rsbuildConfig.html = html;
   rsbuildConfig.output = output;
   if (entry) {

package/dist/shared/plugins/postcssLegacy.js

@@ -50,13 +50,17 @@ const pluginPostcssLegacy = (webBrowserslist) => ({
           ]
         }) : false
       ].filter(Boolean);
-      return mergeRsbuildConfig(config, {
-        tools: {
-          postcss: (opts) => {
-            opts.postcssOptions.plugins.push(...plugins);
+      return mergeRsbuildConfig(
+        {
+          tools: {
+            postcss: (opts) => {
+              opts.postcssOptions.plugins.push(...plugins);
+            }
           }
-        }
-      });
+        },
+        // user config has higher priority than builtin config
+        config
+      );
     });
   }
 });

package/dist/shared/plugins/splitChunk.js

@@ -61,8 +61,8 @@ const pluginSplitChunks = () => ({
         // rspack chunks type mismatch with webpack
         // @ts-expect-error
         cacheGroups: {
-          ...currentConfig.cacheGroups,
-          ...(0, import_shared.createCacheGroups)(groups)
+          ...(0, import_shared.createCacheGroups)(groups),
+          ...currentConfig.cacheGroups
         }
       });
     });

package/dist/types.d.ts

@@ -40,25 +40,26 @@ export type DisableSourceMapOption = boolean | {
     js?: boolean;
     css?: boolean;
 };
+export type ToolsDevServerConfig = ChainedConfig<{
+    before?: RequestHandler[];
+    after?: RequestHandler[];
+    client?: DevConfig['client'];
+    compress?: ServerConfig['compress'];
+    devMiddleware?: {
+        writeToDisk?: DevConfig['writeToDisk'];
+    };
+    liveReload?: boolean;
+    headers?: ServerConfig['headers'];
+    historyApiFallback?: ServerConfig['historyApiFallback'];
+    hot?: boolean;
+    https?: DevServerHttpsOptions;
+    setupMiddlewares?: DevConfig['setupMiddlewares'];
+    proxy?: ServerConfig['proxy'];
+}>;
 export type UniBuilderExtraConfig = {
     tools?: {
         styledComponents?: false | PluginStyledComponentsOptions;
-        devServer?: ChainedConfig<{
-            before?: RequestHandler[];
-            after?: RequestHandler[];
-            client?: DevConfig['client'];
-            compress?: ServerConfig['compress'];
-            devMiddleware?: {
-                writeToDisk?: DevConfig['writeToDisk'];
-            };
-            liveReload?: boolean;
-            headers?: ServerConfig['headers'];
-            historyApiFallback?: ServerConfig['historyApiFallback'];
-            hot?: boolean;
-            https?: DevServerHttpsOptions;
-            setupMiddlewares?: DevConfig['setupMiddlewares'];
-            proxy?: ServerConfig['proxy'];
-        }>;
+        devServer?: ToolsDevServerConfig;
         /**
          * Configure the [Pug](https://pugjs.org/) template engine.
          */

package/dist/webpack/ModuleScopePlugin.js

@@ -21,7 +21,6 @@ __export(ModuleScopePlugin_exports, {
   ModuleScopePlugin: () => ModuleScopePlugin
 });
 module.exports = __toCommonJS(ModuleScopePlugin_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
 class ModuleScopePlugin {
@@ -78,12 +77,6 @@ class ModuleScopePlugin {
     });
   }
   constructor({ scopes, allowedFiles = [] }) {
-    (0, import_define_property._)(this, "scopes", void 0);
-    (0, import_define_property._)(this, "allowedFiles", void 0);
-    (0, import_define_property._)(this, "allowedDirs", void 0);
-    (0, import_define_property._)(this, "allowedPatterns", void 0);
-    (0, import_define_property._)(this, "relativeAllowedDirs", void 0);
-    (0, import_define_property._)(this, "cache", void 0);
     this.scopes = scopes;
     this.allowedFiles = new Set(allowedFiles);
     this.allowedDirs = scopes.filter(import_shared.isString);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.48.0",
+  "version": "2.48.2",
   "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.4.8",
-    "@rsbuild/core": "0.4.8",
-    "@rsbuild/plugin-assets-retry": "0.4.8",
-    "@rsbuild/plugin-babel": "0.4.8",
-    "@rsbuild/plugin-check-syntax": "0.4.8",
-    "@rsbuild/plugin-css-minimizer": "0.4.8",
-    "@rsbuild/plugin-pug": "0.4.8",
-    "@rsbuild/plugin-react": "0.4.8",
-    "@rsbuild/plugin-rem": "0.4.8",
-    "@rsbuild/plugin-source-build": "0.4.8",
-    "@rsbuild/plugin-styled-components": "0.4.8",
-    "@rsbuild/plugin-svgr": "0.4.8",
-    "@rsbuild/plugin-type-check": "0.4.8",
-    "@rsbuild/plugin-toml": "0.4.8",
-    "@rsbuild/plugin-yaml": "0.4.8",
-    "@rsbuild/shared": "0.4.8",
-    "@rsbuild/webpack": "0.4.8",
+    "@rsbuild/babel-preset": "0.4.15",
+    "@rsbuild/core": "0.4.15",
+    "@rsbuild/plugin-assets-retry": "0.4.15",
+    "@rsbuild/plugin-babel": "0.4.15",
+    "@rsbuild/plugin-check-syntax": "0.4.15",
+    "@rsbuild/plugin-css-minimizer": "0.4.15",
+    "@rsbuild/plugin-pug": "0.4.15",
+    "@rsbuild/plugin-react": "0.4.15",
+    "@rsbuild/plugin-rem": "0.4.15",
+    "@rsbuild/plugin-source-build": "0.4.15",
+    "@rsbuild/plugin-styled-components": "0.4.15",
+    "@rsbuild/plugin-svgr": "0.4.15",
+    "@rsbuild/plugin-type-check": "0.4.15",
+    "@rsbuild/plugin-toml": "0.4.15",
+    "@rsbuild/plugin-yaml": "0.4.15",
+    "@rsbuild/shared": "0.4.15",
+    "@rsbuild/webpack": "0.4.15",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -52,6 +52,7 @@
     "glob": "^9.3.5",
     "html-webpack-plugin": "5.5.3",
     "lodash": "^4.17.21",
+    "postcss": "^8.4.35",
     "postcss-custom-properties": "13.1.5",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
@@ -65,18 +66,18 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.48.0",
-    "@modern-js/prod-server": "2.48.0",
-    "@modern-js/server": "2.48.0"
+    "@modern-js/utils": "2.48.2",
+    "@modern-js/server": "2.48.2"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.4.8",
+    "@rsbuild/plugin-swc": "0.4.15",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/build": "2.48.0",
-    "@scripts/vitest-config": "2.48.0"
+    "@modern-js/prod-server": "2.48.2",
+    "@scripts/build": "2.48.2",
+    "@scripts/vitest-config": "2.48.2"
   },
   "publishConfig": {
     "access": "public",