@modern-js/uni-builder 2.45.0 → 2.46.0

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import HtmlWebpackPlugin from 'html-webpack-plugin';
 export { HtmlWebpackPlugin };
 export type { CreateUniBuilderOptions, UniBuilderInstance, UniBuilderWebpackInstance, };
 export type { BundlerChain, RsbuildPlugin, ChainedConfig, CopyPluginOptions, ChainIdentifier, NormalizedConfig, RspackConfig, CacheGroup, } from '@rsbuild/shared';
-export type { UniBuilderConfig } from './types';
+export type { UniBuilderConfig, UniBuilderPlugin } from './types';
 export type { StartDevServerOptions } from './shared/devServer';
 export declare function createUniBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderInstance>;
 export { logger, type Rspack, type RsbuildContext, type RsbuildConfig, } from '@rsbuild/core';

package/dist/rspack/index.js

@@ -45,9 +45,10 @@ async function parseConfig(uniBuilderConfig, options) {
   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")));
+    const { pluginBabelPost } = await Promise.resolve().then(() => __toESM(require("./plugins/babel-post")));
     rsbuildPlugins.push(pluginBabel({
       babelLoaderOptions: (_uniBuilderConfig_tools2 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools2 === void 0 ? void 0 : _uniBuilderConfig_tools2.babel
-    }));
+    }), pluginBabelPost());
   }
   if (((_uniBuilderConfig_tools1 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools1 === void 0 ? void 0 : _uniBuilderConfig_tools1.styledComponents) !== false) {
     var _uniBuilderConfig_tools3;

package/dist/rspack/plugins/babel-post.d.ts

@@ -0,0 +1,5 @@
+import { type RsbuildPlugin } from '@rsbuild/shared';
+/**
+ * should not set babel-loader when babel config not modified
+ */
+export declare const pluginBabelPost: () => RsbuildPlugin;

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

@@ -0,0 +1,55 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var babel_post_exports = {};
+__export(babel_post_exports, {
+  pluginBabelPost: () => pluginBabelPost
+});
+module.exports = __toCommonJS(babel_post_exports);
+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);
+        }
+      }
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  pluginBabelPost
+});

package/dist/shared/devServer.js

@@ -107,7 +107,11 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
   (0, import_shared.debug)("create dev server done");
   await rsbuildServer.beforeStart();
   const protocol = devConfig.https ? "https" : "http";
-  const urls = (0, import_shared.getAddressUrls)(protocol, port, host);
+  const urls = (0, import_shared.getAddressUrls)({
+    protocol,
+    port,
+    host
+  });
   (0, import_shared.debug)("listen dev server");
   await server.init();
   return new Promise((resolve) => {

package/dist/shared/parseCommonConfig.js

@@ -34,6 +34,8 @@ __export(parseCommonConfig_exports, {
 module.exports = __toCommonJS(parseCommonConfig_exports);
 var import_shared = require("@rsbuild/shared");
 var import_core = require("@rsbuild/core");
+var import_plugin_toml = require("@rsbuild/plugin-toml");
+var import_plugin_yaml = require("@rsbuild/plugin-yaml");
 var import_plugin_react = require("@rsbuild/plugin-react");
 var import_globalVars = require("./plugins/globalVars");
 var import_runtimeChunk = require("./plugins/runtimeChunk");
@@ -91,8 +93,8 @@ async function getBrowserslistWithDefault(path, config, target) {
   return DEFAULT_BROWSERSLIST[target];
 }
 async function parseCommonConfig(uniBuilderConfig, options) {
-  var _uniBuilderConfig_output, _uniBuilderConfig_output1, _uniBuilderConfig_output2, _uniBuilderConfig_html, _uniBuilderConfig_html1, _uniBuilderConfig_html2, _uniBuilderConfig_html3, _uniBuilderConfig_html4, _uniBuilderConfig_html5, _tools_devServer_devMiddleware, _tools_devServer, _uniBuilderConfig_source, _uniBuilderConfig_output3, _uniBuilderConfig_security, _uniBuilderConfig_output4, _uniBuilderConfig_output5, _uniBuilderConfig_source1, _uniBuilderConfig_source2, _uniBuilderConfig_output6, _uniBuilderConfig_output7, _uniBuilderConfig_experiments, _uniBuilderConfig_tools, _uniBuilderConfig_output8, _uniBuilderConfig_output9, _uniBuilderConfig_tools1;
-  var _output, _output_distPath, _output1, _extraConfig, _html;
+  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 _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;
@@ -106,6 +108,8 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   (_distPath = (_output = output).distPath) !== null && _distPath !== void 0 ? _distPath : _output.distPath = {};
   var _html1;
   (_html1 = (_output_distPath = output.distPath).html) !== null && _html1 !== void 0 ? _html1 : _output_distPath.html = "html";
+  var _server;
+  (_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) {
@@ -169,11 +173,34 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     extraConfig.html.templateParameters = (_, { entryName }) => uniBuilderConfig.html.templateParametersByEntries[entryName];
     delete html.templateParametersByEntries;
   }
+  var _tools;
+  (_tools = (_extraConfig1 = extraConfig).tools) !== null && _tools !== void 0 ? _tools : _extraConfig1.tools = {};
+  extraConfig.tools.htmlPlugin = (config) => {
+    if (typeof config.templateParameters === "function") {
+      const originFn = config.templateParameters;
+      config.templateParameters = (...args) => {
+        const res = originFn(...args);
+        return {
+          title: config.title,
+          meta: void 0,
+          ...res
+        };
+      };
+    }
+  };
   if (dev.progressBar === void 0) {
     dev.progressBar = true;
   }
-  var _tools_devServer_devMiddleware_writeToDisk;
-  dev.writeToDisk = (_tools_devServer_devMiddleware_writeToDisk = (_tools_devServer = tools.devServer) === null || _tools_devServer === void 0 ? void 0 : (_tools_devServer_devMiddleware = _tools_devServer.devMiddleware) === null || _tools_devServer_devMiddleware === void 0 ? void 0 : _tools_devServer_devMiddleware.writeToDisk) !== null && _tools_devServer_devMiddleware_writeToDisk !== void 0 ? _tools_devServer_devMiddleware_writeToDisk : (file) => !file.includes(".hot-update.");
+  const devServer = (0, import_shared.mergeChainedOptions)({
+    defaults: {
+      devMiddleware: {
+        writeToDisk: (file) => !file.includes(".hot-update.")
+      }
+    },
+    options: tools.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
@@ -198,7 +225,9 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     (0, import_devtools.pluginDevtool)({
       disableSourceMap: (_uniBuilderConfig_output3 = uniBuilderConfig.output) === null || _uniBuilderConfig_output3 === void 0 ? void 0 : _uniBuilderConfig_output3.disableSourceMap
     }),
-    (0, import_emitRouteFile.pluginEmitRouteFile)()
+    (0, import_emitRouteFile.pluginEmitRouteFile)(),
+    (0, import_plugin_toml.pluginToml)(),
+    (0, import_plugin_yaml.pluginYaml)()
   ];
   const checkSyntaxOptions = (_uniBuilderConfig_security = uniBuilderConfig.security) === null || _uniBuilderConfig_security === void 0 ? void 0 : _uniBuilderConfig_security.checkSyntax;
   if (checkSyntaxOptions) {
@@ -214,15 +243,6 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     delete output.disableTsChecker;
     delete tools.tsChecker;
   }
-  if (!((_uniBuilderConfig_output5 = uniBuilderConfig.output) === null || _uniBuilderConfig_output5 === void 0 ? void 0 : _uniBuilderConfig_output5.disableSvgr)) {
-    var _uniBuilderConfig_output13;
-    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"
-    }));
-    delete output.disableSvgr;
-    delete output.svgDefaultExport;
-  }
   if ((_uniBuilderConfig_source1 = uniBuilderConfig.source) === null || _uniBuilderConfig_source1 === void 0 ? void 0 : _uniBuilderConfig_source1.resolveMainFields) {
     var _uniBuilderConfig_source3;
     const { pluginMainFields } = await Promise.resolve().then(() => __toESM(require("./plugins/mainFields")));
@@ -233,17 +253,27 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     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));
   }
-  const remOptions = (_uniBuilderConfig_output6 = uniBuilderConfig.output) === null || _uniBuilderConfig_output6 === void 0 ? void 0 : _uniBuilderConfig_output6.convertToRem;
+  const remOptions = (_uniBuilderConfig_output5 = uniBuilderConfig.output) === null || _uniBuilderConfig_output5 === void 0 ? void 0 : _uniBuilderConfig_output5.convertToRem;
   if (remOptions) {
     const { pluginRem } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-rem")));
     rsbuildPlugins.push(pluginRem(typeof remOptions === "boolean" ? {} : remOptions));
   }
-  rsbuildPlugins.push((0, import_runtimeChunk.pluginRuntimeChunk)((_uniBuilderConfig_output7 = uniBuilderConfig.output) === null || _uniBuilderConfig_output7 === void 0 ? void 0 : _uniBuilderConfig_output7.disableInlineRuntimeChunk));
-  if ((_uniBuilderConfig_experiments = uniBuilderConfig.experiments) === null || _uniBuilderConfig_experiments === void 0 ? void 0 : _uniBuilderConfig_experiments.sourceBuild) {
+  rsbuildPlugins.push((0, import_runtimeChunk.pluginRuntimeChunk)((_uniBuilderConfig_output6 = uniBuilderConfig.output) === null || _uniBuilderConfig_output6 === void 0 ? void 0 : _uniBuilderConfig_output6.disableInlineRuntimeChunk));
+  const { sourceBuild } = uniBuilderConfig.experiments || {};
+  if (sourceBuild) {
     const { pluginSourceBuild } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-source-build")));
-    rsbuildPlugins.push(pluginSourceBuild());
+    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;
+    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"
+    }));
+    delete output.disableSvgr;
+    delete output.svgDefaultExport;
+  }
   const pugOptions = (_uniBuilderConfig_tools = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools === void 0 ? void 0 : _uniBuilderConfig_tools.pug;
   if (pugOptions) {
     const { pluginPug } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-pug")));

package/dist/shared/plugins/splitChunk.js

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

package/dist/types.d.ts

@@ -13,6 +13,7 @@ import type { PluginPugOptions } from '@rsbuild/plugin-pug';
 import type { PluginBabelOptions } from '@rsbuild/plugin-babel';
 import type { AliasOption } from '@modern-js/utils';
 import type { StartDevServerOptions, UniBuilderStartServerResult } from './shared/devServer';
+import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
 export type CreateBuilderCommonOptions = {
     entry?: RsbuildEntry;
     frameworkConfigPath?: string;
@@ -42,13 +43,13 @@ export type DisableSourceMapOption = boolean | {
 export type UniBuilderExtraConfig = {
     tools?: {
         styledComponents?: false | PluginStyledComponentsOptions;
-        devServer?: {
+        devServer?: ChainedConfig<{
             before?: RequestHandler[];
             after?: RequestHandler[];
             client?: DevConfig['client'];
             compress?: ServerConfig['compress'];
             devMiddleware?: {
-                writeToDisk: DevConfig['writeToDisk'];
+                writeToDisk?: DevConfig['writeToDisk'];
             };
             headers?: ServerConfig['headers'];
             historyApiFallback?: ServerConfig['historyApiFallback'];
@@ -56,7 +57,7 @@ export type UniBuilderExtraConfig = {
             https?: DevServerHttpsOptions;
             setupMiddlewares?: DevConfig['setupMiddlewares'];
             proxy?: ServerConfig['proxy'];
-        };
+        }>;
         /**
          * Configure the [Pug](https://pugjs.org/) template engine.
          */
@@ -231,7 +232,7 @@ export type UniBuilderExtraConfig = {
         /**
          * Enable the ability for source code building
          */
-        sourceBuild?: boolean;
+        sourceBuild?: boolean | Pick<PluginSourceBuildOptions, 'sourceField' | 'resolvePriority'>;
     };
 };
 export type SriOptions = {
@@ -256,8 +257,11 @@ export type UniBuilderContext = RsbuildPluginAPI['context'] & {
     srcPath: string;
     entry: Record<string, string | string[]>;
 };
+/**
+ * make the plugins type looser to avoid type mismatch
+ */
 export type UniBuilderPluginAPI = {
-    [key in keyof RsbuildPluginAPI]: RsbuildPluginAPI[key];
+    [key in keyof RsbuildPluginAPI]: any;
 } & {
     /** The following APIs only type incompatibility */
     onBeforeCreateCompiler: (fn: any) => void;

package/dist/webpack/plugins/babel.js

@@ -68,6 +68,11 @@ const pluginBabel = (options) => ({
           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: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.45.0",
+  "version": "2.46.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,21 +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.2.15",
-    "@rsbuild/core": "0.2.15",
-    "@rsbuild/plugin-assets-retry": "0.2.15",
-    "@rsbuild/plugin-babel": "0.2.15",
-    "@rsbuild/plugin-check-syntax": "0.2.15",
-    "@rsbuild/plugin-css-minimizer": "0.2.15",
-    "@rsbuild/plugin-pug": "0.2.15",
-    "@rsbuild/plugin-react": "0.2.15",
-    "@rsbuild/plugin-rem": "0.2.15",
-    "@rsbuild/plugin-source-build": "0.2.15",
-    "@rsbuild/plugin-styled-components": "0.2.15",
-    "@rsbuild/plugin-svgr": "0.2.15",
-    "@rsbuild/plugin-type-check": "0.2.15",
-    "@rsbuild/shared": "0.2.15",
-    "@rsbuild/webpack": "0.2.15",
+    "@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",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -62,19 +64,19 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.45.0",
-    "@modern-js/server": "2.45.0",
-    "@modern-js/prod-server": "2.45.0"
+    "@modern-js/utils": "2.46.0",
+    "@modern-js/server": "2.46.0",
+    "@modern-js/prod-server": "2.46.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.2.15",
+    "@rsbuild/plugin-swc": "0.3.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": "2.45.0",
-    "@scripts/build": "2.45.0",
-    "@scripts/vitest-config": "2.45.0"
+    "@modern-js/builder-plugin-node-polyfill": "2.46.0",
+    "@scripts/vitest-config": "2.46.0",
+    "@scripts/build": "2.46.0"
   },
   "publishConfig": {
     "access": "public",