@modern-js/uni-builder 2.59.0 → 2.60.1

package/dist/shared/devServer.js

@@ -40,13 +40,13 @@ const transformDevSetupMiddlewares = (seuptMiddlewares) => {
 const transformToRsbuildServerOptions = (dev, devServer) => {
   var _newDevServerConfig_devMiddleware;
   const { port = 8080, host, https, startUrl, beforeStartUrl, setupMiddlewares, ...devConfig } = dev;
-  var _dev_hmr;
+  var _dev_hmr, _dev_liveReload;
   const newDevServerConfig = (0, import_utils.applyOptionsChain)({
     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,
+    liveReload: (_dev_liveReload = dev === null || dev === void 0 ? void 0 : dev.liveReload) !== null && _dev_liveReload !== void 0 ? _dev_liveReload : true,
     client: {
       path: "/webpack-hmr",
       overlay: false,

package/dist/shared/parseCommonConfig.js

@@ -211,19 +211,21 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   }
   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 (htmlPlugin !== false) {
+    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
+          };
         };
-      };
-    }
-  };
+      }
+    };
+  }
   const { dev: RsbuildDev, server } = (0, import_devServer.transformToRsbuildServerOptions)(dev || {}, devServer || {});
   rsbuildConfig.server = removeUndefinedKey(server);
   rsbuildConfig.dev = removeUndefinedKey(RsbuildDev);

package/dist/shared/plugins/environmentDefaults.js

@@ -74,7 +74,7 @@ const pluginEnvironmentDefaults = (distPath = {}) => ({
         const environmentNameOrder = [
           "web",
           "node",
-          "serviceWorker"
+          "workerSSR"
         ];
         config.environments = Object.fromEntries(Object.entries(config.environments).sort((a1, a2) => environmentNameOrder.includes(a1[0]) ? environmentNameOrder.indexOf(a1[0]) - environmentNameOrder.indexOf(a2[0]) : 1));
       },

package/dist/shared/utils.d.ts

@@ -1,6 +1,6 @@
 import type { NormalizedEnvironmentConfig, RsbuildContext, RsbuildTarget, RspackChain } from '@rsbuild/core';
 export declare const RUNTIME_CHUNK_NAME = "builder-runtime";
-export declare const SERVICE_WORKER_ENVIRONMENT_NAME = "serviceWorker";
+export declare const SERVICE_WORKER_ENVIRONMENT_NAME = "workerSSR";
 export declare const JS_REGEX: RegExp;
 export declare const TS_REGEX: RegExp;
 export declare const SCRIPT_REGEX: RegExp;

package/dist/shared/utils.js

@@ -45,7 +45,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_browserslist = __toESM(require("browserslist"));
 const RUNTIME_CHUNK_NAME = "builder-runtime";
-const SERVICE_WORKER_ENVIRONMENT_NAME = "serviceWorker";
+const SERVICE_WORKER_ENVIRONMENT_NAME = "workerSSR";
 const JS_REGEX = /\.(?:js|mjs|cjs|jsx)$/;
 const TS_REGEX = /\.(?:ts|mts|cts|tsx)$/;
 const SCRIPT_REGEX = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/;

package/dist/types.d.ts

@@ -172,7 +172,7 @@ export type UniBuilderExtraConfig = {
     };
     output?: {
         /**
-         * Whether to disable code minification in production build.
+         * @deprecated use `output.minify` instead
          */
         disableMinimize?: boolean;
         /**

package/dist/webpack/plugins/babel.js

@@ -36,6 +36,7 @@ var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
 var import_node = require("@modern-js/babel-preset/node");
 var import_web = require("@modern-js/babel-preset/web");
 var import_utils = require("@modern-js/utils");
+var import_core = require("@rsbuild/core");
 var import_plugin_babel = require("@rsbuild/plugin-babel");
 var import_utils2 = require("../../shared/utils");
 const getPresetReact = (rootPath, isProd) => {
@@ -101,8 +102,8 @@ const pluginBabel = (options, extraOptions) => ({
             },
             pluginDecorators: decoratorConfig
           });
+          applyPluginLodash(baseBabelConfig, extraOptions.transformLodash, config2.source.transformImport);
           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;
@@ -155,7 +156,14 @@ const pluginBabel = (options, extraOptions) => ({
     });
   }
 });
-function applyPluginLodash(config, transformLodash) {
+function applyPluginLodash(config, transformLodash, transformImport = []) {
+  const finalTransformImport = reduceTransformImportConfig(transformImport);
+  const hasImportPluginForLodash = finalTransformImport.some((transformImport2) => {
+    return transformImport2.libraryName === "lodash";
+  });
+  if (hasImportPluginForLodash && transformLodash) {
+    import_core.logger.warn("Detected a potential conflict between `source.transformImport` and `performance.transformLodash` for lodash. Please ensure only one of these configurations is used to handle lodash imports. If you want to use `source.transformImport`, set `performance.transformLodash` to `false` in your configuration.");
+  }
   if (transformLodash) {
     var _config_plugins;
     (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.59.0",
+  "version": "2.60.1",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,25 +26,25 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.24.7",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@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/core": "1.0.2",
+    "@rsbuild/plugin-assets-retry": "1.0.1",
+    "@rsbuild/plugin-babel": "1.0.1",
     "@rsbuild/plugin-check-syntax": "1.0.1",
     "@rsbuild/plugin-css-minimizer": "1.0.2",
-    "@rsbuild/plugin-less": "1.0.1-rc.4",
+    "@rsbuild/plugin-less": "1.0.1",
     "@rsbuild/plugin-pug": "1.0.2",
-    "@rsbuild/plugin-react": "1.0.1-rc.4",
+    "@rsbuild/plugin-react": "1.0.1",
     "@rsbuild/plugin-rem": "1.0.1",
-    "@rsbuild/plugin-sass": "1.0.1-rc.4",
+    "@rsbuild/plugin-sass": "1.0.1",
     "@rsbuild/plugin-source-build": "1.0.1",
     "@rsbuild/plugin-styled-components": "1.0.1",
-    "@rsbuild/plugin-svgr": "1.0.1-rc.4",
+    "@rsbuild/plugin-svgr": "1.0.1",
     "@rsbuild/plugin-toml": "1.0.1",
-    "@rsbuild/plugin-type-check": "1.0.1-rc.4",
+    "@rsbuild/plugin-type-check": "1.0.1",
     "@rsbuild/plugin-typed-css-modules": "1.0.2",
     "@rsbuild/plugin-yaml": "1.0.2",
-    "@rsbuild/webpack": "1.0.1-rc.4",
-    "@swc/helpers": "0.5.3",
+    "@rsbuild/webpack": "1.0.2",
+    "@swc/helpers": "0.5.13",
     "autoprefixer": "10.4.19",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -72,19 +72,19 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.94.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/babel-preset": "2.59.0",
-    "@modern-js/utils": "2.59.0"
+    "@modern-js/babel-preset": "2.60.1",
+    "@modern-js/utils": "2.60.1"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "1.0.1-rc.4",
+    "@rsbuild/plugin-webpack-swc": "1.0.2",
     "@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/build": "2.59.0",
-    "@scripts/vitest-config": "2.59.0"
+    "@scripts/vitest-config": "2.60.1",
+    "@scripts/build": "2.60.1"
   },
   "publishConfig": {
     "access": "public",