@rsbuild/core 1.0.8 → 1.0.9

package/dist/index.cjs

@@ -40,7 +40,7 @@ var __publicField = (obj, key, value) => {
 
 // ../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/error.js
 var require_error = __commonJS({
-  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/error.js"(exports2) {
+  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/error.js"(exports) {
     "use strict";
     var CommanderError2 = class extends Error {
       /**
@@ -69,14 +69,14 @@ var require_error = __commonJS({
         this.name = this.constructor.name;
       }
     };
-    exports2.CommanderError = CommanderError2;
-    exports2.InvalidArgumentError = InvalidArgumentError2;
+    exports.CommanderError = CommanderError2;
+    exports.InvalidArgumentError = InvalidArgumentError2;
   }
 });
 
 // ../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/argument.js
 var require_argument = __commonJS({
-  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/argument.js"(exports2) {
+  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/argument.js"(exports) {
     "use strict";
     var { InvalidArgumentError: InvalidArgumentError2 } = require_error();
     var Argument2 = class {
@@ -197,14 +197,14 @@ var require_argument = __commonJS({
       const nameOutput = arg.name() + (arg.variadic === true ? "..." : "");
       return arg.required ? "<" + nameOutput + ">" : "[" + nameOutput + "]";
     }
-    exports2.Argument = Argument2;
-    exports2.humanReadableArgName = humanReadableArgName;
+    exports.Argument = Argument2;
+    exports.humanReadableArgName = humanReadableArgName;
   }
 });
 
 // ../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/help.js
 var require_help = __commonJS({
-  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/help.js"(exports2) {
+  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/help.js"(exports) {
     "use strict";
     var { humanReadableArgName } = require_argument();
     var Help2 = class {
@@ -617,13 +617,13 @@ var require_help = __commonJS({
         }).join("\n");
       }
     };
-    exports2.Help = Help2;
+    exports.Help = Help2;
   }
 });
 
 // ../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/option.js
 var require_option = __commonJS({
-  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/option.js"(exports2) {
+  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/option.js"(exports) {
     "use strict";
     var { InvalidArgumentError: InvalidArgumentError2 } = require_error();
     var Option2 = class {
@@ -890,14 +890,14 @@ var require_option = __commonJS({
       }
       return { shortFlag, longFlag };
     }
-    exports2.Option = Option2;
-    exports2.DualOptions = DualOptions;
+    exports.Option = Option2;
+    exports.DualOptions = DualOptions;
   }
 });
 
 // ../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/suggestSimilar.js
 var require_suggestSimilar = __commonJS({
-  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/suggestSimilar.js"(exports2) {
+  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/suggestSimilar.js"(exports) {
     "use strict";
     var maxDistance = 3;
     function editDistance(a, b) {
@@ -974,13 +974,13 @@ var require_suggestSimilar = __commonJS({
       }
       return "";
     }
-    exports2.suggestSimilar = suggestSimilar;
+    exports.suggestSimilar = suggestSimilar;
   }
 });
 
 // ../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/command.js
 var require_command = __commonJS({
-  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/command.js"(exports2) {
+  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/command.js"(exports) {
     "use strict";
     var EventEmitter = require("events").EventEmitter;
     var childProcess = require("child_process");
@@ -3049,30 +3049,30 @@ Expecting one of '${allowedValues.join("', '")}'`);
         return arg;
       });
     }
-    exports2.Command = Command2;
+    exports.Command = Command2;
   }
 });
 
 // ../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/index.js
 var require_commander = __commonJS({
-  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/index.js"(exports2) {
+  "../../node_modules/.pnpm/commander@12.1.0/node_modules/commander/index.js"(exports) {
     "use strict";
     var { Argument: Argument2 } = require_argument();
     var { Command: Command2 } = require_command();
     var { CommanderError: CommanderError2, InvalidArgumentError: InvalidArgumentError2 } = require_error();
     var { Help: Help2 } = require_help();
     var { Option: Option2 } = require_option();
-    exports2.program = new Command2();
-    exports2.createCommand = (name) => new Command2(name);
-    exports2.createOption = (flags, description) => new Option2(flags, description);
-    exports2.createArgument = (name, description) => new Argument2(name, description);
-    exports2.Command = Command2;
-    exports2.Option = Option2;
-    exports2.Argument = Argument2;
-    exports2.Help = Help2;
-    exports2.CommanderError = CommanderError2;
-    exports2.InvalidArgumentError = InvalidArgumentError2;
-    exports2.InvalidOptionArgumentError = InvalidArgumentError2;
+    exports.program = new Command2();
+    exports.createCommand = (name) => new Command2(name);
+    exports.createOption = (flags, description) => new Option2(flags, description);
+    exports.createArgument = (name, description) => new Argument2(name, description);
+    exports.Command = Command2;
+    exports.Option = Option2;
+    exports.Argument = Argument2;
+    exports.Help = Help2;
+    exports.CommanderError = CommanderError2;
+    exports.InvalidArgumentError = InvalidArgumentError2;
+    exports.InvalidOptionArgumentError = InvalidArgumentError2;
   }
 });
 
@@ -3103,7 +3103,7 @@ var init_esm = __esm({
 
 // ../../node_modules/.pnpm/deepmerge@4.3.1/node_modules/deepmerge/dist/cjs.js
 var require_cjs = __commonJS({
-  "../../node_modules/.pnpm/deepmerge@4.3.1/node_modules/deepmerge/dist/cjs.js"(exports2, module2) {
+  "../../node_modules/.pnpm/deepmerge@4.3.1/node_modules/deepmerge/dist/cjs.js"(exports, module2) {
     "use strict";
     var isMergeableObject = function isMergeableObject2(value) {
       return isNonNullObject(value) && !isSpecial(value);
@@ -4431,7 +4431,7 @@ var init_config = __esm({
 
 // ../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/package.json
 var require_package = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/package.json"(exports2, module2) {
+  "../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/package.json"(exports, module2) {
     module2.exports = {
       name: "dotenv",
       version: "16.4.5",
@@ -4502,7 +4502,7 @@ var require_package = __commonJS({
 
 // ../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/lib/main.js
 var require_main = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/lib/main.js"(exports2, module2) {
+  "../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/lib/main.js"(exports, module2) {
     "use strict";
     var fs12 = require("fs");
     var path21 = require("path");
@@ -4511,7 +4511,7 @@ var require_main = __commonJS({
     var packageJson = require_package();
     var version2 = packageJson.version;
     var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
-    function parse4(src) {
+    function parse3(src) {
       const obj = {};
       let lines = src.toString();
       lines = lines.replace(/\r\n?/mg, "\n");
@@ -4754,7 +4754,7 @@ var require_main = __commonJS({
       _parseVault,
       config,
       decrypt,
-      parse: parse4,
+      parse: parse3,
       populate
     };
     module2.exports.configDotenv = DotenvModule.configDotenv;
@@ -4770,7 +4770,7 @@ var require_main = __commonJS({
 
 // ../../node_modules/.pnpm/dotenv-expand@11.0.6/node_modules/dotenv-expand/lib/main.js
 var require_main2 = __commonJS({
-  "../../node_modules/.pnpm/dotenv-expand@11.0.6/node_modules/dotenv-expand/lib/main.js"(exports2, module2) {
+  "../../node_modules/.pnpm/dotenv-expand@11.0.6/node_modules/dotenv-expand/lib/main.js"(exports, module2) {
     "use strict";
     var DOTENV_SUBSTITUTION_REGEX = /(\\)?(\$)(?!\()(\{?)([\w.]+)(?::?-((?:\$\{(?:\$\{(?:\$\{[^}]*\}|[^}])*}|[^}])*}|[^}])+))?(\}?)/gi;
     function _resolveEscapeSequences(value) {
@@ -4902,7 +4902,7 @@ var init_loadEnv = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/browserslist-load-config@0.0.2/node_modules/browserslist-load-config/dist/index.js
+// ../../node_modules/.pnpm/browserslist-load-config@0.1.1/node_modules/browserslist-load-config/dist/index.js
 function isFile(file) {
   if (file in isFileCache) {
     return isFileCache[file];
@@ -4933,9 +4933,12 @@ function parsePackage(file) {
     );
   }
   let list = config.browserslist;
-  if (Array.isArray(list) || typeof list === "string") {
+  if (Array.isArray(list)) {
     list = { defaults: list };
   }
+  if (typeof list === "string") {
+    list = parseConfig(list);
+  }
   for (const i in list) {
     check(list[i]);
   }
@@ -5080,7 +5083,7 @@ function loadConfig2(opts) {
 }
 var import_node_fs4, import_node_path8, BrowserslistError, isFileCache, IS_SECTION, configCache;
 var init_dist = __esm({
-  "../../node_modules/.pnpm/browserslist-load-config@0.0.2/node_modules/browserslist-load-config/dist/index.js"() {
+  "../../node_modules/.pnpm/browserslist-load-config@0.1.1/node_modules/browserslist-load-config/dist/index.js"() {
     "use strict";
     import_node_fs4 = __toESM(require("fs"));
     import_node_path8 = __toESM(require("path"));
@@ -5979,7 +5982,7 @@ async function createContext(options, userConfig, bundlerType) {
   const rsbuildConfig = await withDefaultConfig(rootPath, userConfig);
   const cachePath = (0, import_node_path10.join)(rootPath, "node_modules", ".cache");
   return {
-    version: "1.0.8",
+    version: "1.0.9",
     rootPath,
     distPath: "",
     cachePath,
@@ -6803,7 +6806,7 @@ async function createCompiler(options) {
     };
     const hasErrors = stats.hasErrors();
     if (!hasErrors) {
-      if (statsJson.children && statsJson.children.length > 0) {
+      if (rspackConfigs.length > 1 && statsJson.children?.length) {
         statsJson.children.forEach((c, index) => {
           printTime(c, index);
         });
@@ -7277,12 +7280,11 @@ var init_environment = __esm({
 });
 
 // src/server/middlewares.ts
-var import_node_path16, import_node_url2, import_picocolors9, faviconFallbackMiddleware, getStatusCodeColor, getRequestLoggerMiddleware, notFoundMiddleware, isFileExists2, maybeHTMLRequest, getHtmlCompletionMiddleware, getHtmlFallbackMiddleware;
+var import_node_path16, import_picocolors9, faviconFallbackMiddleware, getStatusCodeColor, getRequestLoggerMiddleware, notFoundMiddleware, isFileExists2, maybeHTMLRequest, postfixRE, getUrlPathname, getHtmlCompletionMiddleware, getHtmlFallbackMiddleware;
 var init_middlewares = __esm({
   "src/server/middlewares.ts"() {
     "use strict";
     import_node_path16 = __toESM(require("path"));
-    import_node_url2 = require("url");
     import_picocolors9 = __toESM(require("../compiled/picocolors/index.js"));
     init_logger();
     faviconFallbackMiddleware = (req, res, next) => {
@@ -7349,21 +7351,17 @@ var init_middlewares = __esm({
       const { accept } = req.headers;
       return typeof accept === "string" && (accept.includes("text/html") || accept.includes("*/*"));
     };
+    postfixRE = /[?#].*$/;
+    getUrlPathname = (url2) => {
+      return url2.replace(postfixRE, "");
+    };
     getHtmlCompletionMiddleware = ({ distPath, callback, outputFileSystem }) => {
       return async (req, res, next) => {
         if (!maybeHTMLRequest(req)) {
           return next();
         }
         const url2 = req.url;
-        let pathname;
-        try {
-          pathname = (0, import_node_url2.parse)(url2, false, true).pathname;
-        } catch (err) {
-          import_rslog.logger.error(
-            new Error(`Invalid URL: ${import_picocolors9.default.yellow(url2)}`, { cause: err })
-          );
-          return next();
-        }
+        const pathname = getUrlPathname(url2);
         const rewrite = (newUrl) => {
           req.url = newUrl;
           return callback(req, res, (...args) => {
@@ -7586,12 +7584,12 @@ var init_proxy = __esm({
 });
 
 // src/server/getDevMiddlewares.ts
-var import_node_path17, import_node_url3, applySetupMiddlewares, applyDefaultMiddlewares, getMiddlewares;
+var import_node_path17, import_node_url2, applySetupMiddlewares, applyDefaultMiddlewares, getMiddlewares;
 var init_getDevMiddlewares = __esm({
   "src/server/getDevMiddlewares.ts"() {
     "use strict";
     import_node_path17 = require("path");
-    import_node_url3 = __toESM(require("url"));
+    import_node_url2 = __toESM(require("url"));
     init_config();
     init_logger();
     init_middlewares();
@@ -7629,7 +7627,7 @@ var init_getDevMiddlewares = __esm({
       }
       middlewares.push((req, res, next) => {
         res.setHeader("Access-Control-Allow-Origin", "*");
-        const path21 = req.url ? import_node_url3.default.parse(req.url).pathname : "";
+        const path21 = req.url ? import_node_url2.default.parse(req.url).pathname : "";
         if (path21?.includes("hot-update")) {
           res.setHeader("Access-Control-Allow-Credentials", "false");
         }
@@ -7754,7 +7752,7 @@ var init_getDevMiddlewares = __esm({
 function getURLMessages(urls, routes) {
   if (routes.length === 1) {
     return urls.map(
-      ({ label, url: url2 }) => `  ${`> ${label.padEnd(10)}`}${import_picocolors10.default.cyan(
+      ({ label, url: url2 }) => `  ${`➜ ${label.padEnd(10)}`}${import_picocolors10.default.cyan(
         normalizeUrl(`${url2}${routes[0].pathname}`)
       )}
 `
@@ -7766,7 +7764,7 @@ function getURLMessages(urls, routes) {
     if (index > 0) {
       message += "\n";
     }
-    message += `  ${`> ${label}`}
+    message += `  ${`➜ ${label}`}
 `;
     for (const r of routes) {
       message += `  ${import_picocolors10.default.dim("-")} ${import_picocolors10.default.dim(
@@ -7894,8 +7892,7 @@ var init_helper = __esm({
       host,
       port,
       strictPort,
-      tryLimits = 20,
-      silent = false
+      tryLimits = 20
     }) => {
       if (typeof port === "string") {
         port = Number.parseInt(port, 10);
@@ -7931,28 +7928,27 @@ var init_helper = __esm({
             `Port "${original}" is occupied, please choose another one.`
           );
         }
-        if (!silent) {
-          import_rslog.logger.info(
-            `Port ${original} is in use, ${import_picocolors10.default.yellow(`using port ${port}.`)}
-`
-          );
-        }
       }
       return port;
     };
     getServerConfig = async ({
-      config,
-      getPortSilently
+      config
     }) => {
       const host = config.server.host || DEFAULT_DEV_HOST;
+      const originalPort = config.server.port || DEFAULT_PORT;
       const port = await getPort({
         host,
-        port: config.server.port || DEFAULT_PORT,
-        strictPort: config.server.strictPort || false,
-        silent: getPortSilently
+        port: originalPort,
+        strictPort: config.server.strictPort || false
       });
       const https = Boolean(config.server.https) || false;
-      return { port, host, https };
+      const portTip = port !== originalPort ? `Port ${originalPort} is in use, ${import_picocolors10.default.yellow(`using port ${port}.`)}` : void 0;
+      return {
+        port,
+        host,
+        https,
+        portTip
+      };
     };
     getIpv4Interfaces = () => {
       const interfaces = import_node_os.default.networkInterfaces();
@@ -8705,9 +8701,8 @@ async function createDevServer(options, createCompiler2, config, {
   runCompile = true
 } = {}) {
   import_rslog.logger.debug("create dev server");
-  const { port, host, https } = await getServerConfig({
-    config,
-    getPortSilently
+  const { port, host, https, portTip } = await getServerConfig({
+    config
   });
   const devConfig = formatDevConfig(config.dev, port);
   const routes = getRoutes(options.context);
@@ -8764,6 +8759,9 @@ async function createDevServer(options, createCompiler2, config, {
       protocol,
       printUrls: config.server.printUrls
     });
+    if (!getPortSilently && portTip) {
+      import_rslog.logger.info(portTip);
+    }
   };
   if (runCompile) {
     options.context.hooks.onBeforeCreateCompiler.tap(printUrls);
@@ -11775,7 +11773,7 @@ function determineAsValue({
   href,
   file
 }) {
-  const url2 = new import_node_url4.URL(file || href, "https://example.com");
+  const url2 = new import_node_url3.URL(file || href, "https://example.com");
   const extension = import_node_path33.default.extname(url2.pathname).slice(1);
   if (["css"].includes(extension)) {
     return "style";
@@ -11797,12 +11795,12 @@ function determineAsValue({
   }
   return "script";
 }
-var import_node_path33, import_node_url4;
+var import_node_path33, import_node_url3;
 var init_determineAsValue = __esm({
   "src/rspack/preload/helpers/determineAsValue.ts"() {
     "use strict";
     import_node_path33 = __toESM(require("path"));
-    import_node_url4 = require("url");
+    import_node_url3 = require("url");
     init_constants();
   }
 });
@@ -12352,6 +12350,9 @@ function pluginModuleFederation() {
   return {
     name: "rsbuild:module-federation",
     setup(api) {
+      if (api.context.bundlerType === "webpack") {
+        return;
+      }
       api.modifyRsbuildConfig((config) => {
         const { moduleFederation } = config;
         if (!moduleFederation?.options) {
@@ -12806,9 +12807,8 @@ __export(prodServer_exports, {
   startProdServer: () => startProdServer
 });
 async function startProdServer(context, config, { getPortSilently } = {}) {
-  const { port, host, https } = await getServerConfig({
-    config,
-    getPortSilently
+  const { port, host, https, portTip } = await getServerConfig({
+    config
   });
   const { default: connect } = await import("../compiled/connect/index.js");
   const middlewares = connect();
@@ -12855,6 +12855,9 @@ async function startProdServer(context, config, { getPortSilently } = {}) {
           protocol,
           printUrls: serverConfig.printUrls
         });
+        if (portTip && !getPortSilently) {
+          import_rslog.logger.info(portTip);
+        }
         const onClose = async () => {
           await Promise.all([server.close(), serverTerminator()]);
         };
@@ -13264,7 +13267,7 @@ var init_init = __esm({
 
 // src/cli/commands.ts
 function runCli() {
-  program.name("rsbuild").usage("<command> [options]").version("1.0.8");
+  program.name("rsbuild").usage("<command> [options]").version("1.0.9");
   const devCommand = program.command("dev");
   const buildCommand = program.command("build");
   const previewCommand = program.command("preview");
@@ -13387,7 +13390,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  import_rslog.logger.greet(`  ${`Rsbuild v${"1.0.8"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"1.0.9"}`}
 `);
 }
 var init_prepare = __esm({
@@ -13471,7 +13474,7 @@ init_logger();
 init_mergeConfig();
 init_helpers();
 init_constants();
-var version = "1.0.8";
+var version = "1.0.9";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,