Merge branch 'master' into master

CHANGELOG.md

@@ -8,6 +8,7 @@
 - ci(package): npm package provenance
 - fix(logger-plugin): log target port when router option is used
 - refactor: fix circular dependencies
+- fix(fix-request-body): support '+json' content-type suffix
 
 ## [v3.0.0](https://github.com/chimurai/http-proxy-middleware/releases/tag/v3.0.0)
 

examples/package.json

@@ -14,6 +14,6 @@
     "browser-sync": "3.0.2",
     "connect": "3.7.0",
     "express": "4.19.2",
-    "fastify": "4.27.0"
+    "fastify": "4.28.1"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-proxy-middleware",
-  "version": "3.0.1-beta.0",
+  "version": "3.0.1-beta.1",
   "description": "The one-liner node.js proxy middleware for connect, express, next.js and more",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/chimurai/http-proxy-middleware.git"
+    "url": "git+https://github.com/chimurai/http-proxy-middleware.git"
   },
   "keywords": [
     "reverse",
@@ -55,18 +55,18 @@
   },
   "homepage": "https://github.com/chimurai/http-proxy-middleware#readme",
   "devDependencies": {
-    "@commitlint/cli": "19.2.1",
-    "@commitlint/config-conventional": "19.1.0",
+    "@commitlint/cli": "19.3.0",
+    "@commitlint/config-conventional": "19.2.2",
     "@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.12.5",
+    "@types/micromatch": "4.0.9",
+    "@types/node": "20.14.10",
     "@types/supertest": "6.0.2",
     "@types/ws": "8.5.10",
-    "@typescript-eslint/eslint-plugin": "7.6.0",
-    "@typescript-eslint/parser": "7.6.0",
+    "@typescript-eslint/eslint-plugin": "7.16.0",
+    "@typescript-eslint/parser": "7.16.0",
     "body-parser": "1.20.2",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
@@ -75,18 +75,18 @@
     "get-port": "5.1.1",
     "husky": "9.0.11",
     "jest": "29.7.0",
-    "lint-staged": "15.2.5",
-    "mockttp": "3.10.2",
+    "lint-staged": "15.2.7",
+    "mockttp": "3.14.0",
     "open": "8.4.2",
-    "prettier": "3.2.5",
-    "supertest": "6.3.4",
-    "ts-jest": "29.1.2",
-    "typescript": "5.4.4",
-    "ws": "8.16.0"
+    "prettier": "3.3.2",
+    "supertest": "7.0.0",
+    "ts-jest": "29.2.2",
+    "typescript": "5.5.3",
+    "ws": "8.18.0"
   },
   "dependencies": {
     "@types/http-proxy": "^1.17.14",
-    "debug": "^4.3.4",
+    "debug": "^4.3.5",
     "http-proxy": "^1.18.1",
     "is-glob": "^4.0.3",
     "is-plain-obj": "^3.0.0",

src/handlers/fix-request-body.ts

@@ -23,7 +23,7 @@ export function fixRequestBody<TReq = http.IncomingMessage>(
     proxyReq.write(bodyData);
   };
 
-  if (contentType && contentType.includes('application/json')) {
+  if (contentType && (contentType.includes('application/json') || contentType.includes('+json'))) {
     writeBody(JSON.stringify(requestBody));
   }
 

test/unit/fix-request-body.spec.ts

@@ -57,6 +57,20 @@ describe('fixRequestBody', () => {
     expect(proxyRequest.write).toHaveBeenCalledWith(expectedBody);
   });
 
+  it('should write when body is not empty and Content-Type ends with +json', () => {
+    const proxyRequest = fakeProxyRequest();
+    proxyRequest.setHeader('content-type', 'application/merge-patch+json; charset=utf-8');
+
+    jest.spyOn(proxyRequest, 'setHeader');
+    jest.spyOn(proxyRequest, 'write');
+
+    fixRequestBody(proxyRequest, createRequestWithBody({ someField: 'some value' }));
+
+    const expectedBody = JSON.stringify({ someField: 'some value' });
+    expect(proxyRequest.setHeader).toHaveBeenCalledWith('Content-Length', expectedBody.length);
+    expect(proxyRequest.write).toHaveBeenCalledWith(expectedBody);
+  });
+
   it('should write when body is not empty and Content-Type is application/x-www-form-urlencoded', () => {
     const proxyRequest = fakeProxyRequest();
     proxyRequest.setHeader('content-type', 'application/x-www-form-urlencoded');