Skip to content

Commit

Permalink
Merge d249803 into 0497805
Browse files Browse the repository at this point in the history
  • Loading branch information
chimurai committed Aug 29, 2018
2 parents 0497805 + d249803 commit 6b6ce54
Show file tree
Hide file tree
Showing 11 changed files with 2,192 additions and 2,762 deletions.
1 change: 1 addition & 0 deletions .travis.yml
@@ -1,6 +1,7 @@
language: node_js
node_js:
- 'stable'
- '9'
- '8'
- '7'
- '6'
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,8 @@
# Changelog

## [v0.19.0](https://github.com/chimurai/http-proxy-middleware/releases/tag/v0.19.0)
- feat(http-proxy): bump to v1.17.0 ([#261](https://github.com/chimurai/http-proxy-middleware/pull/261))

## [v0.18.0](https://github.com/chimurai/http-proxy-middleware/releases/tag/v0.18.0)
- fix(vulnerability): update micromatch to v3.x ([npm:braces:20180219](https://snyk.io/test/npm/http-proxy-middleware?tab=issues&severity=high&severity=medium&severity=low#npm:braces:20180219
))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -474,4 +474,4 @@ $ npm run cover

The MIT License (MIT)

Copyright (c) 2015-2017 Steven Chim
Copyright (c) 2015-2018 Steven Chim
2 changes: 1 addition & 1 deletion lib/config-factory.js
Expand Up @@ -26,7 +26,7 @@ function createConfig (context, opts) {
var target = [oUrl.protocol, '//', oUrl.host].join('')

config.context = oUrl.pathname || '/'
config.options = _.assign(config.options, {target: target}, opts)
config.options = _.assign(config.options, { target: target }, opts)

if (oUrl.protocol === 'ws:' || oUrl.protocol === 'wss:') {
config.options.ws = true
Expand Down

0 comments on commit 6b6ce54

Please sign in to comment.