diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json index 521f190eba..9a9352ba83 100644 --- a/plugins/proxy-backend/package.json +++ b/plugins/proxy-backend/package.json @@ -4,7 +4,6 @@ "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", - "private": true, "publishConfig": { "access": "public", "main": "dist/index.cjs.js", @@ -24,10 +23,9 @@ "@backstage/config": "^0.1.1-alpha.13", "@backstage/config-loader": "^0.1.1-alpha.13", "@types/express": "^4.17.6", - "@types/http-proxy-middleware": "^0.19.3", "express": "^4.17.1", "express-promise-router": "^3.0.3", - "http-proxy-middleware": "^1.0.4", + "http-proxy-middleware": "^0.19.1", "morgan": "^1.10.0", "node-fetch": "^2.6.0", "uuid": "^8.0.0", @@ -45,12 +43,6 @@ "jest-fetch-mock": "^3.0.3", "supertest": "^4.0.2" }, - "workspaces": { - "nohoist": [ - "http-proxy-middleware", - "@types/http-proxy-middleware" - ] - }, "files": [ "dist" ] diff --git a/plugins/proxy-backend/src/service/router.ts b/plugins/proxy-backend/src/service/router.ts index a8fd70c10d..2c8af574bd 100644 --- a/plugins/proxy-backend/src/service/router.ts +++ b/plugins/proxy-backend/src/service/router.ts @@ -14,11 +14,10 @@ * limitations under the License. */ -import { errorHandler } from '@backstage/backend-common'; import { Config } from '@backstage/config'; import express from 'express'; import Router from 'express-promise-router'; -import { createProxyMiddleware } from 'http-proxy-middleware'; +import createProxyMiddleware from 'http-proxy-middleware'; import { Logger } from 'winston'; export interface RouterOptions { @@ -30,13 +29,10 @@ export async function createRouter( options: RouterOptions, ): Promise { const router = Router(); - router.use(express.json()); - const proxyConfig = options.config.get('proxy') ?? {}; Object.entries(proxyConfig).forEach(([route, proxyRouteConfig]) => { router.use(createProxyMiddleware(route, proxyRouteConfig)); }); - router.use(errorHandler()); return router; } diff --git a/yarn.lock b/yarn.lock index 35b06e3d21..ca6bdad85b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3599,7 +3599,7 @@ resolved "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.6.3.tgz#619a55768eab98299e8f76747339f3373f134e69" integrity sha512-4KCE/agIcoQ9bIfa4sBxbZdnORzRjIw8JNQPLfqoNv7wQl/8f8mRbW68Q8wBsQFoJkPUHGlQYZ9sqi5WpfGSEQ== -"@types/http-proxy-middleware@*", "@types/http-proxy-middleware@^0.19.3": +"@types/http-proxy-middleware@*": version "0.19.3" resolved "https://registry.npmjs.org/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.3.tgz#b2eb96fbc0f9ac7250b5d9c4c53aade049497d03" integrity sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA== @@ -10173,16 +10173,15 @@ http-proxy-middleware@0.19.1: lodash "^4.17.11" micromatch "^3.1.10" -http-proxy-middleware@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.0.4.tgz#425ea177986a0cda34f9c81ec961c719adb6c2a9" - integrity sha512-8wiqujNWlsZNbeTSSWMLUl/u70xbJ5VYRwPR8RcAbvsNxzAZbgwLzRvT96btbm3fAitZUmo5i8LY6WKGyHDgvA== +http-proxy-middleware@^0.19.1: + version "0.19.2" + resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.2.tgz#ee73dcc8348165afefe8de2ff717751d181608ee" + integrity sha512-aYk1rTKqLTus23X3L96LGNCGNgWpG4cG0XoZIT1GUPhhulEHX/QalnO6Vbo+WmKWi4AL2IidjuC0wZtbpg0yhQ== dependencies: - "@types/http-proxy" "^1.17.4" http-proxy "^1.18.1" - is-glob "^4.0.1" - lodash "^4.17.15" - micromatch "^4.0.2" + is-glob "^4.0.0" + lodash "^4.17.11" + micromatch "^3.1.10" http-proxy@^1.17.0: version "1.18.0"