@rspack/dev-server 2.2.0 → 2.2.2

package/client/index.js

@@ -165,7 +165,7 @@ const reloadApp = ({ hot, liveReload }, currentStatus)=>{
         log_js_log.info('App hot update...');
         emitter.emit('webpackHotUpdate', currentStatus.currentHash);
         if ("u" > typeof self && self.window) self.postMessage(`webpackHotUpdate${currentStatus.currentHash}`, '*');
-    } else if (liveReload && allowToLiveReload) {
+    } else if (liveReload && allowToLiveReload && "u" > typeof document) {
         let rootWindow = self;
         const intervalId = self.setInterval(()=>{
             if ('about:' !== rootWindow.location.protocol) applyReload(rootWindow, intervalId);
@@ -246,6 +246,7 @@ const onSocketMessage = {
         reloadApp(options, client_src_status);
     },
     'static-changed': function(file) {
+        if ("u" < typeof document) return;
         log_js_log.info(`${file ? `"${file}"` : 'Content'} from static directory was changed. Reloading...`);
         self.location.reload();
     },
@@ -326,20 +327,21 @@ const formatURL = (objURL)=>{
     return `${protocol}${host}${pathname}${search}${hash}`;
 };
 const createSocketURL = (parsedURL)=>{
+    const pageLocation = 'blob:' === self.location.protocol && self.location.origin && 'null' !== self.location.origin ? new URL(self.location.origin) : self.location;
     let { hostname } = parsedURL;
     const isInAddrAny = '0.0.0.0' === hostname || '::' === hostname || '[::]' === hostname;
-    if (isInAddrAny && self.location.hostname && 0 === self.location.protocol.indexOf('http')) hostname = self.location.hostname;
-    let socketURLProtocol = parsedURL.protocol || self.location.protocol;
-    if ('auto:' === socketURLProtocol || hostname && isInAddrAny && 'https:' === self.location.protocol) socketURLProtocol = self.location.protocol;
+    if (isInAddrAny && pageLocation.hostname && 0 === pageLocation.protocol.indexOf('http')) hostname = pageLocation.hostname;
+    let socketURLProtocol = parsedURL.protocol || pageLocation.protocol;
+    if ('auto:' === socketURLProtocol || hostname && isInAddrAny && 'https:' === pageLocation.protocol) socketURLProtocol = pageLocation.protocol;
     socketURLProtocol = socketURLProtocol.replace(/^(?:http|.+-extension|file)/i, 'ws');
     let socketURLAuth = '';
     if (parsedURL.username) {
         socketURLAuth = parsedURL.username;
         if (parsedURL.password) socketURLAuth = socketURLAuth.concat(':', parsedURL.password);
     }
-    const socketURLHostname = (hostname || self.location.hostname || 'localhost').replace(/^\[(.*)\]$/, '$1');
+    const socketURLHostname = (hostname || pageLocation.hostname || 'localhost').replace(/^\[(.*)\]$/, '$1');
     let socketURLPort = parsedURL.port;
-    if (!socketURLPort || '0' === socketURLPort) socketURLPort = self.location.port;
+    if (!socketURLPort || '0' === socketURLPort) socketURLPort = pageLocation.port;
     let socketURLPathname = '/ws';
     if (parsedURL.pathname && !parsedURL.fromCurrentScript) socketURLPathname = parsedURL.pathname;
     return formatURL({

package/client/overlay.js

@@ -408,7 +408,11 @@ const createOverlay = (options)=>{
             });
         }, trustedTypesPolicyName);
     }
-    let handleEscapeKey;
+    function handleEscapeKey(event) {
+        if ('Escape' === event.key || 'Esc' === event.key || 27 === event.keyCode) overlayService.send({
+            type: 'DISMISS'
+        });
+    }
     const hideOverlayWithEscCleanup = ()=>{
         window.removeEventListener('keydown', handleEscapeKey);
         hide();
@@ -417,11 +421,6 @@ const createOverlay = (options)=>{
         showOverlay: ({ level = 'error', messages, messageSource })=>show(level, messages, options.trustedTypesPolicyName, messageSource),
         hideOverlay: hideOverlayWithEscCleanup
     });
-    handleEscapeKey = (event)=>{
-        if ('Escape' === event.key || 'Esc' === event.key || 27 === event.keyCode) overlayService.send({
-            type: 'DISMISS'
-        });
-    };
     window.addEventListener('keydown', handleEscapeKey);
     if (options.catchRuntimeError) {
         const handleError = (error, fallbackMessage)=>{

package/dist/{0~chokidar.js → chokidar~0.js}

@@ -1,5 +1,5 @@
-/*! LICENSE: 0~chokidar.js.LICENSE.txt */
-import { __webpack_require__ } from "./619.js";
+/*! LICENSE: chokidar~0.js.LICENSE.txt */
+import { __webpack_require__ } from "./t~0.js";
 import { EventEmitter } from "node:events";
 import { stat as external_node_fs_stat, unwatchFile, watch, watchFile } from "node:fs";
 import { lstat, open as promises_open, readdir, realpath as promises_realpath, stat as promises_stat } from "node:fs/promises";
@@ -965,7 +965,7 @@ const toUnix = (string)=>{
 const normalizePathToUnix = (path)=>toUnix(__rspack_external_node_path_806ed179.normalize(toUnix(path)));
 const normalizeIgnored = (cwd = '')=>(path)=>{
         if ('string' == typeof path) return normalizePathToUnix(__rspack_external_node_path_806ed179.isAbsolute(path) ? path : __rspack_external_node_path_806ed179.join(cwd, path));
-        return path;
+        else return path;
     };
 const getAbsolutePath = (path, cwd)=>{
     if (__rspack_external_node_path_806ed179.isAbsolute(path)) return path;

package/dist/{0~connect-history-api-fallback.js → connect-history-api-fallback~0.js}

@@ -1,8 +1,9 @@
-import { __webpack_require__ } from "./619.js";
-import "./619.js";
+import { __webpack_require__ } from "./t~0.js";
+import { createRequire as __rspack_createRequire } from "node:module";
+const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
 __webpack_require__.add({
-    "./node_modules/.pnpm/connect-history-api-fallback@2.0.0/node_modules/connect-history-api-fallback/lib/index.js" (module, exports, __webpack_require__) {
-        var url = __webpack_require__("url?b918");
+    "./node_modules/.pnpm/connect-history-api-fallback@2.0.0/node_modules/connect-history-api-fallback/lib/index.js" (module, exports) {
+        var url = __rspack_createRequire_require("url");
         module.exports = function(options) {
             options = options || {};
             var logger = getLogger(options);
@@ -11,8 +12,7 @@ __webpack_require__.add({
                 if ('GET' !== req.method && 'HEAD' !== req.method) {
                     logger('Not rewriting', req.method, req.url, 'because the method is not GET or HEAD.');
                     return next();
-                }
-                if (headers && 'string' == typeof headers.accept) {
+                } else if (headers && 'string' == typeof headers.accept) {
                     if (0 === headers.accept.indexOf('application/json')) {
                         logger('Not rewriting', req.method, req.url, 'because the client prefers JSON.');
                         return next();
@@ -51,7 +51,7 @@ __webpack_require__.add({
         };
         function evaluateRewriteRule(parsedUrl, match, rule, req) {
             if ('string' == typeof rule) return rule;
-            if ('function' != typeof rule) throw new Error('Rewrite rule can only be of type string or function.');
+            else if ('function' != typeof rule) throw new Error('Rewrite rule can only be of type string or function.');
             return rule({
                 parsedUrl: parsedUrl,
                 match: match,
@@ -68,7 +68,7 @@ __webpack_require__.add({
         }
         function getLogger(options) {
             if (options && options.logger) return options.logger;
-            if (options && options.verbose) return console.log.bind(console);
+            else if (options && options.verbose) return console.log.bind(console);
             return function() {};
         }
     }

package/dist/{0~connect-next.js → connect-next~0.js}

@@ -1,4 +1,4 @@
-/*! LICENSE: 0~connect-next.js.LICENSE.txt */
+/*! LICENSE: connect-next~0.js.LICENSE.txt */
 import { EventEmitter } from "node:events";
 import { createRequire } from "node:module";
 import * as __rspack_external_node_http_e245b239 from "node:http";
@@ -591,17 +591,17 @@ __nested_rspack_require_364__.add({
             return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
         }
     },
-    "./node_modules/.pnpm/finalhandler@2.1.1/node_modules/finalhandler/index.js" (module, __unused_rspack_exports, __nested_rspack_require_23493_23512__) {
+    "./node_modules/.pnpm/finalhandler@2.1.1_supports-color@8.1.1/node_modules/finalhandler/index.js" (module, __unused_rspack_exports, __nested_rspack_require_23514_23533__) {
         /*!
  * finalhandler
  * Copyright(c) 2014-2022 Douglas Christopher Wilson
  * MIT Licensed
- */ var debug = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js")('finalhandler');
-        var encodeUrl = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/encodeurl@2.0.0/node_modules/encodeurl/index.js");
-        var escapeHtml = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js");
-        var onFinished = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js");
-        var parseUrl = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js");
-        var statuses = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js");
+ */ var debug = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js")('finalhandler');
+        var encodeUrl = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/encodeurl@2.0.0/node_modules/encodeurl/index.js");
+        var escapeHtml = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js");
+        var onFinished = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js");
+        var parseUrl = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js");
+        var statuses = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js");
         var isFinished = onFinished.isFinished;
         function createHtmlDocument(message) {
             var body = escapeHtml(message).replaceAll('\n', '<br>').replaceAll('  ', ' &nbsp;');
@@ -781,7 +781,7 @@ __nested_rspack_require_364__.add({
             return Math.round(ms / n) + ' ' + name + (isPlural ? 's' : '');
         }
     },
-    "./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js" (module, __unused_rspack_exports, __nested_rspack_require_32097_32116__) {
+    "./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js" (module, __unused_rspack_exports, __nested_rspack_require_32118_32137__) {
         /*!
  * on-finished
  * Copyright(c) 2013 Jonathan Ong
@@ -790,7 +790,7 @@ __nested_rspack_require_364__.add({
  */ module.exports = onFinished;
         module.exports.isFinished = isFinished;
         var asyncHooks = tryRequireAsyncHooks();
-        var first = __nested_rspack_require_32097_32116__("./node_modules/.pnpm/ee-first@1.1.1/node_modules/ee-first/index.js");
+        var first = __nested_rspack_require_32118_32137__("./node_modules/.pnpm/ee-first@1.1.1/node_modules/ee-first/index.js");
         var defer = 'function' == typeof setImmediate ? setImmediate : function(fn) {
             process.nextTick(fn.bind.apply(fn, arguments));
         };
@@ -869,7 +869,7 @@ __nested_rspack_require_364__.add({
         }
         function tryRequireAsyncHooks() {
             try {
-                return __nested_rspack_require_32097_32116__("async_hooks");
+                return __nested_rspack_require_32118_32137__("async_hooks");
             } catch (e) {
                 return {};
             }
@@ -881,13 +881,13 @@ __nested_rspack_require_364__.add({
             return res.runInAsyncScope.bind(res, fn, null);
         }
     },
-    "./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js" (module, __unused_rspack_exports, __nested_rspack_require_36017_36036__) {
+    "./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js" (module, __unused_rspack_exports, __nested_rspack_require_36038_36057__) {
         /*!
  * parseurl
  * Copyright(c) 2014 Jonathan Ong
  * Copyright(c) 2014-2017 Douglas Christopher Wilson
  * MIT Licensed
- */ var url = __nested_rspack_require_36017_36036__("url");
+ */ var url = __nested_rspack_require_36038_36057__("url");
         var parse = url.parse;
         var Url = url.Url;
         module.exports = parseurl;
@@ -947,13 +947,13 @@ __nested_rspack_require_364__.add({
             return 'object' == typeof parsedUrl && null !== parsedUrl && (void 0 === Url || parsedUrl instanceof Url) && parsedUrl._raw === url;
         }
     },
-    "./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js" (module, __unused_rspack_exports, __nested_rspack_require_38488_38507__) {
+    "./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js" (module, __unused_rspack_exports, __nested_rspack_require_38509_38528__) {
         /*!
  * statuses
  * Copyright(c) 2014 Jonathan Ong
  * Copyright(c) 2016 Douglas Christopher Wilson
  * MIT Licensed
- */ var codes = __nested_rspack_require_38488_38507__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/codes.json");
+ */ var codes = __nested_rspack_require_38509_38528__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/codes.json");
         module.exports = status;
         status.message = codes;
         status.code = createMessageToStatusCodeMap(codes);
@@ -1008,10 +1008,10 @@ __nested_rspack_require_364__.add({
             return getStatusCode(code);
         }
     },
-    "./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js" (module, __unused_rspack_exports, __nested_rspack_require_40780_40799__) {
-        const os = __nested_rspack_require_40780_40799__("os");
-        const tty = __nested_rspack_require_40780_40799__("tty");
-        const hasFlag = __nested_rspack_require_40780_40799__("./node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js");
+    "./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js" (module, __unused_rspack_exports, __nested_rspack_require_40801_40820__) {
+        const os = __nested_rspack_require_40801_40820__("os");
+        const tty = __nested_rspack_require_40801_40820__("tty");
+        const hasFlag = __nested_rspack_require_40801_40820__("./node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js");
         const { env } = process;
         let flagForceColor;
         if (hasFlag('no-color') || hasFlag('no-colors') || hasFlag('color=false') || hasFlag('color=never')) flagForceColor = 0;
@@ -1115,7 +1115,7 @@ __nested_rspack_require_364__.add({
 });
 const src = __nested_rspack_require_364__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js");
 var src_default = /*#__PURE__*/ __nested_rspack_require_364__.n(src);
-const dist_finalhandler = __nested_rspack_require_364__("./node_modules/.pnpm/finalhandler@2.1.1/node_modules/finalhandler/index.js");
+const dist_finalhandler = __nested_rspack_require_364__("./node_modules/.pnpm/finalhandler@2.1.1_supports-color@8.1.1/node_modules/finalhandler/index.js");
 var finalhandler_default = /*#__PURE__*/ __nested_rspack_require_364__.n(dist_finalhandler);
 const dist_parseurl = __nested_rspack_require_364__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js");
 var parseurl_default = /*#__PURE__*/ __nested_rspack_require_364__.n(dist_parseurl);
@@ -1219,13 +1219,29 @@ function call(handle, route, err, req, res, next) {
     const hasError = void 0 !== err;
     dist_debug('%s %s : %s', handle.name || '<anonymous>', route, req.originalUrl);
     try {
-        if (hasError && 4 === arity) return void handle(err, req, res, next);
-        if (!hasError && arity < 4) return void handle(req, res, next);
+        if (hasError && 4 === arity) {
+            const result = handle(err, req, res, next);
+            handlePromise(result, next);
+            return;
+        }
+        if (!hasError && arity < 4) {
+            const result = handle(req, res, next);
+            handlePromise(result, next);
+            return;
+        }
     } catch (caughtError) {
         error = caughtError;
     }
     next(error);
 }
+function isPromise(value) {
+    return null !== value && ('object' == typeof value || 'function' == typeof value) && 'function' == typeof value.then;
+}
+function handlePromise(result, next) {
+    if (isPromise(result)) result.then(null, (error)=>{
+        next(error || new Error('Rejected promise'));
+    });
+}
 function logerror(err) {
     if ('test' !== dist_env) {
         if (err instanceof Error) return void console.error(err.stack || err.toString());

package/dist/{0~debug.js → debug~0.js}

@@ -1,5 +1,6 @@
-import { __webpack_require__ } from "./619.js";
-import "./619.js";
+import { __webpack_require__ } from "./t~0.js";
+import { createRequire as __rspack_createRequire } from "node:module";
+const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
 __webpack_require__.add({
     "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/browser.js" (module, exports, __webpack_require__) {
         exports.formatArgs = formatArgs;
@@ -291,8 +292,8 @@ __webpack_require__.add({
         else module.exports = __webpack_require__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/node.js");
     },
     "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/node.js" (module, exports, __webpack_require__) {
-        const tty = __webpack_require__("tty");
-        const util = __webpack_require__("util");
+        const tty = __rspack_createRequire_require("tty");
+        const util = __rspack_createRequire_require("util");
         exports.init = init;
         exports.log = log;
         exports.formatArgs = formatArgs;
@@ -458,7 +459,7 @@ __webpack_require__.add({
             options = options || {};
             var type = typeof val;
             if ('string' === type && val.length > 0) return parse(val);
-            if ('number' === type && isFinite(val)) return options.long ? fmtLong(val) : fmtShort(val);
+            else if ('number' === type && isFinite(val)) return options.long ? fmtLong(val) : fmtShort(val);
             throw new Error('val is not a non-empty string or a valid number. val=' + JSON.stringify(val));
         };
         function parse(str) {
@@ -533,8 +534,8 @@ __webpack_require__.add({
         }
     },
     "./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js" (module, __unused_rspack_exports, __webpack_require__) {
-        const os = __webpack_require__("os");
-        const tty = __webpack_require__("tty");
+        const os = __rspack_createRequire_require("os");
+        const tty = __rspack_createRequire_require("tty");
         const hasFlag = __webpack_require__("./node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js");
         const { env } = process;
         let flagForceColor;

package/dist/{0~http-proxy-middleware.js → http-proxy-middleware~0.js}

@@ -1,4 +1,4 @@
-/*! LICENSE: 0~http-proxy-middleware.js.LICENSE.txt */
+/*! LICENSE: http-proxy-middleware~0.js.LICENSE.txt */
 import node_http from "node:http";
 import node_https from "node:https";
 import node_http2 from "node:http2";
@@ -6,13 +6,13 @@ import { EventEmitter } from "node:events";
 import "node:net";
 import "node:stream";
 import { styleText } from "node:util";
-import { URL as external_node_url_URL } from "node:url";
 import { URL as external_url_URL } from "url";
 import "node:zlib";
 import "node:querystring";
-import { __webpack_require__ } from "./619.js";
-import "./0~debug.js";
-import "./619.js";
+import { __webpack_require__ } from "./t~0.js";
+import "./debug~0.js";
+import { createRequire as __rspack_createRequire } from "node:module";
+const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
 __webpack_require__.add({
     "./node_modules/.pnpm/braces@3.0.3/node_modules/braces/index.js" (module, __unused_rspack_exports, __webpack_require__) {
         const stringify = __webpack_require__("./node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/stringify.js");
@@ -560,7 +560,7 @@ __webpack_require__.add({
  *
  * Copyright (c) 2014-present, Jon Schlinkert.
  * Licensed under the MIT License.
- */ const util = __webpack_require__("util");
+ */ const util = __rspack_createRequire_require("util");
         const toRegexRange = __webpack_require__("./node_modules/.pnpm/to-regex-range@5.0.1/node_modules/to-regex-range/index.js");
         const isObject = (val)=>null !== val && 'object' == typeof val && !Array.isArray(val);
         const transform = (toNumber)=>(value)=>true === toNumber ? Number(value) : String(value);
@@ -848,7 +848,7 @@ __webpack_require__.add({
         };
     },
     "./node_modules/.pnpm/micromatch@4.0.8/node_modules/micromatch/index.js" (module, __unused_rspack_exports, __webpack_require__) {
-        const util = __webpack_require__("util");
+        const util = __rspack_createRequire_require("util");
         const braces = __webpack_require__("./node_modules/.pnpm/braces@3.0.3/node_modules/braces/index.js");
         const picomatch = __webpack_require__("./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/index.js");
         const utils = __webpack_require__("./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/utils.js");
@@ -993,8 +993,8 @@ __webpack_require__.add({
     "./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/index.js" (module, __unused_rspack_exports, __webpack_require__) {
         module.exports = __webpack_require__("./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/picomatch.js");
     },
-    "./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/constants.js" (module, __unused_rspack_exports, __webpack_require__) {
-        const path = __webpack_require__("path");
+    "./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/constants.js" (module) {
+        const path = __rspack_createRequire_require("path");
         const WIN_SLASH = '\\\\/';
         const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
         const DEFAULT_MAX_EXTGLOB_RECURSION = 0;
@@ -2157,7 +2157,7 @@ __webpack_require__.add({
         module.exports = parse;
     },
     "./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/picomatch.js" (module, __unused_rspack_exports, __webpack_require__) {
-        const path = __webpack_require__("path");
+        const path = __rspack_createRequire_require("path");
         const scan = __webpack_require__("./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/scan.js");
         const parse = __webpack_require__("./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/parse.js");
         const utils = __webpack_require__("./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/utils.js");
@@ -2559,7 +2559,7 @@ __webpack_require__.add({
         module.exports = scan;
     },
     "./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/utils.js" (__unused_rspack_module, exports, __webpack_require__) {
-        const path = __webpack_require__("path");
+        const path = __rspack_createRequire_require("path");
         const win32 = 'win32' === process.platform;
         const { REGEX_BACKSLASH, REGEX_REMOVE_BACKSLASH, REGEX_SPECIAL_CHARS, REGEX_SPECIAL_CHARS_GLOBAL } = __webpack_require__("./node_modules/.pnpm/picomatch@2.3.2/node_modules/picomatch/lib/constants.js");
         exports.isObject = (val)=>null !== val && 'object' == typeof val && !Array.isArray(val);
@@ -3513,7 +3513,14 @@ function createUrl({ protocol, host, port, path }) {
     const base = `${protocol || 'undefined:'}//${ipv6Host || '[::]'}`;
     const url = new external_url_URL(base);
     if (port) url.port = port;
-    if (path) url.pathname = path;
+    if (path) {
+        const queryIndex = path.indexOf('?');
+        if (-1 === queryIndex) url.pathname = path;
+        else {
+            url.pathname = path.slice(0, queryIndex);
+            url.search = path.slice(queryIndex);
+        }
+    }
     return url;
 }
 function logger_plugin_getPort(sockets) {
@@ -3541,14 +3548,12 @@ const loggerPlugin = definePlugin((proxyServer, options)=>{
                 port,
                 path
             });
+            const targetUrl = target.toString();
+            const exchange = `[HPM] ${req.method} ${originalUrl} -> ${targetUrl} [${proxyRes.statusCode}]`;
+            logger.info(exchange);
         } catch (err) {
             console.error('[HPM] Unexpected error while creating target URL', err);
-            target = new external_node_url_URL(options.target);
-            target.pathname = proxyRes.req.path;
         }
-        const targetUrl = target.toString();
-        const exchange = `[HPM] ${req.method} ${originalUrl} -> ${targetUrl} [${proxyRes.statusCode}]`;
-        logger.info(exchange);
     });
     proxyServer.on('open', (socket)=>{
         logger.info('[HPM] Client connected: %o', socket.address());
@@ -3646,9 +3651,10 @@ function createPathRewriter(rewriteConfig) {
     if ('function' == typeof rewriteConfig) {
         const customRewriteFn = rewriteConfig;
         return customRewriteFn;
+    } else {
+        rulesCache = parsePathRewriteRules(rewriteConfig);
+        return rewritePath;
     }
-    rulesCache = parsePathRewriteRules(rewriteConfig);
-    return rewritePath;
     function rewritePath(path) {
         let result = path;
         for (const rule of rulesCache)if (rule.regex.test(path)) {
@@ -3661,9 +3667,9 @@ function createPathRewriter(rewriteConfig) {
 }
 function isValidRewriteConfig(rewriteConfig) {
     if ('function' == typeof rewriteConfig) return true;
-    if (isPlainObject(rewriteConfig)) return 0 !== Object.keys(rewriteConfig).length;
-    if (null == rewriteConfig) return false;
-    throw new errors_HttpProxyMiddlewareError('[HPM] Invalid pathRewrite config. Expecting object with pathRewrite config or a rewrite function', 'HPM_INVALID_PATH_REWRITER_CONFIG');
+    else if (isPlainObject(rewriteConfig)) return 0 !== Object.keys(rewriteConfig).length;
+    else if (null == rewriteConfig) return false;
+    else throw new errors_HttpProxyMiddlewareError('[HPM] Invalid pathRewrite config. Expecting object with pathRewrite config or a rewrite function', 'HPM_INVALID_PATH_REWRITER_CONFIG');
 }
 function parsePathRewriteRules(rewriteConfig) {
     const rules = [];
@@ -3809,8 +3815,10 @@ class HttpProxyMiddleware {
                 Debug('server close signal received.');
                 this.activeServers.delete(server);
                 if (this.activeServers.size > 0) return void Debug(`proxy server not closed: ${this.activeServers.size} server(s) still active`);
-                Debug('closing proxy server');
-                this.proxy.close(()=>Debug('proxy server closed'));
+                else {
+                    Debug('closing proxy server');
+                    this.proxy.close(()=>Debug('proxy server closed'));
+                }
             });
         }
         if (true === this.proxyOptions.ws && server) this.catchUpgradeRequest(server);

package/dist/index.d.ts

@@ -174,7 +174,7 @@ declare const EntryTypes: {
     readonly EVERYTHING_TYPE: "all";
 };
 
-declare type ErrorHandleFunction = (err: any, req: IncomingMessage, res: http.ServerResponse, next: NextFunction) => void;
+declare type ErrorHandleFunction = (err: any, req: IncomingMessage, res: http.ServerResponse, next: NextFunction) => unknown;
 
 declare type EventName = (typeof EVENTS)[keyof typeof EVENTS];
 
@@ -338,6 +338,8 @@ declare interface IncomingMessage extends http.IncomingMessage {
     originalUrl?: http.IncomingMessage['url'] | undefined;
 }
 
+declare type ListenCallback = () => void;
+
 /** https://github.com/microsoft/TypeScript/issues/29729 */
 declare type LiteralUnion<T extends U, U> = T | (U & Record<never, never>);
 
@@ -360,7 +362,7 @@ declare interface MiddlewareObject {
 
 declare type NextFunction = (err?: any) => void;
 
-declare type NextHandleFunction = (req: IncomingMessage, res: http.ServerResponse, next: NextFunction) => void;
+declare type NextHandleFunction = (req: IncomingMessage, res: http.ServerResponse, next: NextFunction) => unknown;
 
 /**
  * @mixin
@@ -525,21 +527,21 @@ export declare class RspackDevServer<A extends BasicApplication = Server, S exte
 }
 
 declare interface Server extends EventEmitter {
-    (req: http.IncomingMessage, res: http.ServerResponse, next?: Function): void;
+    (req: http.IncomingMessage, res: http.ServerResponse, next?: NextFunction): void;
     route: string;
     stack: ServerStackItem[];
-    handle(req: http.IncomingMessage, res: http.ServerResponse, next?: Function): void;
+    handle(req: http.IncomingMessage, res: http.ServerResponse, next?: NextFunction): void;
     use(fn: NextHandleFunction): Server;
     use(fn: HandleFunction): Server;
     use(fn: http.Server): Server;
     use(route: string, fn: NextHandleFunction): Server;
     use(route: string, fn: HandleFunction): Server;
     use(route: string, fn: http.Server): Server;
-    listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
-    listen(port: number, hostname?: string, callback?: Function): http.Server;
-    listen(path: string, callback?: Function): http.Server;
-    listen(options: ListenOptions, callback?: Function): http.Server;
-    listen(handle: unknown, listeningListener?: Function): http.Server;
+    listen(port: number, hostname?: string, backlog?: number, callback?: ListenCallback): http.Server;
+    listen(port: number, hostname?: string, callback?: ListenCallback): http.Server;
+    listen(path: string, callback?: ListenCallback): http.Server;
+    listen(options: ListenOptions, callback?: ListenCallback): http.Server;
+    listen(handle: unknown, listeningListener?: ListenCallback): http.Server;
 }
 
 declare class Server_5<
@@ -625,7 +627,7 @@ declare interface ServerStackItem {
 
 declare type ServerType<A extends BasicApplication, S extends BasicServer> = LiteralUnion<'http' | 'https' | 'http2', string> | ((serverOptions: ServerOptions, application: A) => S);
 
-declare type SimpleHandleFunction = (req: IncomingMessage, res: http.ServerResponse) => void;
+declare type SimpleHandleFunction = (req: IncomingMessage, res: http.ServerResponse) => unknown;
 
 /** Filterer for files */
 declare type Tester = (entryInfo: EntryInfo) => boolean;
@@ -893,6 +895,8 @@ declare namespace WebSocket_2 {
         allowSynchronousEvents?: boolean | undefined;
         autoPong?: boolean | undefined;
         maxPayload?: number | undefined;
+        maxBufferedChunks?: number | undefined;
+        maxFragments?: number | undefined;
         skipUTF8Validation?: boolean | undefined;
         createConnection?: typeof createConnection | undefined;
         finishRequest?: FinishRequestCallback | undefined;
@@ -978,6 +982,8 @@ declare namespace WebSocket_2 {
         clientTracking?: boolean | undefined;
         perMessageDeflate?: boolean | PerMessageDeflateOptions | undefined;
         maxPayload?: number | undefined;
+        maxBufferedChunks?: number | undefined;
+        maxFragments?: number | undefined;
         skipUTF8Validation?: boolean | undefined;
         WebSocket?: U | undefined;
     }

package/dist/index.js

@@ -1 +1 @@
-export { RspackDevServer } from "./619.js";
+export { RspackDevServer } from "./t~0.js";