Skip to content

Commit b13302c

Browse files
authored
refactor: remove options proxyHost and proxyTable (BREAKING CHANGE) (chimurai#332)
1 parent a30a74b commit b13302c

File tree

5 files changed

+1
-107
lines changed

5 files changed

+1
-107
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- refactor: migrate to typescript ([#328](https://github.com/chimurai/http-proxy-middleware/pull/328))
66
- feat(middleware): Promise / async support ([#328](https://github.com/chimurai/http-proxy-middleware/pull/328/files#diff-7890bfeb41abb0fc0ef2670749c84077R50))
7+
- refactor: remove legacy options `proxyHost` and `proxyTable` (BREAKING CHANGE)
78

89
## [v0.19.1](https://github.com/chimurai/http-proxy-middleware/releases/tag/v0.19.1)
910

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,6 @@ Providing an alternative way to decide which requests should be proxied; In case
247247
}
248248
```
249249

250-
- (DEPRECATED) **option.proxyHost**: Use `option.changeOrigin = true` instead.
251-
- (DEPRECATED) **option.proxyTable**: Use `option.router` instead.
252-
253250
### http-proxy events
254251

255252
Subscribe to [http-proxy events](https://github.com/nodejitsu/node-http-proxy#listening-for-proxy-events):

dist/config-factory.js

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ function createConfig(context, opts) {
3636
if (!config.options.target) {
3737
throw new Error(errors_1.ERRORS.ERR_CONFIG_FACTORY_TARGET_MISSING);
3838
}
39-
// Legacy option.proxyHost
40-
config.options = mapLegacyProxyHostOption(config.options);
41-
// Legacy option.proxyTable > option.router
42-
config.options = mapLegacyProxyTableOption(config.options);
4339
return config;
4440
}
4541
exports.createConfig = createConfig;
@@ -73,32 +69,6 @@ function isStringShortHand(context) {
7369
function isContextless(context, opts) {
7470
return _.isPlainObject(context) && _.isEmpty(opts);
7571
}
76-
function mapLegacyProxyHostOption(options) {
77-
// set options.headers.host when option.proxyHost is provided
78-
if (options.proxyHost) {
79-
logger.warn('*************************************');
80-
logger.warn('[HPM] Deprecated "option.proxyHost"');
81-
logger.warn(' Use "option.changeOrigin" or "option.headers.host" instead');
82-
logger.warn(' "option.proxyHost" will be removed in future release.');
83-
logger.warn('*************************************');
84-
options.headers = options.headers || {};
85-
options.headers.host = options.proxyHost;
86-
}
87-
return options;
88-
}
89-
// Warn deprecated proxyTable api usage
90-
function mapLegacyProxyTableOption(options) {
91-
if (options.proxyTable) {
92-
logger.warn('*************************************');
93-
logger.warn('[HPM] Deprecated "option.proxyTable"');
94-
logger.warn(' Use "option.router" instead');
95-
logger.warn(' "option.proxyTable" will be removed in future release.');
96-
logger.warn('*************************************');
97-
options.router = _.clone(options.proxyTable);
98-
_.omit(options, 'proxyTable');
99-
}
100-
return options;
101-
}
10272
function configureLogger(options) {
10373
if (options.logLevel) {
10474
logger.setLevel(options.logLevel);

src/config-factory.ts

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ export function createConfig(context, opts?) {
4141
throw new Error(ERRORS.ERR_CONFIG_FACTORY_TARGET_MISSING);
4242
}
4343

44-
// Legacy option.proxyHost
45-
config.options = mapLegacyProxyHostOption(config.options);
46-
47-
// Legacy option.proxyTable > option.router
48-
config.options = mapLegacyProxyTableOption(config.options);
49-
5044
return config;
5145
}
5246

@@ -82,40 +76,6 @@ function isContextless(context, opts) {
8276
return _.isPlainObject(context) && _.isEmpty(opts);
8377
}
8478

85-
function mapLegacyProxyHostOption(options) {
86-
// set options.headers.host when option.proxyHost is provided
87-
if (options.proxyHost) {
88-
logger.warn('*************************************');
89-
logger.warn('[HPM] Deprecated "option.proxyHost"');
90-
logger.warn(
91-
' Use "option.changeOrigin" or "option.headers.host" instead'
92-
);
93-
logger.warn(' "option.proxyHost" will be removed in future release.');
94-
logger.warn('*************************************');
95-
96-
options.headers = options.headers || {};
97-
options.headers.host = options.proxyHost;
98-
}
99-
100-
return options;
101-
}
102-
103-
// Warn deprecated proxyTable api usage
104-
function mapLegacyProxyTableOption(options) {
105-
if (options.proxyTable) {
106-
logger.warn('*************************************');
107-
logger.warn('[HPM] Deprecated "option.proxyTable"');
108-
logger.warn(' Use "option.router" instead');
109-
logger.warn(' "option.proxyTable" will be removed in future release.');
110-
logger.warn('*************************************');
111-
112-
options.router = _.clone(options.proxyTable);
113-
_.omit(options, 'proxyTable');
114-
}
115-
116-
return options;
117-
}
118-
11979
function configureLogger(options) {
12080
if (options.logLevel) {
12181
logger.setLevel(options.logLevel);

test/e2e/http-proxy-middleware.spec.ts

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -348,40 +348,6 @@ describe('E2E http-proxy-middleware', () => {
348348
});
349349
});
350350

351-
describe('legacy option.proxyHost', () => {
352-
let proxyServer;
353-
let targetServer;
354-
let targetHeaders;
355-
356-
beforeEach(done => {
357-
const mwProxy = proxyMiddleware('/api', {
358-
target: 'http://localhost:8000',
359-
proxyHost: 'foobar.dev'
360-
});
361-
362-
const mwTarget = (req, res, next) => {
363-
targetHeaders = req.headers;
364-
res.end();
365-
};
366-
367-
proxyServer = createServer(3000, mwProxy);
368-
targetServer = createServer(8000, mwTarget);
369-
370-
http.get('http://localhost:3000/api/', res => {
371-
done();
372-
});
373-
});
374-
375-
afterEach(() => {
376-
proxyServer.close();
377-
targetServer.close();
378-
});
379-
380-
it('should proxy host header to target server', () => {
381-
expect(targetHeaders.host).toBe('foobar.dev');
382-
});
383-
});
384-
385351
describe('option.onError - Error handling', () => {
386352
let proxyServer;
387353
let targetServer;

0 commit comments

Comments
 (0)