Merge branch 'master' into next

lib/local-web-server.js

@@ -195,7 +195,7 @@ function proxyRequest (route, app) {
     const next = arguments[arguments.length - 1]
     const keys = []
     route.re = pathToRegexp(route.from, keys)
-    route.new = this.path.replace(route.re, route.to)
+    route.new = this.url.replace(route.re, route.to)
 
     keys.forEach((key, index) => {
       const re = RegExp(`:${key.name}`, 'g')