@rsbuild/core 0.6.7 → 0.6.8

package/dist/cli/commands.js

@@ -39,7 +39,7 @@ const applyServerOptions = (command) => {
   command.option("-o --open [url]", "open the page in browser on startup").option("--port <port>", "specify a port number for server to listen").option("--host <host>", "specify the host that the server listens to");
 };
 function runCli() {
-  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.6.7");
+  import_commander.program.name("rsbuild").usage("<command> [options]").version("0.6.8");
   const devCommand = import_commander.program.command("dev");
   const buildCommand = import_commander.program.command("build");
   const previewCommand = import_commander.program.command("preview");

package/dist/cli/prepare.js

@@ -34,7 +34,7 @@ function prepareCli() {
   if (!npm_execpath || npm_execpath.includes("npx-cli.js") || npm_execpath.includes(".bun")) {
     console.log();
   }
-  import_rslog.logger.greet(`  ${`Rsbuild v${"0.6.7"}`}
+  import_rslog.logger.greet(`  ${`Rsbuild v${"0.6.8"}`}
 `);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/client/formatStats.d.ts

@@ -6,7 +6,7 @@
  * https://github.com/facebook/create-react-app/blob/master/LICENSE
  */
 import type { StatsCompilation } from 'webpack';
-export declare function formatStatsMessages(json?: Pick<StatsCompilation, 'errors' | 'warnings'>): {
+export declare function formatStatsMessages(stats: Pick<StatsCompilation, 'errors' | 'warnings'>): {
     errors: string[];
     warnings: string[];
 };

package/dist/client/formatStats.js

@@ -25,12 +25,24 @@ const friendlySyntaxErrorLabel = "SyntaxError:";
 function isLikelyASyntaxError(message) {
   return message.includes(friendlySyntaxErrorLabel);
 }
+function resolveFileName(stats) {
+  const regex = /(?:\!|^)([^!]+)$/;
+  const fileName = stats.moduleIdentifier?.match(regex)?.at(-1) ?? "";
+  return fileName ? (
+    // add default column add lines for linking
+    `File: ${fileName}:1:1
+`
+  ) : (
+    // fallback to moduleName if moduleIdentifier parse failed
+    `File: ${stats.moduleName}
+`
+  );
+}
 function formatMessage(stats) {
   let lines = [];
   let message;
   if (typeof stats === "object") {
-    const fileName = stats.moduleName ? `File: ${stats.moduleName}
-` : "";
+    const fileName = resolveFileName(stats);
     const mainMessage = typeof stats.formatted === "string" ? stats.formatted : stats.message;
     const details = stats.details ? `
 Details: ${stats.details}
@@ -72,13 +84,12 @@ ${stats.stack}` : "";
   message = lines.join("\n");
   return message.trim();
 }
-function formatStatsMessages(json) {
-  const formattedErrors = json?.errors?.map(formatMessage);
-  const formattedWarnings = json?.warnings?.map(formatMessage);
+function formatStatsMessages(stats) {
+  const formattedErrors = stats.errors?.map(formatMessage);
+  const formattedWarnings = stats.warnings?.map(formatMessage);
   const result = {
     errors: formattedErrors || [],
-    warnings: formattedWarnings || [],
-    errorTips: []
+    warnings: formattedWarnings || []
   };
   if (result.errors?.some(isLikelyASyntaxError)) {
     result.errors = result.errors.filter(isLikelyASyntaxError);

package/dist/client/hmr/index.d.ts

@@ -1,4 +1 @@
-export declare const registerOverlay: (options: {
-    createOverlay: (err: string[]) => void;
-    clearOverlay: () => void;
-}) => void;
+export declare const registerOverlay: (createFn: (err: string[]) => void, clearFn: () => void) => void;

package/dist/client/hmr/url.d.ts

@@ -0,0 +1,6 @@
+import type { ClientConfig } from '@rsbuild/shared';
+/**
+ * hmr socket connect path
+ */
+export declare const HMR_SOCK_PATH = "/rsbuild-hmr";
+export declare function getSocketUrl(urlParts: ClientConfig): string;

package/dist/client/hmr.mjs

@@ -173,11 +173,20 @@ var friendlySyntaxErrorLabel = "SyntaxError:";
 function isLikelyASyntaxError(message) {
     return message.includes(friendlySyntaxErrorLabel);
 }
+function resolveFileName(stats) {
+    var _stats_moduleIdentifier_match, _stats_moduleIdentifier;
+    var regex = /(?:\!|^)([^!]+)$/;
+    var _stats_moduleIdentifier_match_at;
+    var fileName = (_stats_moduleIdentifier_match_at = (_stats_moduleIdentifier = stats.moduleIdentifier) === null || _stats_moduleIdentifier === void 0 ? void 0 : (_stats_moduleIdentifier_match = _stats_moduleIdentifier.match(regex)) === null || _stats_moduleIdentifier_match === void 0 ? void 0 : _stats_moduleIdentifier_match.at(-1)) !== null && _stats_moduleIdentifier_match_at !== void 0 ? _stats_moduleIdentifier_match_at : "";
+    return fileName ? // add default column add lines for linking
+    "File: ".concat(fileName, ":1:1\n") : // fallback to moduleName if moduleIdentifier parse failed
+    "File: ".concat(stats.moduleName, "\n");
+}
 function formatMessage(stats) {
     var lines = [];
     var message;
     if (typeof stats === "object") {
-        var fileName = stats.moduleName ? "File: ".concat(stats.moduleName, "\n") : "";
+        var fileName = resolveFileName(stats);
         var mainMessage = typeof stats.formatted === "string" ? stats.formatted : stats.message;
         var details = stats.details ? "\nDetails: ".concat(stats.details, "\n") : "";
         var stack = stats.stack ? "\n".concat(stats.stack) : "";
@@ -210,14 +219,13 @@ function formatMessage(stats) {
     message = lines.join("\n");
     return message.trim();
 }
-function formatStatsMessages(json) {
-    var _json_errors, _json_warnings, _result_errors;
-    var formattedErrors = json === null || json === void 0 ? void 0 : (_json_errors = json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
-    var formattedWarnings = json === null || json === void 0 ? void 0 : (_json_warnings = json.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
+function formatStatsMessages(stats) {
+    var _stats_errors, _stats_warnings, _result_errors;
+    var formattedErrors = (_stats_errors = stats.errors) === null || _stats_errors === void 0 ? void 0 : _stats_errors.map(formatMessage);
+    var formattedWarnings = (_stats_warnings = stats.warnings) === null || _stats_warnings === void 0 ? void 0 : _stats_warnings.map(formatMessage);
     var result = {
         errors: formattedErrors || [],
-        warnings: formattedWarnings || [],
-        errorTips: []
+        warnings: formattedWarnings || []
     };
     if ((_result_errors = result.errors) === null || _result_errors === void 0 ? void 0 : _result_errors.some(isLikelyASyntaxError)) {
         result.errors = result.errors.filter(isLikelyASyntaxError);
@@ -227,13 +235,8 @@ function formatStatsMessages(json) {
     }
     return result;
 }
-// src/client/hmr/createSocketUrl.ts
+// src/client/hmr/url.ts
 var HMR_SOCK_PATH = "/rsbuild-hmr";
-function createSocketUrl() {
-    var options2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    var currentLocation = self.location;
-    return getSocketUrl(options2, currentLocation);
-}
 function formatURL(param) {
     var port = param.port, protocol = param.protocol, hostname = param.hostname, pathname = param.pathname;
     if (typeof URL !== "undefined") {
@@ -247,7 +250,8 @@ function formatURL(param) {
     var colon = protocol.indexOf(":") === -1 ? ":" : "";
     return "".concat(protocol).concat(colon, "//").concat(hostname, ":").concat(port).concat(pathname);
 }
-function getSocketUrl(urlParts, location) {
+function getSocketUrl(urlParts) {
+    var location = self.location;
     var host = urlParts.host, port = urlParts.port, path = urlParts.path, protocol = urlParts.protocol;
     return formatURL({
         protocol: protocol || (location.protocol === "https:" ? "wss" : "ws"),
@@ -257,25 +261,19 @@ function getSocketUrl(urlParts, location) {
     });
 }
 // src/client/hmr/index.ts
-var options = RSBUILD_CLIENT_CONFIG;
-var socketUrl = createSocketUrl(options);
-var enableOverlay = !!options.overlay;
-var enableLiveReload = RSBUILD_DEV_LIVE_RELOAD;
 var isFirstCompilation = true;
-var mostRecentCompilationHash = null;
+var lastCompilationHash = null;
 var hasCompileErrors = false;
 function clearOutdatedErrors() {
-    if (typeof console !== "undefined" && typeof console.clear === "function") {
-        if (hasCompileErrors) {
-            console.clear();
-        }
+    if (console.clear && hasCompileErrors) {
+        console.clear();
     }
 }
 var createOverlay;
 var clearOverlay;
-var registerOverlay = function(options2) {
-    createOverlay = options2.createOverlay;
-    clearOverlay = options2.clearOverlay;
+var registerOverlay = function(createFn, clearFn) {
+    createOverlay = createFn;
+    clearOverlay = clearFn;
 };
 function handleSuccess() {
     clearOutdatedErrors();
@@ -291,22 +289,17 @@ function handleWarnings(warnings) {
     var isHotUpdate = !isFirstCompilation;
     isFirstCompilation = false;
     hasCompileErrors = false;
-    function printWarnings() {
-        var formatted = formatStatsMessages({
-            warnings: warnings,
-            errors: []
-        });
-        if (typeof console !== "undefined" && typeof console.warn === "function") {
-            for(var i = 0; i < formatted.warnings.length; i++){
-                if (i === 5) {
-                    console.warn("There were more warnings in other files.\nYou can find a complete log in the terminal.");
-                    break;
-                }
-                console.warn(formatted.warnings[i]);
-            }
+    var formatted = formatStatsMessages({
+        warnings: warnings,
+        errors: []
+    });
+    for(var i = 0; i < formatted.warnings.length; i++){
+        if (i === 5) {
+            console.warn("There were more warnings in other files, you can find a complete log in the terminal.");
+            break;
         }
+        console.warn(formatted.warnings[i]);
     }
-    printWarnings();
     if (isHotUpdate) {
         tryApplyUpdates();
     }
@@ -319,40 +312,32 @@ function handleErrors(errors) {
         errors: errors,
         warnings: []
     });
-    if (typeof console !== "undefined" && typeof console.error === "function") {
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = formatted.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var error = _step.value;
+            console.error(error);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
         try {
-            for(var _iterator = formatted.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var error = _step.value;
-                console.error(error);
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
             }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
         } finally{
-            try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
+            if (_didIteratorError) {
+                throw _iteratorError;
             }
         }
     }
-    if (enableOverlay) {
-        createOverlay === null || createOverlay === void 0 ? void 0 : createOverlay(formatted.errors);
+    if (createOverlay) {
+        createOverlay(formatted.errors);
     }
 }
-function handleAvailableHash(hash) {
-    mostRecentCompilationHash = hash;
-}
 function isUpdateAvailable() {
-    return mostRecentCompilationHash !== __webpack_hash__;
-}
-function canApplyUpdates() {
-    return import.meta.webpackHot.status() === "idle";
+    return lastCompilationHash !== __webpack_hash__;
 }
 function tryApplyUpdates() {
     if (!isUpdateAvailable()) {
@@ -362,13 +347,13 @@ function tryApplyUpdates() {
         reloadPage();
         return;
     }
-    if (!canApplyUpdates()) {
+    if (import.meta.webpackHot.status() !== "idle") {
         return;
     }
     function handleApplyUpdates(err, updatedModules) {
-        var wantsForcedReload = err || !updatedModules;
-        if (wantsForcedReload) {
-            if (err && typeof console !== "undefined" && typeof console.error === "function") {
+        var forcedReload = err || !updatedModules;
+        if (forcedReload) {
+            if (err) {
                 console.error("[HMR] Forced reload caused by: ", err);
             }
             reloadPage();
@@ -386,28 +371,24 @@ function tryApplyUpdates() {
 }
 var MAX_RETRIES = 100;
 var connection = null;
-var retry_counter = 0;
+var retryCount = 0;
 function onOpen() {
-    if (typeof console !== "undefined" && typeof console.info === "function") {
-        console.info("[HMR] connected.");
-    }
+    console.info("[HMR] connected.");
 }
 function onMessage(e) {
     var message = JSON.parse(e.data);
     switch(message.type){
         case "hash":
-            if (enableOverlay) {
-                clearOverlay === null || clearOverlay === void 0 ? void 0 : clearOverlay();
+            lastCompilationHash = message.data;
+            if (clearOverlay && isUpdateAvailable()) {
+                clearOverlay();
             }
-            handleAvailableHash(message.data);
             break;
         case "still-ok":
         case "ok":
             handleSuccess();
             break;
         case "static-changed":
-            reloadPage();
-            break;
         case "content-changed":
             reloadPage();
             break;
@@ -417,27 +398,13 @@ function onMessage(e) {
         case "errors":
             handleErrors(message.data);
             break;
-        default:
     }
 }
 function sleep() {
-    return _sleep.apply(this, arguments);
-}
-function _sleep() {
-    _sleep = _async_to_generator(function() {
-        var msec;
-        var _arguments = arguments;
-        return _ts_generator(this, function(_state) {
-            msec = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : 1e3;
-            return [
-                2,
-                new Promise(function(resolve) {
-                    setTimeout(resolve, msec);
-                })
-            ];
-        });
+    var msec = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 1e3;
+    return new Promise(function(resolve) {
+        setTimeout(resolve, msec);
     });
-    return _sleep.apply(this, arguments);
 }
 function onClose() {
     return _onClose.apply(this, arguments);
@@ -447,9 +414,7 @@ function _onClose() {
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    if (typeof console !== "undefined" && typeof console.info === "function") {
-                        console.info("[HMR] disconnected. Attempting to reconnect.");
-                    }
+                    console.info("[HMR] disconnected. Attempting to reconnect.");
                     removeListeners();
                     return [
                         4,
@@ -457,18 +422,16 @@ function _onClose() {
                     ];
                 case 1:
                     _state.sent();
-                    retry_counter++;
+                    retryCount++;
                     if (connection && (connection.readyState === connection.CONNECTING || connection.readyState === connection.OPEN)) {
-                        retry_counter = 0;
+                        retryCount = 0;
                         return [
                             2
                         ];
                     }
-                    if (retry_counter > MAX_RETRIES) {
-                        if (typeof console !== "undefined" && typeof console.info === "function") {
-                            console.info("[HMR] Unable to establish a connection after exceeding the maximum retry attempts.");
-                        }
-                        retry_counter = 0;
+                    if (retryCount > MAX_RETRIES) {
+                        console.info("[HMR] Unable to establish a connection after exceeding the maximum retry attempts.");
+                        retryCount = 0;
                         return [
                             2
                         ];
@@ -483,6 +446,7 @@ function _onClose() {
     return _onClose.apply(this, arguments);
 }
 function connect() {
+    var socketUrl = getSocketUrl(RSBUILD_CLIENT_CONFIG);
     connection = new WebSocket(socketUrl);
     connection.addEventListener("open", onOpen);
     connection.addEventListener("close", onClose);
@@ -502,7 +466,7 @@ function reconnect() {
     connect();
 }
 function reloadPage() {
-    if (enableLiveReload) {
+    if (RSBUILD_DEV_LIVE_RELOAD) {
         window.location.reload();
     }
 }

package/dist/client/overlay.mjs

@@ -227,24 +227,17 @@ var overlayId = "rsbuild-error-overlay";
 if (customElements && !customElements.get(overlayId)) {
     customElements.define(overlayId, ErrorOverlay);
 }
-var documentAvailable = typeof document !== "undefined";
 function createOverlay(err) {
-    if (!documentAvailable) {
-        console.info("[Rsbuild] Failed to display error overlay as document is not available, you can disable the `dev.client.overlay` option.");
-        return;
-    }
     clearOverlay();
     document.body.appendChild(new ErrorOverlay(err));
 }
 function clearOverlay() {
-    if (!documentAvailable) {
-        return;
-    }
     document.querySelectorAll(overlayId).forEach(function(n) {
         return n.close();
     });
 }
-registerOverlay({
-    createOverlay: createOverlay,
-    clearOverlay: clearOverlay
-});
+if (typeof document !== "undefined") {
+    registerOverlay(createOverlay, clearOverlay);
+} else {
+    console.info("[Rsbuild] Failed to display error overlay as document is not available, you can disable the `dev.client.overlay` option.");
+}

package/dist/createContext.js

@@ -44,7 +44,7 @@ async function createContextByConfig(options, bundlerType, config = {}) {
   const context = {
     entry: (0, import_entry.getEntryObject)(config, "web"),
     targets: config.output?.targets || [],
-    version: "0.6.7",
+    version: "0.6.8",
     rootPath,
     distPath,
     cachePath,

package/dist/index.js

@@ -40,7 +40,7 @@ var import_config = require("./config");
 var import_shared = require("@rsbuild/shared");
 var import_mergeConfig = require("./mergeConfig");
 var import_constants = require("./constants");
-const version = "0.6.7";
+const version = "0.6.8";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PLUGIN_CSS_NAME,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -51,9 +51,9 @@
     "@rspack/core": "0.6.3",
     "@swc/helpers": "0.5.3",
     "core-js": "~3.36.0",
-    "html-webpack-plugin": "npm:html-rspack-plugin@5.6.2",
+    "html-webpack-plugin": "npm:html-rspack-plugin@5.7.0",
     "postcss": "^8.4.38",
-    "@rsbuild/shared": "0.6.7"
+    "@rsbuild/shared": "0.6.8"
   },
   "devDependencies": {
     "@types/node": "18.x",

package/dist/client/hmr/createSocketUrl.d.ts

@@ -1,12 +0,0 @@
-import type { ClientConfig } from '@rsbuild/shared';
-/**
- * hmr socket connect path
- */
-export declare const HMR_SOCK_PATH = "/rsbuild-hmr";
-export declare function createSocketUrl(options?: ClientConfig): string;
-export declare function formatURL({ port, protocol, hostname, pathname, }: {
-    port: string;
-    protocol: string;
-    hostname: string;
-    pathname: string;
-}): string;