merge in master

This commit is contained in:
Lloyd Brookes
2016-06-09 22:56:23 +01:00
2 changed files with 3 additions and 2 deletions

View File

@ -18,7 +18,8 @@ exports.mime = mime
function proxyRequest (route) { function proxyRequest (route) {
const httpProxy = require('http-proxy') const httpProxy = require('http-proxy')
const proxy = httpProxy.createProxyServer({ const proxy = httpProxy.createProxyServer({
changeOrigin: true changeOrigin: true,
secure: false
}) })
return function proxyMiddleware () { return function proxyMiddleware () {

View File

@ -1,6 +1,6 @@
{ {
"name": "local-web-server", "name": "local-web-server",
"version": "1.2.4", "version": "1.2.6",
"description": "A simple web-server for productive front-end development", "description": "A simple web-server for productive front-end development",
"bin": { "bin": {
"ws": "./bin/cli.js" "ws": "./bin/cli.js"