@rsbuild/core 1.0.8 → 1.0.9

package/dist/index.js

@@ -46,12 +46,12 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.60.1_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.60.2_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js
 import path from "path";
 import { fileURLToPath } from "url";
 var getFilename, getDirname, __dirname, __filename;
 var init_esm = __esm({
-  "../../node_modules/.pnpm/@modern-js+module-tools@2.60.1_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js"() {
+  "../../node_modules/.pnpm/@modern-js+module-tools@2.60.2_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js"() {
     "use strict";
     getFilename = () => fileURLToPath(import.meta.url);
     getDirname = () => path.dirname(getFilename());
@@ -4553,7 +4553,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");
@@ -4796,7 +4796,7 @@ var require_main = __commonJS({
       _parseVault,
       config,
       decrypt,
-      parse: parse4,
+      parse: parse3,
       populate
     };
     module.exports.configDotenv = DotenvModule.configDotenv;
@@ -4946,7 +4946,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
 import fs4 from "fs";
 import path4 from "path";
 function isFile(file) {
@@ -4979,9 +4979,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]);
   }
@@ -5126,7 +5129,7 @@ function loadConfig2(opts) {
 }
 var 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";
     init_esm();
     BrowserslistError = class _BrowserslistError extends Error {
@@ -6028,7 +6031,7 @@ async function createContext(options, userConfig, bundlerType) {
   const rsbuildConfig = await withDefaultConfig(rootPath, userConfig);
   const cachePath = join6(rootPath, "node_modules", ".cache");
   return {
-    version: "1.0.8",
+    version: "1.0.9",
     rootPath,
     distPath: "",
     cachePath,
@@ -6859,7 +6862,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);
         });
@@ -7339,9 +7342,8 @@ var init_environment = __esm({
 
 // src/server/middlewares.ts
 import path8 from "path";
-import { parse as parse2 } from "url";
 import color9 from "../compiled/picocolors/index.js";
-var faviconFallbackMiddleware, getStatusCodeColor, getRequestLoggerMiddleware, notFoundMiddleware, isFileExists2, maybeHTMLRequest, getHtmlCompletionMiddleware, getHtmlFallbackMiddleware;
+var faviconFallbackMiddleware, getStatusCodeColor, getRequestLoggerMiddleware, notFoundMiddleware, isFileExists2, maybeHTMLRequest, postfixRE, getUrlPathname, getHtmlCompletionMiddleware, getHtmlFallbackMiddleware;
 var init_middlewares = __esm({
   "src/server/middlewares.ts"() {
     "use strict";
@@ -7411,21 +7413,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 = parse2(url2, false, true).pathname;
-        } catch (err) {
-          logger.error(
-            new Error(`Invalid URL: ${color9.yellow(url2)}`, { cause: err })
-          );
-          return next();
-        }
+        const pathname = getUrlPathname(url2);
         const rewrite = (newUrl) => {
           req.url = newUrl;
           return callback(req, res, (...args) => {
@@ -7823,7 +7821,7 @@ import color10 from "../compiled/picocolors/index.js";
 function getURLMessages(urls, routes) {
   if (routes.length === 1) {
     return urls.map(
-      ({ label, url: url2 }) => `  ${`> ${label.padEnd(10)}`}${color10.cyan(
+      ({ label, url: url2 }) => `  ${`➜ ${label.padEnd(10)}`}${color10.cyan(
         normalizeUrl(`${url2}${routes[0].pathname}`)
       )}
 `
@@ -7835,7 +7833,7 @@ function getURLMessages(urls, routes) {
     if (index > 0) {
       message += "\n";
     }
-    message += `  ${`> ${label}`}
+    message += `  ${`➜ ${label}`}
 `;
     for (const r of routes) {
       message += `  ${color10.dim("-")} ${color10.dim(
@@ -7960,8 +7958,7 @@ var init_helper = __esm({
       host,
       port,
       strictPort,
-      tryLimits = 20,
-      silent = false
+      tryLimits = 20
     }) => {
       if (typeof port === "string") {
         port = Number.parseInt(port, 10);
@@ -7997,28 +7994,27 @@ var init_helper = __esm({
             `Port "${original}" is occupied, please choose another one.`
           );
         }
-        if (!silent) {
-          logger.info(
-            `Port ${original} is in use, ${color10.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, ${color10.yellow(`using port ${port}.`)}` : void 0;
+      return {
+        port,
+        host,
+        https,
+        portTip
+      };
     };
     getIpv4Interfaces = () => {
       const interfaces = os.networkInterfaces();
@@ -8432,7 +8428,7 @@ var init_devMiddleware = __esm({
 });
 
 // src/server/socketServer.ts
-import { parse as parse3 } from "querystring";
+import { parse as parse2 } from "querystring";
 function isEqualSet(a, b) {
   if (a.size !== b.size) {
     return false;
@@ -8498,7 +8494,7 @@ var init_socketServer = __esm({
           const queryStr = req.url ? req.url.split("?")[1] : "";
           this.onConnect(
             socket,
-            queryStr ? parse3(queryStr) : {}
+            queryStr ? parse2(queryStr) : {}
           );
         });
       }
@@ -8778,9 +8774,8 @@ async function createDevServer(options, createCompiler2, config, {
   runCompile = true
 } = {}) {
   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);
@@ -8837,6 +8832,9 @@ async function createDevServer(options, createCompiler2, config, {
       protocol,
       printUrls: config.server.printUrls
     });
+    if (!getPortSilently && portTip) {
+      logger.info(portTip);
+    }
   };
   if (runCompile) {
     options.context.hooks.onBeforeCreateCompiler.tap(printUrls);
@@ -12463,6 +12461,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) {
@@ -12920,9 +12921,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();
@@ -12969,6 +12969,9 @@ async function startProdServer(context, config, { getPortSilently } = {}) {
           protocol,
           printUrls: serverConfig.printUrls
         });
+        if (portTip && !getPortSilently) {
+          logger.info(portTip);
+        }
         const onClose = async () => {
           await Promise.all([server.close(), serverTerminator()]);
         };
@@ -13383,7 +13386,7 @@ var init_init = __esm({
 import { existsSync } from "fs";
 import color16 from "../compiled/picocolors/index.js";
 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");
@@ -13505,7 +13508,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  logger.greet(`  ${`Rsbuild v${"1.0.8"}`}
+  logger.greet(`  ${`Rsbuild v${"1.0.9"}`}
 `);
 }
 var init_prepare = __esm({
@@ -13576,7 +13579,7 @@ init_mergeConfig();
 init_helpers();
 init_constants();
 import { rspack as rspack10 } from "@rspack/core";
-var version = "1.0.8";
+var version = "1.0.9";
 export {
   PLUGIN_CSS_NAME,
   PLUGIN_SWC_NAME,

package/dist-types/server/helper.d.ts

@@ -33,20 +33,19 @@ export declare function printServerURLs({ urls: originalUrls, port, routes, prot
  * @param strictPort - Whether to throw an error when the port is occupied.
  * @returns Available port number.
  */
-export declare const getPort: ({ host, port, strictPort, tryLimits, silent, }: {
+export declare const getPort: ({ host, port, strictPort, tryLimits, }: {
     host: string;
     port: string | number;
     strictPort: boolean;
     tryLimits?: number;
-    silent?: boolean;
 }) => Promise<number>;
-export declare const getServerConfig: ({ config, getPortSilently, }: {
+export declare const getServerConfig: ({ config, }: {
     config: NormalizedConfig;
-    getPortSilently?: boolean;
 }) => Promise<{
     port: number;
     host: string;
     https: boolean;
+    portTip: string | undefined;
 }>;
 type AddressUrl = {
     label: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -46,8 +46,8 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rspack/core": "~1.0.7",
-    "@rspack/lite-tapable": "~1.0.0",
+    "@rspack/core": "~1.0.8",
+    "@rspack/lite-tapable": "~1.0.1",
     "@swc/helpers": "^0.5.13",
     "core-js": "~3.38.1"
   },
@@ -58,7 +58,7 @@
     "@types/on-finished": "2.3.4",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/ws": "^8.5.12",
-    "browserslist-load-config": "0.0.2",
+    "browserslist-load-config": "0.1.1",
     "chokidar": "3.6.0",
     "commander": "^12.1.0",
     "connect": "3.7.0",
@@ -83,7 +83,7 @@
     "reduce-configs": "^1.0.0",
     "rsbuild-dev-middleware": "0.1.1",
     "rslog": "^1.2.3",
-    "rspack-chain": "^1.0.1",
+    "rspack-chain": "^1.0.3",
     "rspack-manifest-plugin": "5.0.1",
     "sirv": "^2.0.4",
     "style-loader": "3.3.4",