http-proxy-middleware 3.0.0 → 3.0.1-beta.0

package/dist/errors.d.ts

@@ -1,6 +1,6 @@
 export declare enum ERRORS {
     ERR_CONFIG_FACTORY_TARGET_MISSING = "[HPM] Missing \"target\" option. Example: {target: \"http://www.example.org\"}",
-    ERR_CONTEXT_MATCHER_GENERIC = "[HPM] Invalid context. Expecting something like: \"/api\" or [\"/api\", \"/ajax\"]",
-    ERR_CONTEXT_MATCHER_INVALID_ARRAY = "[HPM] Invalid pathFilter. Expecting something like: [\"/api\", \"/ajax\"] or [\"/api/**\", \"!**.html\"]",
+    ERR_CONTEXT_MATCHER_GENERIC = "[HPM] Invalid pathFilter. Expecting something like: \"/api\" or [\"/api\", \"/ajax\"]",
+    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\"].",
     ERR_PATH_REWRITER_CONFIG = "[HPM] Invalid pathRewrite config. Expecting object with pathRewrite config or a rewrite function"
 }

package/dist/errors.js

@@ -4,7 +4,7 @@ exports.ERRORS = void 0;
 var 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 context. Expecting something like: \"/api\" or [\"/api\", \"/ajax\"]";
-    ERRORS["ERR_CONTEXT_MATCHER_INVALID_ARRAY"] = "[HPM] Invalid pathFilter. Expecting something like: [\"/api\", \"/ajax\"] or [\"/api/**\", \"!**.html\"]";
+    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 || (exports.ERRORS = ERRORS = {}));

package/dist/plugins/default/logger-plugin.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loggerPlugin = void 0;
+const url_1 = require("url");
 const logger_1 = require("../../logger");
 const loggerPlugin = (proxyServer, options) => {
     const logger = (0, logger_1.getLogger)(options);
@@ -23,7 +24,11 @@ const loggerPlugin = (proxyServer, options) => {
         // BrowserSync uses req.originalUrl
         // Next.js doesn't have req.baseUrl
         const originalUrl = req.originalUrl ?? `${req.baseUrl || ''}${req.url}`;
-        const exchange = `[HPM] ${req.method} ${originalUrl} -> ${proxyRes.req.protocol}//${proxyRes.req.host}${proxyRes.req.path} [${proxyRes.statusCode}]`;
+        // construct targetUrl
+        const target = new url_1.URL(options.target);
+        target.pathname = proxyRes.req.path;
+        const targetUrl = target.toString();
+        const exchange = `[HPM] ${req.method} ${originalUrl} -> ${targetUrl} [${proxyRes.statusCode}]`;
         logger.info(exchange);
     });
     /**

package/dist/types.d.ts

@@ -11,7 +11,7 @@ import type * as httpProxy from 'http-proxy';
 import type * as net from 'net';
 export type NextFunction<T = (err?: any) => void> = T;
 export interface RequestHandler<TReq = http.IncomingMessage, TRes = http.ServerResponse, TNext = NextFunction> {
-    (req: TReq, res: TRes, next?: TNext): void | Promise<void>;
+    (req: TReq, res: TRes, next?: TNext): Promise<void>;
     upgrade: (req: http.IncomingMessage, socket: net.Socket, head: Buffer) => void;
 }
 export type Filter<TReq = http.IncomingMessage> = string | string[] | ((pathname: string, req: TReq) => boolean);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-proxy-middleware",
-  "version": "3.0.0",
+  "version": "3.0.1-beta.0",
   "description": "The one-liner node.js proxy middleware for connect, express, next.js and more",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,6 +22,9 @@
     "prepack": "yarn clean && yarn test && yarn build",
     "spellcheck": "npx --yes cspell --show-context --show-suggestions '**/*.*'"
   },
+  "publishConfig": {
+    "provenance": true
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/chimurai/http-proxy-middleware.git"
@@ -51,18 +54,18 @@
   },
   "homepage": "https://github.com/chimurai/http-proxy-middleware#readme",
   "devDependencies": {
-    "@commitlint/cli": "17.7.1",
-    "@commitlint/config-conventional": "17.7.0",
+    "@commitlint/cli": "19.2.1",
+    "@commitlint/config-conventional": "19.1.0",
     "@types/debug": "4.1.12",
     "@types/express": "4.17.21",
     "@types/is-glob": "4.0.4",
     "@types/jest": "29.5.12",
     "@types/micromatch": "4.0.6",
-    "@types/node": "20.11.30",
-    "@types/supertest": "2.0.12",
+    "@types/node": "20.12.5",
+    "@types/supertest": "6.0.2",
     "@types/ws": "8.5.10",
-    "@typescript-eslint/eslint-plugin": "7.4.0",
-    "@typescript-eslint/parser": "7.4.0",
+    "@typescript-eslint/eslint-plugin": "7.6.0",
+    "@typescript-eslint/parser": "7.6.0",
     "body-parser": "1.20.2",
     "browser-sync": "3.0.2",
     "connect": "3.7.0",
@@ -74,12 +77,12 @@
     "husky": "9.0.11",
     "jest": "29.7.0",
     "lint-staged": "15.2.2",
-    "mockttp": "3.10.1",
+    "mockttp": "3.10.2",
     "open": "8.4.2",
     "prettier": "3.2.5",
     "supertest": "6.3.4",
     "ts-jest": "29.1.2",
-    "typescript": "5.4.3",
+    "typescript": "5.4.4",
     "ws": "8.16.0"
   },
   "dependencies": {