@modern-js/uni-builder 2.60.3 → 2.60.5

package/dist/shared/parseCommonConfig.js

@@ -82,7 +82,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_output, _uniBuilderConfig_tools;
   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, transformImport, ...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, sourceMap, convertToRem, disableMinimize, polyfill, dataUriLimit = 1e4, distPath = {}, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, outputStructure, 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: {
@@ -158,7 +158,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   }
   const extraConfig = {};
   (_extraConfig = extraConfig).html || (_extraConfig.html = {});
-  extraConfig.html.outputStructure = disableHtmlFolder ? "flat" : "nested";
+  extraConfig.html.outputStructure = outputStructure !== null && outputStructure !== void 0 ? outputStructure : disableHtmlFolder ? "flat" : "nested";
   if (metaByEntries) {
     extraConfig.html.meta = ({ entryName }) => metaByEntries[entryName];
   }
@@ -235,7 +235,8 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     (0, import_splitChunk.pluginSplitChunks)(),
     (0, import_globalVars.pluginGlobalVars)(globalVars),
     (0, import_devtools.pluginDevtool)({
-      disableSourceMap
+      disableSourceMap,
+      sourceMap
     }),
     (0, import_emitRouteFile.pluginEmitRouteFile)(),
     (0, import_plugin_toml.pluginToml)(),

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

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

package/dist/shared/plugins/devtools.js

@@ -21,20 +21,32 @@ __export(devtools_exports, {
   pluginDevtool: () => pluginDevtool
 });
 module.exports = __toCommonJS(devtools_exports);
+var import_utils = require("@modern-js/utils");
 const isUseJsSourceMap = (disableSourceMap = {}) => {
-  return typeof disableSourceMap === "boolean" ? !disableSourceMap : !disableSourceMap.js;
+  if (typeof disableSourceMap === "boolean") {
+    return !disableSourceMap;
+  }
+  return !disableSourceMap.js;
 };
 const pluginDevtool = (options) => ({
   name: "uni-builder:devtool",
   setup(api) {
+    var _options_sourceMap;
+    const devtoolJs = (_options_sourceMap = options.sourceMap) === null || _options_sourceMap === void 0 ? void 0 : _options_sourceMap.js;
+    if (devtoolJs) {
+      if (!isUseJsSourceMap(options.disableSourceMap)) {
+        import_utils.logger.warn("Detected that `output.sourceMap` and `output.disableSourceMap` are used together, use the value of `output.sourceMap`");
+      }
+      return;
+    }
     api.modifyBundlerChain((chain, { isProd, isServer }) => {
       if (!isUseJsSourceMap(options.disableSourceMap)) {
         chain.devtool(false);
-      } else {
-        const prodDevTool = isServer ? "source-map" : "hidden-source-map";
-        const devtool = isProd ? prodDevTool : "cheap-module-source-map";
-        chain.devtool(devtool);
+        return;
       }
+      const prodDevTool = isServer ? "source-map" : "hidden-source-map";
+      const devtool = isProd ? prodDevTool : "cheap-module-source-map";
+      chain.devtool(devtool);
     });
   }
 });

package/dist/types.d.ts

@@ -238,6 +238,7 @@ export type UniBuilderExtraConfig = {
         disableSvgr?: boolean;
         /**
          * Whether to disable source map.
+         * @deprecated use `output.sourceMap` instead
          */
         disableSourceMap?: DisableSourceMapOption;
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.60.3",
+  "version": "2.60.5",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -54,7 +54,7 @@
     "cssnano": "6.0.1",
     "glob": "^9.3.5",
     "html-minifier-terser": "^7.2.0",
-    "html-webpack-plugin": "5.5.3",
+    "html-webpack-plugin": "5.6.2",
     "lodash": "^4.17.21",
     "picocolors": "^1.0.1",
     "postcss": "^8.4.35",
@@ -66,25 +66,25 @@
     "postcss-nesting": "12.0.1",
     "postcss-page-break": "3.0.4",
     "react-refresh": "^0.14.0",
-    "rspack-manifest-plugin": "5.0.0",
+    "rspack-manifest-plugin": "5.0.1",
     "terser-webpack-plugin": "5.3.10",
-    "ts-deepmerge": "7.0.0",
+    "ts-deepmerge": "7.0.1",
     "ts-loader": "9.4.4",
     "webpack": "^5.95.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.60.3",
-    "@modern-js/babel-preset": "2.60.3"
+    "@modern-js/babel-preset": "2.60.5",
+    "@modern-js/utils": "2.60.5"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "~1.0.3",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/lodash": "^4.14.202",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@scripts/build": "2.60.3",
-    "@scripts/vitest-config": "2.60.3"
+    "@scripts/build": "2.60.5",
+    "@scripts/vitest-config": "2.60.5"
   },
   "publishConfig": {
     "access": "public",