From f5f2b4baaf0984da017a171218cbb9a87037ed3f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 24 Aug 2020 01:23:38 +0000 Subject: [PATCH 1/2] fix(deps): update dependency http-proxy-middleware to v1 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb76d84bdb4..affe284f728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8283,14 +8283,14 @@ } }, "http-proxy-middleware": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.21.0.tgz", - "integrity": "sha512-4Arcl5QQ6pRMRJmtM1WVHKHkFAQn5uvw83XuNeqnMTOikDiCoTxv5/vdudhKQsF+1mtaAawrK2SEB1v2tYecdQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.0.5.tgz", + "integrity": "sha512-CKzML7u4RdGob8wuKI//H8Ein6wNTEQR7yjVEzPbhBLGdOfkfvgTnp2HLnniKBDP9QW4eG10/724iTWLBeER3g==", "requires": { - "@types/http-proxy": "^1.17.3", - "http-proxy": "^1.18.0", + "@types/http-proxy": "^1.17.4", + "http-proxy": "^1.18.1", "is-glob": "^4.0.1", - "lodash": "^4.17.15", + "lodash": "^4.17.19", "micromatch": "^4.0.2" }, "dependencies": { diff --git a/package.json b/package.json index 1eafceab657..ccfd91a5c1b 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "git-repo-info": "^2.1.0", "gitconfiglocal": "^2.1.0", "http-proxy": "^1.18.0", - "http-proxy-middleware": "^0.21.0", + "http-proxy-middleware": "^1.0.0", "inquirer": "^6.5.1", "inquirer-autocomplete-prompt": "^1.0.1", "is-docker": "^2.0.0", From 4d12420d6e9d38373f622337a2f2c632fa72e633 Mon Sep 17 00:00:00 2001 From: erezrokah Date: Wed, 26 Aug 2020 17:34:39 +0200 Subject: [PATCH 2/2] fix: switch to explicit import for proxy middleware --- src/commands/dev/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/dev/index.js b/src/commands/dev/index.js index 56586ac6487..b667bb3a2f4 100644 --- a/src/commands/dev/index.js +++ b/src/commands/dev/index.js @@ -12,7 +12,7 @@ const stripAnsiCc = require('strip-ansi-control-characters') const which = require('which') const chokidar = require('chokidar') const debounce = require('lodash.debounce') -const proxyMiddleware = require('http-proxy-middleware') +const { createProxyMiddleware } = require('http-proxy-middleware') const cookie = require('cookie') const get = require('lodash.get') const isEmpty = require('lodash.isempty') @@ -329,7 +329,7 @@ async function serveRedirect(req, res, proxy, match, options) { if (isExternal(match)) { console.log(`${NETLIFYDEVLOG} Proxying to `, dest.toString()) - const handler = proxyMiddleware({ + const handler = createProxyMiddleware({ target: `${dest.protocol}//${dest.host}`, changeOrigin: true, pathRewrite: (path, req) => destURL.replace(/https?:\/\/[^/]+/, ''),