@modern-js/uni-builder 0.0.0-nightly-20240129170639 → 0.0.0-nightly-20240130170640

package/dist/shared/parseCommonConfig.js

@@ -93,16 +93,27 @@ 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, _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 _newDevServerConfig_devMiddleware, _uniBuilderConfig_security, _uniBuilderConfig_output, _uniBuilderConfig_tools;
   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;
-  if (output.cssModuleLocalIdentName) {
+  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { 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 } = {}, tools: { devServer, tsChecker, minifyCss, ...toolsConfig } = {} } = uniBuilderConfig;
+  const rsbuildConfig = {
+    plugins,
+    output: outputConfig,
+    source: {
+      alias,
+      ...sourceConfig
+    },
+    performance: performanceConfig,
+    html: htmlConfig,
+    tools: toolsConfig,
+    dev: devConfig
+  };
+  const { dev = {}, html = {}, output = {} } = rsbuildConfig;
+  if (cssModuleLocalIdentName) {
     var _output2;
     (_output2 = output).cssModules || (_output2.cssModules = {});
-    output.cssModules.localIdentName = output.cssModuleLocalIdentName;
-    delete output.cssModuleLocalIdentName;
+    output.cssModules.localIdentName = cssModuleLocalIdentName;
   }
   var _distPath;
   (_distPath = (_output = output).distPath) !== null && _distPath !== void 0 ? _distPath : _output.distPath = {};
@@ -112,22 +123,17 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   (_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) {
+  if (disableCssModuleExtension) {
     var _output3, _output_cssModules;
     (_output3 = output).cssModules || (_output3.cssModules = {});
     var _auto;
     (_auto = (_output_cssModules = output.cssModules).auto) !== null && _auto !== void 0 ? _auto : _output_cssModules.auto = isLooseCssModules;
-    delete output.cssModuleLocalIdentName;
   }
-  if ((_uniBuilderConfig_output = uniBuilderConfig.output) === null || _uniBuilderConfig_output === void 0 ? void 0 : _uniBuilderConfig_output.enableInlineScripts) {
-    var _uniBuilderConfig_output10;
-    output.inlineScripts = (_uniBuilderConfig_output10 = uniBuilderConfig.output) === null || _uniBuilderConfig_output10 === void 0 ? void 0 : _uniBuilderConfig_output10.enableInlineScripts;
-    delete output.enableInlineScripts;
+  if (enableInlineScripts) {
+    output.inlineScripts = enableInlineScripts;
   }
-  if ((_uniBuilderConfig_output1 = uniBuilderConfig.output) === null || _uniBuilderConfig_output1 === void 0 ? void 0 : _uniBuilderConfig_output1.disableCssExtract) {
-    var _uniBuilderConfig_output11;
-    output.injectStyles = (_uniBuilderConfig_output11 = uniBuilderConfig.output) === null || _uniBuilderConfig_output11 === void 0 ? void 0 : _uniBuilderConfig_output11.disableCssExtract;
-    delete output.disableCssExtract;
+  if (disableCssExtract) {
+    output.injectStyles = disableCssExtract;
   }
   const targets = Array.isArray(target) ? target : [
     target || "web"
@@ -138,40 +144,31 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     overrideBrowserslist[target2] = await getBrowserslistWithDefault(cwd, uniBuilderConfig, target2);
   }
   output.overrideBrowserslist = overrideBrowserslist;
-  if ((_uniBuilderConfig_output2 = uniBuilderConfig.output) === null || _uniBuilderConfig_output2 === void 0 ? void 0 : _uniBuilderConfig_output2.enableInlineStyles) {
-    var _uniBuilderConfig_output12;
-    output.inlineStyles = (_uniBuilderConfig_output12 = uniBuilderConfig.output) === null || _uniBuilderConfig_output12 === void 0 ? void 0 : _uniBuilderConfig_output12.enableInlineStyles;
-    delete output.enableInlineStyles;
+  if (enableInlineStyles) {
+    output.inlineStyles = enableInlineStyles;
   }
   const extraConfig = {};
   (_extraConfig = extraConfig).html || (_extraConfig.html = {});
-  extraConfig.html.outputStructure = html.disableHtmlFolder ? "flat" : "nested";
-  delete html.disableHtmlFolder;
-  if ((_uniBuilderConfig_html = uniBuilderConfig.html) === null || _uniBuilderConfig_html === void 0 ? void 0 : _uniBuilderConfig_html.metaByEntries) {
-    extraConfig.html.meta = ({ entryName }) => uniBuilderConfig.html.metaByEntries[entryName];
-    delete html.metaByEntries;
+  extraConfig.html.outputStructure = disableHtmlFolder ? "flat" : "nested";
+  if (metaByEntries) {
+    extraConfig.html.meta = ({ entryName }) => metaByEntries[entryName];
   }
   var _title;
   (_title = (_html = html).title) !== null && _title !== void 0 ? _title : _html.title = "";
-  if ((_uniBuilderConfig_html1 = uniBuilderConfig.html) === null || _uniBuilderConfig_html1 === void 0 ? void 0 : _uniBuilderConfig_html1.titleByEntries) {
-    extraConfig.html.title = ({ entryName }) => uniBuilderConfig.html.titleByEntries[entryName];
-    delete html.titleByEntries;
+  if (titleByEntries) {
+    extraConfig.html.title = ({ entryName }) => titleByEntries[entryName];
   }
-  if ((_uniBuilderConfig_html2 = uniBuilderConfig.html) === null || _uniBuilderConfig_html2 === void 0 ? void 0 : _uniBuilderConfig_html2.faviconByEntries) {
-    extraConfig.html.favicon = ({ entryName }) => uniBuilderConfig.html.faviconByEntries[entryName];
-    delete html.faviconByEntries;
+  if (faviconByEntries) {
+    extraConfig.html.favicon = ({ entryName }) => faviconByEntries[entryName];
   }
-  if ((_uniBuilderConfig_html3 = uniBuilderConfig.html) === null || _uniBuilderConfig_html3 === void 0 ? void 0 : _uniBuilderConfig_html3.injectByEntries) {
-    extraConfig.html.inject = ({ entryName }) => uniBuilderConfig.html.injectByEntries[entryName];
-    delete html.injectByEntries;
+  if (injectByEntries) {
+    extraConfig.html.inject = ({ entryName }) => injectByEntries[entryName];
   }
-  if ((_uniBuilderConfig_html4 = uniBuilderConfig.html) === null || _uniBuilderConfig_html4 === void 0 ? void 0 : _uniBuilderConfig_html4.templateByEntries) {
-    extraConfig.html.template = ({ entryName }) => uniBuilderConfig.html.templateByEntries[entryName];
-    delete html.templateByEntries;
+  if (templateByEntries) {
+    extraConfig.html.template = ({ entryName }) => templateByEntries[entryName];
   }
-  if ((_uniBuilderConfig_html5 = uniBuilderConfig.html) === null || _uniBuilderConfig_html5 === void 0 ? void 0 : _uniBuilderConfig_html5.templateParametersByEntries) {
-    extraConfig.html.templateParameters = (_, { entryName }) => uniBuilderConfig.html.templateParametersByEntries[entryName];
-    delete html.templateParametersByEntries;
+  if (templateParametersByEntries) {
+    extraConfig.html.templateParameters = (_, { entryName }) => templateParametersByEntries[entryName];
   }
   var _tools;
   (_tools = (_extraConfig1 = extraConfig).tools) !== null && _tools !== void 0 ? _tools : _extraConfig1.tools = {};
@@ -192,7 +189,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     dev.progressBar = true;
   }
   var _dev_hmr;
-  const devServer = (0, import_shared.mergeChainedOptions)({
+  const newDevServerConfig = (0, import_shared.mergeChainedOptions)({
     defaults: {
       devMiddleware: {
         writeToDisk: (file) => !file.includes(".hot-update.")
@@ -203,25 +200,21 @@ async function parseCommonConfig(uniBuilderConfig, options) {
         path: "/webpack-hmr"
       }
     },
-    options: tools.devServer,
+    options: devServer,
     mergeFn: import_shared.deepmerge
   });
-  dev.writeToDisk = (_devServer_devMiddleware = devServer.devMiddleware) === null || _devServer_devMiddleware === void 0 ? void 0 : _devServer_devMiddleware.writeToDisk;
-  dev.hmr = devServer.hot;
-  dev.client = devServer.client;
-  dev.liveReload = devServer.liveReload;
+  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: dev.port,
-    host: dev.host,
-    https: dev.https ? dev.https : void 0
+    port,
+    host,
+    https: https ? https : void 0
   };
-  delete tools.devServer;
-  delete dev.https;
-  delete dev.port;
-  delete dev.host;
   rsbuildConfig.server = removeUndefinedKey(server);
   rsbuildConfig.dev = removeUndefinedKey(dev);
   rsbuildConfig.html = html;
@@ -234,9 +227,9 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   }
   const rsbuildPlugins = [
     (0, import_splitChunk.pluginSplitChunks)(),
-    (0, import_globalVars.pluginGlobalVars)((_uniBuilderConfig_source = uniBuilderConfig.source) === null || _uniBuilderConfig_source === void 0 ? void 0 : _uniBuilderConfig_source.globalVars),
+    (0, import_globalVars.pluginGlobalVars)(globalVars),
     (0, import_devtools.pluginDevtool)({
-      disableSourceMap: (_uniBuilderConfig_output3 = uniBuilderConfig.output) === null || _uniBuilderConfig_output3 === void 0 ? void 0 : _uniBuilderConfig_output3.disableSourceMap
+      disableSourceMap
     }),
     (0, import_emitRouteFile.pluginEmitRouteFile)(),
     (0, import_plugin_toml.pluginToml)(),
@@ -247,45 +240,36 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     const { pluginCheckSyntax } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-check-syntax")));
     rsbuildPlugins.push(pluginCheckSyntax(typeof checkSyntaxOptions === "boolean" ? {} : checkSyntaxOptions));
   }
-  if (!((_uniBuilderConfig_output4 = uniBuilderConfig.output) === null || _uniBuilderConfig_output4 === void 0 ? void 0 : _uniBuilderConfig_output4.disableTsChecker)) {
-    var _uniBuilderConfig_tools2;
+  if (!disableTsChecker) {
     const { pluginTypeCheck } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-type-check")));
     rsbuildPlugins.push(pluginTypeCheck({
-      forkTsCheckerOptions: (_uniBuilderConfig_tools2 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools2 === void 0 ? void 0 : _uniBuilderConfig_tools2.tsChecker
+      forkTsCheckerOptions: tsChecker
     }));
-    delete output.disableTsChecker;
-    delete tools.tsChecker;
   }
-  if ((_uniBuilderConfig_source1 = uniBuilderConfig.source) === null || _uniBuilderConfig_source1 === void 0 ? void 0 : _uniBuilderConfig_source1.resolveMainFields) {
-    var _uniBuilderConfig_source3;
+  if (resolveMainFields) {
     const { pluginMainFields } = await Promise.resolve().then(() => __toESM(require("./plugins/mainFields")));
-    rsbuildPlugins.push(pluginMainFields((_uniBuilderConfig_source3 = uniBuilderConfig.source) === null || _uniBuilderConfig_source3 === void 0 ? void 0 : _uniBuilderConfig_source3.resolveMainFields));
+    rsbuildPlugins.push(pluginMainFields(resolveMainFields));
   }
-  if ((_uniBuilderConfig_source2 = uniBuilderConfig.source) === null || _uniBuilderConfig_source2 === void 0 ? void 0 : _uniBuilderConfig_source2.resolveExtensionPrefix) {
-    var _uniBuilderConfig_source4;
+  if (resolveExtensionPrefix) {
     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));
+    rsbuildPlugins.push(pluginExtensionPrefix(resolveExtensionPrefix));
   }
-  const remOptions = (_uniBuilderConfig_output5 = uniBuilderConfig.output) === null || _uniBuilderConfig_output5 === void 0 ? void 0 : _uniBuilderConfig_output5.convertToRem;
-  if (remOptions) {
+  if (convertToRem) {
     const { pluginRem } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-rem")));
-    rsbuildPlugins.push(pluginRem(typeof remOptions === "boolean" ? {} : remOptions));
+    rsbuildPlugins.push(pluginRem(typeof convertToRem === "boolean" ? {} : convertToRem));
   }
-  rsbuildPlugins.push((0, import_runtimeChunk.pluginRuntimeChunk)((_uniBuilderConfig_output6 = uniBuilderConfig.output) === null || _uniBuilderConfig_output6 === void 0 ? void 0 : _uniBuilderConfig_output6.disableInlineRuntimeChunk));
+  rsbuildPlugins.push((0, import_runtimeChunk.pluginRuntimeChunk)((_uniBuilderConfig_output = uniBuilderConfig.output) === null || _uniBuilderConfig_output === void 0 ? void 0 : _uniBuilderConfig_output.disableInlineRuntimeChunk));
   const { sourceBuild } = uniBuilderConfig.experiments || {};
   if (sourceBuild) {
     const { pluginSourceBuild } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-source-build")));
     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;
+  if (!disableSvgr) {
     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"
+      svgDefaultExport: 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) {
@@ -294,12 +278,11 @@ async function parseCommonConfig(uniBuilderConfig, options) {
       pugOptions
     }));
   }
-  if ((_uniBuilderConfig_output8 = uniBuilderConfig.output) === null || _uniBuilderConfig_output8 === void 0 ? void 0 : _uniBuilderConfig_output8.assetsRetry) {
-    var _uniBuilderConfig_output14;
+  if (assetsRetry) {
     const { pluginAssetsRetry } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-assets-retry")));
-    rsbuildPlugins.push(pluginAssetsRetry((_uniBuilderConfig_output14 = uniBuilderConfig.output) === null || _uniBuilderConfig_output14 === void 0 ? void 0 : _uniBuilderConfig_output14.assetsRetry));
+    rsbuildPlugins.push(pluginAssetsRetry(assetsRetry));
   }
-  if ((_uniBuilderConfig_output9 = uniBuilderConfig.output) === null || _uniBuilderConfig_output9 === void 0 ? void 0 : _uniBuilderConfig_output9.enableAssetFallback) {
+  if (enableAssetFallback) {
     const { pluginFallback } = await Promise.resolve().then(() => __toESM(require("./plugins/fallback")));
     rsbuildPlugins.push(pluginFallback());
   }
@@ -307,7 +290,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     rsbuildPlugins.push((0, import_frameworkConfig.pluginFrameworkConfig)(frameworkConfigPath));
   }
   rsbuildPlugins.push((0, import_plugin_css_minimizer.pluginCssMinimizer)({
-    pluginOptions: (_uniBuilderConfig_tools1 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools1 === void 0 ? void 0 : _uniBuilderConfig_tools1.minifyCss
+    pluginOptions: minifyCss
   }));
   targets.includes("web") && rsbuildPlugins.push((0, import_postcssLegacy.pluginPostcssLegacy)(overrideBrowserslist.web));
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "0.0.0-nightly-20240129170639",
+  "version": "0.0.0-nightly-20240130170640",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -64,9 +64,9 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "0.0.0-nightly-20240129170639",
-    "@modern-js/server": "0.0.0-nightly-20240129170639",
-    "@modern-js/prod-server": "0.0.0-nightly-20240129170639"
+    "@modern-js/utils": "0.0.0-nightly-20240130170640",
+    "@modern-js/server": "0.0.0-nightly-20240130170640",
+    "@modern-js/prod-server": "0.0.0-nightly-20240130170640"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.3.7",
@@ -74,9 +74,9 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@modern-js/builder-plugin-node-polyfill": "0.0.0-nightly-20240129170639",
-    "@scripts/build": "0.0.0-nightly-20240129170639",
-    "@scripts/vitest-config": "0.0.0-nightly-20240129170639"
+    "@modern-js/builder-plugin-node-polyfill": "0.0.0-nightly-20240130170640",
+    "@scripts/build": "0.0.0-nightly-20240130170640",
+    "@scripts/vitest-config": "0.0.0-nightly-20240130170640"
   },
   "publishConfig": {
     "access": "public",