@modern-js/uni-builder 2.58.0 → 2.58.2

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

@@ -1,4 +1,4 @@
-import { type RsbuildPlugin } from '@rsbuild/core';
+import type { RsbuildPlugin } from '@rsbuild/core';
 /**
  * should not set babel-loader when babel config not modified
  */

package/dist/shared/devServer.d.ts

@@ -1,4 +1,4 @@
-import { type DevConfig, type ServerConfig } from '@rsbuild/core';
+import type { DevConfig, ServerConfig } from '@rsbuild/core';
 import type { UniBuilderConfig, ToolsDevServerConfig } from '../types';
 export declare const transformToRsbuildServerOptions: (dev: NonNullable<UniBuilderConfig['dev']>, devServer: ToolsDevServerConfig) => {
     dev: DevConfig;

package/dist/shared/parseCommonConfig.js

@@ -82,7 +82,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_output, _uniBuilderConfig_tools;
   var _rsbuildConfig_tools, _output_distPath, _output, _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, 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, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {} } = uniBuilderConfig;
   const rsbuildConfig = {
     plugins,
     output: {
@@ -179,6 +179,14 @@ async function parseCommonConfig(uniBuilderConfig, options) {
       ...templateParametersByEntries[entryName] || {}
     });
   }
+  html.appIcon = typeof appIcon === "string" ? {
+    icons: [
+      {
+        src: appIcon,
+        size: 180
+      }
+    ]
+  } : appIcon;
   if (tags) {
     html.tags = Array.isArray(tags) ? tags.filter((t) => typeof t !== "function").concat(tags.filter((t) => typeof t === "function")) : tags;
   }

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

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

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

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

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

@@ -1,5 +1,5 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-import { DisableSourceMapOption } from '../../types';
+import type { DisableSourceMapOption } from '../../types';
 export declare const pluginDevtool: (options: {
     disableSourceMap?: DisableSourceMapOption;
 }) => RsbuildPlugin;

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

@@ -1,4 +1,4 @@
-import { type RsbuildPlugin } from '@rsbuild/core';
+import type { RsbuildPlugin } from '@rsbuild/core';
 export declare function isFileExists(file: string): Promise<boolean>;
 /**
  * generate a basic route.json for modern.js server

package/dist/shared/plugins/htmlMinify.js

@@ -87,9 +87,7 @@ const pluginHtmlMinifierTerser = () => ({
   setup(api) {
     api.modifyBundlerChain(async (chain, { isProd, environment }) => {
       const { output, tools: { htmlPlugin } } = environment.config;
-      if (!isProd || output.minify === false || htmlPlugin === false) {
-        return;
-      }
+      const disableHtmlMinify = !isProd || output.minify === false || htmlPlugin === false;
       const { minify } = await Promise.resolve().then(() => __toESM(require("html-minifier-terser")));
       const pluginRecord = chain.plugins.entries();
       const minifyOptions = getMinifyOptions(environment.config);
@@ -103,7 +101,7 @@ const pluginHtmlMinifierTerser = () => ({
           const name = (item === null || item === void 0 ? void 0 : item.name) || ((_item_constructor = item.constructor) === null || _item_constructor === void 0 ? void 0 : _item_constructor.name);
           return name === "HtmlRspackPlugin";
         });
-        if (isHtmlRspackPlugin) {
+        if (isHtmlRspackPlugin && !disableHtmlMinify) {
           chain.plugin(id).tap((options) => {
             if (!options.length) {
               return options;
@@ -125,6 +123,10 @@ const pluginHtmlMinifierTerser = () => ({
             if (!options.length || options[0].minify) {
               return options;
             }
+            if (disableHtmlMinify) {
+              options[0].minify = false;
+              return options;
+            }
             const userMinifyOption = options[0].minify;
             options[0].minify = userMinifyOption ? (0, import_ts_deepmerge.merge)(minifyOptions, userMinifyOption) : minifyOptions;
             return options;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { ConfigChainWithContext, ConfigChain, DevConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, ServerConfig, RsbuildPluginAPI, OutputConfig, DistPathConfig, Rspack, RequestHandler, NodeEnv, HtmlTagDescriptor, RsbuildPlugin } from '@rsbuild/core';
+import type { ConfigChainWithContext, ConfigChain, DevConfig, HtmlConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, ServerConfig, RsbuildPluginAPI, OutputConfig, DistPathConfig, Rspack, RequestHandler, HtmlTagDescriptor, RsbuildPlugin } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
 import type { PluginRemOptions } from '@rsbuild/plugin-rem';
@@ -48,7 +48,7 @@ export type CreateUniBuilderOptions = {
 } & Partial<CreateBuilderCommonOptions>;
 export type GlobalVars = Record<string, any>;
 export type ChainedGlobalVars = ConfigChainWithContext<GlobalVars, {
-    env: NodeEnv;
+    env: string;
     target: RsbuildTarget;
 }>;
 export type ModuleScopes = Array<string | RegExp>;
@@ -247,6 +247,7 @@ export type UniBuilderExtraConfig = {
         disableCssExtract?: boolean;
     };
     html?: {
+        appIcon?: string | HtmlConfig['appIcon'];
         /**
          * Remove the folder of the HTML files.
          * When this option is enabled, the generated HTML file path will change from `[name]/index.html` to `[name].html`.
@@ -366,7 +367,7 @@ export type DistPath = DistPathConfig & {
 };
 export type UniBuilderConfig = {
     dev?: RsbuildConfig['dev'];
-    html?: RsbuildConfig['html'];
+    html?: Omit<NonNullable<RsbuildConfig['html']>, 'appIcon'>;
     output?: Omit<NonNullable<RsbuildConfig['output']>, 'polyfill' | 'distPath'> & {
         polyfill?: Polyfill | 'ua';
         distPath?: DistPath;

package/dist/webpack/plugins/babel.d.ts

@@ -1,4 +1,4 @@
-import { type RsbuildPlugin } from '@rsbuild/core';
+import type { RsbuildPlugin } from '@rsbuild/core';
 import { type PluginBabelOptions } from '@rsbuild/plugin-babel';
 /**
  * Plugin order:

package/dist/webpack/plugins/minimize.d.ts

@@ -1,3 +1,3 @@
-import { type RsbuildPlugin } from '@rsbuild/core';
-import { ToolsTerserConfig } from '../../types';
+import type { RsbuildPlugin } from '@rsbuild/core';
+import type { ToolsTerserConfig } from '../../types';
 export declare const pluginMinimize: (userTerserConfig?: ToolsTerserConfig) => RsbuildPlugin;

package/dist/webpack/plugins/tsLoader.d.ts

@@ -1,4 +1,4 @@
-import { type ConfigChainWithContext } from '@rsbuild/core';
+import type { ConfigChainWithContext } from '@rsbuild/core';
 import { type PluginBabelOptions } from '@rsbuild/plugin-babel';
 import type { RsbuildPlugin } from '@rsbuild/core';
 import type { Options as RawTSLoaderOptions } from 'ts-loader';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.58.0",
+  "version": "2.58.2",
   "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.9",
-    "@rsbuild/plugin-sass": "1.0.1-beta.9",
-    "@rsbuild/plugin-less": "1.0.1-beta.9",
-    "@rsbuild/plugin-assets-retry": "1.0.1-beta.9",
-    "@rsbuild/plugin-babel": "1.0.1-beta.9",
-    "@rsbuild/plugin-check-syntax": "1.0.1-beta.9",
-    "@rsbuild/plugin-css-minimizer": "1.0.1",
-    "@rsbuild/plugin-pug": "1.0.1",
-    "@rsbuild/plugin-react": "1.0.1-beta.9",
-    "@rsbuild/plugin-rem": "1.0.1-beta.9",
-    "@rsbuild/plugin-source-build": "1.0.1-beta.9",
-    "@rsbuild/plugin-styled-components": "1.0.1-beta.9",
-    "@rsbuild/plugin-svgr": "1.0.1-beta.9",
-    "@rsbuild/plugin-type-check": "1.0.1-beta.9",
-    "@rsbuild/plugin-typed-css-modules": "1.0.1",
-    "@rsbuild/plugin-toml": "1.0.0",
-    "@rsbuild/plugin-yaml": "1.0.1",
-    "@rsbuild/webpack": "1.0.1-beta.9",
+    "@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/plugin-check-syntax": "1.0.1",
+    "@rsbuild/plugin-css-minimizer": "1.0.2",
+    "@rsbuild/plugin-less": "1.0.1-beta.14",
+    "@rsbuild/plugin-pug": "1.0.2",
+    "@rsbuild/plugin-react": "1.0.1-beta.14",
+    "@rsbuild/plugin-rem": "1.0.1",
+    "@rsbuild/plugin-sass": "1.0.1-beta.14",
+    "@rsbuild/plugin-source-build": "1.0.1",
+    "@rsbuild/plugin-styled-components": "1.0.1",
+    "@rsbuild/plugin-svgr": "1.0.1-beta.14",
+    "@rsbuild/plugin-toml": "1.0.1",
+    "@rsbuild/plugin-type-check": "1.0.1-beta.14",
+    "@rsbuild/plugin-typed-css-modules": "1.0.2",
+    "@rsbuild/plugin-yaml": "1.0.2",
+    "@rsbuild/webpack": "1.0.1-beta.14",
     "@swc/helpers": "0.5.3",
     "autoprefixer": "10.4.19",
     "babel-loader": "9.1.3",
@@ -53,9 +53,10 @@
     "browserslist": "4.23.1",
     "cssnano": "6.0.1",
     "glob": "^9.3.5",
-    "html-webpack-plugin": "5.5.3",
     "html-minifier-terser": "^7.2.0",
+    "html-webpack-plugin": "5.5.3",
     "lodash": "^4.17.21",
+    "picocolors": "^1.0.1",
     "postcss": "^8.4.35",
     "postcss-custom-properties": "13.1.5",
     "postcss-flexbugs-fixes": "5.0.2",
@@ -64,7 +65,6 @@
     "postcss-media-minmax": "5.0.0",
     "postcss-nesting": "12.0.1",
     "postcss-page-break": "3.0.4",
-    "picocolors": "^1.0.1",
     "react-refresh": "^0.14.0",
     "rspack-manifest-plugin": "5.0.0",
     "terser-webpack-plugin": "5.3.10",
@@ -72,19 +72,19 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.93.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.58.0",
-    "@modern-js/babel-preset": "2.58.0"
+    "@modern-js/babel-preset": "2.58.2",
+    "@modern-js/utils": "2.58.2"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "1.0.1-beta.9",
+    "@rsbuild/plugin-swc": "1.0.1-beta.14",
     "@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.58.0",
-    "@scripts/vitest-config": "2.58.0"
+    "@scripts/vitest-config": "2.58.2",
+    "@scripts/build": "2.58.2"
   },
   "publishConfig": {
     "access": "public",