@rspack/dev-server 2.1.0 → 2.2.1

package/dist/0~http-proxy-middleware.js

@@ -5,13 +5,14 @@ import node_http2 from "node:http2";
 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 "./944.js";
+import { __webpack_require__ } from "./619.js";
 import "./0~debug.js";
-import "./944.js";
+import "./619.js";
 __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");
@@ -2796,6 +2797,7 @@ __webpack_require__.add({
     }
 });
 const upgradeHeader = /(^|,)\s*upgrade\s*($|,)/i;
+const transferEncodingConnectionToken = /(^|,)\s*transfer-encoding\s*($|,)/i;
 const defaultAgents = {
     http: new node_http.Agent({
         keepAlive: true,
@@ -2809,6 +2811,16 @@ const defaultAgents = {
     })
 };
 const isSSL = /^https|wss/;
+function forceConnectionCloseForTransferEncoding(headers) {
+    let carriesTransferEncoding = false;
+    for(const key in headers)if (void 0 !== headers[key] && "transfer-encoding" === key.toLowerCase()) {
+        carriesTransferEncoding = true;
+        break;
+    }
+    const connection = headers.connection;
+    const connectionMarksTransferEncoding = "string" == typeof connection && transferEncodingConnectionToken.test(connection);
+    if (carriesTransferEncoding || connectionMarksTransferEncoding) headers.connection = "close";
+}
 const HTTP2_HEADER_BLACKLIST = [
     ":method",
     ":path",
@@ -2857,6 +2869,8 @@ function setupOutgoing(outgoing, options, req, forward) {
         outgoing.headers = outgoing.headers || {};
         if ("string" != typeof outgoing.headers.connection || !upgradeHeader.test(outgoing.headers.connection)) outgoing.headers.connection = "close";
     }
+    outgoing.headers = outgoing.headers || {};
+    forceConnectionCloseForTransferEncoding(outgoing.headers);
     const target = options[forward || "target"];
     const targetPath = target && false !== options.prependPath ? target.pathname || "" : "";
     const targetSearch = target instanceof URL && false !== options.prependPath ? target.search || "" : "";
@@ -2954,6 +2968,7 @@ const webOutgoingMiddleware = [
     defineProxyOutgoingMiddleware((req, res, proxyRes, options)=>{
         if ((options.hostRewrite || options.autoRewrite || options.protocolRewrite) && proxyRes.headers.location && redirectRegex.test(String(proxyRes.statusCode))) {
             const target = _toURL(options.target);
+            const keepProtocolRelative = proxyRes.headers.location.startsWith("//") && !options.protocolRewrite;
             const u = new URL(proxyRes.headers.location, target);
             if (target.host !== u.host) return;
             if (options.hostRewrite) u.host = options.hostRewrite;
@@ -2962,7 +2977,7 @@ const webOutgoingMiddleware = [
                 else if (req.headers.host) u.host = req.headers.host;
             }
             if (options.protocolRewrite) u.protocol = options.protocolRewrite;
-            proxyRes.headers.location = u.toString();
+            proxyRes.headers.location = keepProtocolRelative ? u.href.slice(u.protocol.length) : u.href;
         }
     }),
     defineProxyOutgoingMiddleware((req, res, proxyRes, options)=>{
@@ -3012,7 +3027,7 @@ const nativeAgents = {
     http: node_http,
     https: node_https
 };
-const redirectStatuses = new Set([
+const redirectStatuses = /* @__PURE__ */ new Set([
     301,
     302,
     303,
@@ -3021,10 +3036,7 @@ const redirectStatuses = new Set([
 ]);
 const webIncomingMiddleware = [
     defineProxyMiddleware((req)=>{
-        if (("DELETE" === req.method || "OPTIONS" === req.method) && !req.headers["content-length"]) {
-            req.headers["content-length"] = "0";
-            delete req.headers["transfer-encoding"];
-        }
+        if (("DELETE" === req.method || "OPTIONS" === req.method) && !req.headers["content-length"] && !req.headers["transfer-encoding"]) req.headers["content-length"] = "0";
     }),
     defineProxyMiddleware((req, res, options)=>{
         if (options.timeout) req.socket.setTimeout(options.timeout, ()=>{
@@ -3127,6 +3139,7 @@ const webIncomingMiddleware = [
                     delete redirectHeaders["content-type"];
                     delete redirectHeaders["transfer-encoding"];
                 }
+                forceConnectionCloseForTransferEncoding(redirectHeaders);
                 const redirectOpts = {
                     hostname: location.hostname,
                     port: location.port || (isHTTPS ? 443 : 80),
@@ -3374,32 +3387,41 @@ function _createProxyFn(type, server) {
         return callbackPromise;
     };
 }
-new Set([
-    301,
-    302,
-    303,
-    307,
-    308
-]);
-var errors_ERRORS;
-(function(ERRORS) {
-    ERRORS["ERR_CONFIG_FACTORY_TARGET_MISSING"] = "[HPM] Missing \"target\" option. Example: {target: \"http://www.example.org\"}";
-    ERRORS["ERR_CONTEXT_MATCHER_GENERIC"] = "[HPM] Invalid pathFilter. Expecting something like: \"/api\" or [\"/api\", \"/ajax\"]";
-    ERRORS["ERR_CONTEXT_MATCHER_INVALID_ARRAY"] = "[HPM] Invalid pathFilter. Plain paths (e.g. \"/api\") can not be mixed with globs (e.g. \"/api/**\"). Expecting something like: [\"/api\", \"/ajax\"] or [\"/api/**\", \"!**.html\"].";
-    ERRORS["ERR_PATH_REWRITER_CONFIG"] = "[HPM] Invalid pathRewrite config. Expecting object with pathRewrite config or a rewrite function";
-})(errors_ERRORS || (errors_ERRORS = {}));
+class errors_HttpProxyMiddlewareError extends Error {
+    code;
+    constructor(message, code){
+        super(message);
+        this.code = code;
+        this.name = this.constructor.name;
+        if (Error.captureStackTrace) Error.captureStackTrace(this, this.constructor);
+    }
+}
 function verifyConfig(options) {
-    if (!options.target && !options.router) throw new Error(errors_ERRORS.ERR_CONFIG_FACTORY_TARGET_MISSING);
+    if (!options.target && !options.router) throw new errors_HttpProxyMiddlewareError('[HPM] Missing "target" option. Example: {target: "http://www.example.org"}', 'ERR_CONFIG_FACTORY_TARGET_MISSING');
 }
-const src = __webpack_require__("./node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/index.js");
+const src = __webpack_require__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js");
 const Debug = src('http-proxy-middleware');
 function definePlugin(fn) {
     return fn;
 }
 const debug = Debug.extend('debug-proxy-errors-plugin');
+const BODY_PARSER_ERROR_MESSAGE = `[HPM] Connection reset (ECONNRESET) detected with non-empty "req.body" [ERR_HPM.GH40].
+
+      This usually means that the POST request body (req.body) was already parsed before reaching the proxy.
+      When bodyParser runs first, it consumes the request stream, leaving the proxy unable to forward the body data to the target server.
+
+      How to fix this issue:
+      - Option 1: Place the proxy middleware before the bodyParser middleware.
+      - Option 2: Use 'fixRequestBody()' helper to fix this issue.
+
+      For more details, see: https://github.com/chimurai/http-proxy-middleware/issues/40\n`;
+function hasParsedBody(req) {
+    return Boolean(req && 'POST' === req.method && 'body' in req && req.body);
+}
 const debugProxyErrorsPlugin = definePlugin((proxyServer, options)=>{
     proxyServer.on('error', (error, req, res, target)=>{
         debug(`httpxy error event: \n%O`, error);
+        if ('ECONNRESET' === error.code && hasParsedBody(req)) console.error(styleText('red', BODY_PARSER_ERROR_MESSAGE));
     });
     proxyServer.on('proxyReq', (proxyReq, req, socket)=>{
         socket.on('error', (error)=>{
@@ -3573,13 +3595,13 @@ function matchPathFilter(pathFilter = '/', uri, req) {
     if (Array.isArray(pathFilter)) {
         if (pathFilter.every(isStringPath)) return matchMultiPath(pathFilter, uri);
         if (pathFilter.every(isGlobPath)) return matchMultiGlobPath(pathFilter, uri);
-        throw new Error(errors_ERRORS.ERR_CONTEXT_MATCHER_INVALID_ARRAY);
+        throw new errors_HttpProxyMiddlewareError('[HPM] Invalid pathFilter. Plain paths (e.g. "/api") can not be mixed with globs (e.g. "/api/**"). Expecting something like: ["/api", "/ajax"] or ["/api/**", "!**.html"].', 'HPM_INVALID_PATH_FILTER_ARRAY_CONFIG');
     }
     if ('function' == typeof pathFilter) {
         const pathname = getUrlPathName(uri);
         return Boolean(pathFilter(pathname, req));
     }
-    throw new Error(errors_ERRORS.ERR_CONTEXT_MATCHER_GENERIC);
+    throw new errors_HttpProxyMiddlewareError('[HPM] Invalid pathFilter. Expecting something like: "/api" or ["/api", "/ajax"]', 'HPM_INVALID_PATH_FILTER_CONFIG');
 }
 function matchSingleStringPath(pathFilter, uri) {
     const pathname = getUrlPathName(uri);
@@ -3641,7 +3663,7 @@ 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 Error(errors_ERRORS.ERR_PATH_REWRITER_CONFIG);
+    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 = [];

package/dist/0~launch-editor.js

@@ -1,5 +1,5 @@
-import { __webpack_require__ } from "./944.js";
-import "./944.js";
+import { __webpack_require__ } from "./619.js";
+import "./619.js";
 __webpack_require__.add({
     "./node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/linux.js" (module) {
         module.exports = {

package/dist/0~open.js

@@ -127,24 +127,64 @@ const wslDefaultBrowser = async ()=>{
     const psPath = await wsl_utils_powerShellPath();
     const command = String.raw`(Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice").ProgId`;
     const { stdout } = await executePowerShell(command, {
-        powerShellPath: psPath
+        powerShellPath: psPath,
+        cwd: node_path.dirname(psPath)
     });
     return stdout.trim();
 };
-const convertWslPathToWindows = async (path)=>{
-    if (/^[a-z]+:\/\//i.test(path)) return path;
-    try {
+const isUrl = (path)=>/^[a-z]+:\/\//i.test(path);
+const convertWslPathToWindows = async (paths)=>{
+    const isBatch = Array.isArray(paths);
+    const pathArray = isBatch ? paths : [
+        paths
+    ];
+    const indicesToConvert = [];
+    const pathsToConvert = [];
+    for (const [index, path] of pathArray.entries())if (!isUrl(path)) {
+        indicesToConvert.push(index);
+        pathsToConvert.push(path);
+    }
+    const results = [
+        ...pathArray
+    ];
+    if (pathsToConvert.length > 0) try {
         const { stdout } = await wsl_utils_execFile('wslpath', [
             '-aw',
-            path
+            ...pathsToConvert
         ], {
             encoding: 'utf8'
         });
-        return stdout.trim();
-    } catch  {
-        return path;
-    }
+        const convertedPaths = stdout.split(/\r?\n/).filter(Boolean);
+        for (const [index, originalIndex] of indicesToConvert.entries())results[originalIndex] = convertedPaths[index] ?? pathArray[originalIndex];
+    } catch  {}
+    return isBatch ? results : results[0];
+};
+const powershell_utils_execFile = promisify(node_child_process.execFile);
+const powershell_utils_powerShellPath = ()=>`${node_process.env.SYSTEMROOT || node_process.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
+const argumentsPrefix = [
+    '-NoProfile',
+    '-NonInteractive',
+    '-ExecutionPolicy',
+    'Bypass',
+    '-EncodedCommand'
+];
+const encodeCommand = (command)=>Buffer.from(command, 'utf16le').toString('base64');
+const escapeArgument = (value)=>`'${String(value).replaceAll('\'', '\'\'')}'`;
+const createArguments = (command)=>[
+        ...argumentsPrefix,
+        encodeCommand(command)
+    ];
+const powershell_utils_executePowerShell = async (command, options = {})=>{
+    const { powerShellPath: psPath, ...execFileOptions } = options;
+    return powershell_utils_execFile(psPath ?? powershell_utils_powerShellPath(), createArguments(command), {
+        encoding: 'utf8',
+        ...execFileOptions
+    });
 };
+powershell_utils_executePowerShell.argumentsPrefix = argumentsPrefix;
+powershell_utils_executePowerShell.encodeCommand = encodeCommand;
+powershell_utils_executePowerShell.escapeArgument = escapeArgument;
+powershell_utils_executePowerShell.createArguments = createArguments;
 function defineLazyProperty(object, propertyName, valueGetter) {
     const define = (value)=>Object.defineProperty(object, propertyName, {
             value,
@@ -409,7 +449,7 @@ const baseOpen = async (options)=>{
         if (app) cliArguments.push('-a', app);
     } else if ('win32' === platform || shouldUseWindowsInWsl) {
         command = await wsl_utils_powerShellPath();
-        cliArguments.push(...executePowerShell.argumentsPrefix);
+        cliArguments.push(...powershell_utils_executePowerShell.argumentsPrefix);
         if (!is_wsl) childProcessOptions.windowsVerbatimArguments = true;
         if (is_wsl && options.target) options.target = await convertWslPathToWindows(options.target);
         const encodedArguments = [
@@ -418,15 +458,16 @@ const baseOpen = async (options)=>{
         ];
         if (options.wait) encodedArguments.push('-Wait');
         if (app) {
-            encodedArguments.push(executePowerShell.escapeArgument(app));
+            encodedArguments.push(powershell_utils_executePowerShell.escapeArgument(app));
             if (options.target) appArguments.push(options.target);
-        } else if (options.target) encodedArguments.push(executePowerShell.escapeArgument(options.target));
+        } else if (options.target) encodedArguments.push(powershell_utils_executePowerShell.escapeArgument(options.target));
         if (appArguments.length > 0) {
-            appArguments = appArguments.map((argument)=>executePowerShell.escapeArgument(argument));
+            appArguments = appArguments.map((argument)=>powershell_utils_executePowerShell.escapeArgument(argument));
             encodedArguments.push('-ArgumentList', appArguments.join(','));
         }
-        options.target = executePowerShell.encodeCommand(encodedArguments.join(' '));
+        options.target = powershell_utils_executePowerShell.encodeCommand(encodedArguments.join(' '));
         if (!options.wait) childProcessOptions.stdio = 'ignore';
+        if (is_wsl) childProcessOptions.cwd = node_path.dirname(command);
     } else {
         if (app) command = app;
         else {

package/dist/0~serve-static.js

@@ -1,6 +1,6 @@
 /*! LICENSE: 0~serve-static.js.LICENSE.txt */
-import { __webpack_require__ } from "./944.js";
-import "./944.js";
+import { __webpack_require__ } from "./619.js";
+import "./619.js";
 import "./0~debug.js";
 __webpack_require__.add({
     "./node_modules/.pnpm/depd@2.0.0/node_modules/depd/index.js" (module, __unused_rspack_exports, __webpack_require__) {
@@ -987,14 +987,14 @@ __webpack_require__.add({
             return a.start - b.start;
         }
     },
-    "./node_modules/.pnpm/send@1.2.1/node_modules/send/index.js" (module, __unused_rspack_exports, __webpack_require__) {
+    "./node_modules/.pnpm/send@1.2.1_supports-color@8.1.1/node_modules/send/index.js" (module, __unused_rspack_exports, __webpack_require__) {
         /*!
  * send
  * Copyright(c) 2012 TJ Holowaychuk
  * Copyright(c) 2014-2022 Douglas Christopher Wilson
  * MIT Licensed
  */ var createError = __webpack_require__("./node_modules/.pnpm/http-errors@2.0.1/node_modules/http-errors/index.js");
-        var debug = __webpack_require__("./node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/index.js")('send');
+        var debug = __webpack_require__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js")('send');
         var encodeUrl = __webpack_require__("./node_modules/.pnpm/encodeurl@2.0.0/node_modules/encodeurl/index.js");
         var escapeHtml = __webpack_require__("./node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js");
         var etag = __webpack_require__("./node_modules/.pnpm/etag@1.8.1/node_modules/etag/index.js");
@@ -1418,7 +1418,7 @@ __webpack_require__.add({
             }
         }
     },
-    "./node_modules/.pnpm/serve-static@2.2.1/node_modules/serve-static/index.js" (module, __unused_rspack_exports, __webpack_require__) {
+    "./node_modules/.pnpm/serve-static@2.2.1_supports-color@8.1.1/node_modules/serve-static/index.js" (module, __unused_rspack_exports, __webpack_require__) {
         /*!
  * serve-static
  * Copyright(c) 2010 Sencha Inc.
@@ -1429,7 +1429,7 @@ __webpack_require__.add({
         var escapeHtml = __webpack_require__("./node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js");
         var parseUrl = __webpack_require__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js");
         var resolve = __webpack_require__("path").resolve;
-        var send = __webpack_require__("./node_modules/.pnpm/send@1.2.1/node_modules/send/index.js");
+        var send = __webpack_require__("./node_modules/.pnpm/send@1.2.1_supports-color@8.1.1/node_modules/send/index.js");
         var url = __webpack_require__("url?b918");
         module.exports = serveStatic;
         function serveStatic(root, options) {
@@ -1592,4 +1592,4 @@ __webpack_require__.add({
         module.exports = /*#__PURE__*/ JSON.parse('{"100":"Continue","101":"Switching Protocols","102":"Processing","103":"Early Hints","200":"OK","201":"Created","202":"Accepted","203":"Non-Authoritative Information","204":"No Content","205":"Reset Content","206":"Partial Content","207":"Multi-Status","208":"Already Reported","226":"IM Used","300":"Multiple Choices","301":"Moved Permanently","302":"Found","303":"See Other","304":"Not Modified","305":"Use Proxy","307":"Temporary Redirect","308":"Permanent Redirect","400":"Bad Request","401":"Unauthorized","402":"Payment Required","403":"Forbidden","404":"Not Found","405":"Method Not Allowed","406":"Not Acceptable","407":"Proxy Authentication Required","408":"Request Timeout","409":"Conflict","410":"Gone","411":"Length Required","412":"Precondition Failed","413":"Payload Too Large","414":"URI Too Long","415":"Unsupported Media Type","416":"Range Not Satisfiable","417":"Expectation Failed","418":"I\'m a Teapot","421":"Misdirected Request","422":"Unprocessable Entity","423":"Locked","424":"Failed Dependency","425":"Too Early","426":"Upgrade Required","428":"Precondition Required","429":"Too Many Requests","431":"Request Header Fields Too Large","451":"Unavailable For Legal Reasons","500":"Internal Server Error","501":"Not Implemented","502":"Bad Gateway","503":"Service Unavailable","504":"Gateway Timeout","505":"HTTP Version Not Supported","506":"Variant Also Negotiates","507":"Insufficient Storage","508":"Loop Detected","509":"Bandwidth Limit Exceeded","510":"Not Extended","511":"Network Authentication Required"}');
     }
 });
-__webpack_require__("./node_modules/.pnpm/serve-static@2.2.1/node_modules/serve-static/index.js");
+__webpack_require__("./node_modules/.pnpm/serve-static@2.2.1_supports-color@8.1.1/node_modules/serve-static/index.js");