hotel
Advanced tools
Comparing version 0.5.8 to 0.5.9
# Change Log | ||
## 0.5.7 | ||
## 0.5.9 | ||
* UI bug fix | ||
## 0.5.8 | ||
* Add `favicon` | ||
* Fix Safari and IE bug | ||
__Deprecated: hotel start issue, please use 0.5.6__ | ||
## 0.5.6 | ||
@@ -11,0 +13,0 @@ |
@@ -31,4 +31,8 @@ # Configuring local .dev domains | ||
Check your network manager and look for proxy configuration. Use browser configuration as an alternative. | ||
On Ubuntu | ||
`System Settings > Network > Network Proxy > Automatic` | ||
For other distributions, check your network manager and look for proxy configuration. Use browser configuration as an alternative. | ||
## Browser configuration | ||
@@ -35,0 +39,0 @@ |
@@ -41,3 +41,3 @@ 'use strict'; | ||
function add(param) { | ||
var opts = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; | ||
var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; | ||
@@ -102,3 +102,3 @@ mkdirp.sync(serversDir); | ||
function rm() { | ||
var opts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; | ||
var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; | ||
@@ -105,0 +105,0 @@ var cwd = process.cwd(); |
@@ -8,9 +8,9 @@ 'use strict'; | ||
var _require = require('./common'); | ||
var _require = require('./common'), | ||
hotelDir = _require.hotelDir, | ||
confFile = _require.confFile; | ||
var hotelDir = _require.hotelDir; | ||
var confFile = _require.confFile; | ||
// Create dir | ||
mkdirp.sync(hotelDir); | ||
@@ -17,0 +17,0 @@ |
@@ -371,9 +371,7 @@ 'use strict'; | ||
if (req.headers.host) { | ||
var _req$headers$host$spl = req.headers.host.split(':'); | ||
var _req$headers$host$spl = req.headers.host.split(':'), | ||
_req$headers$host$spl2 = _slicedToArray(_req$headers$host$spl, 2), | ||
hostname = _req$headers$host$spl2[0], | ||
port = _req$headers$host$spl2[1]; | ||
var _req$headers$host$spl2 = _slicedToArray(_req$headers$host$spl, 2); | ||
var hostname = _req$headers$host$spl2[0]; | ||
var port = _req$headers$host$spl2[1]; | ||
var regexp = new RegExp('.' + conf.tld + '$'); | ||
@@ -394,8 +392,6 @@ var id = hostname.replace(regexp, ''); | ||
if (req.headers.host) { | ||
var _req$headers$host$spl3 = req.headers.host.split(':'); | ||
var _req$headers$host$spl3 = req.headers.host.split(':'), | ||
_req$headers$host$spl4 = _slicedToArray(_req$headers$host$spl3, 1), | ||
hostname = _req$headers$host$spl4[0]; | ||
var _req$headers$host$spl4 = _slicedToArray(_req$headers$host$spl3, 1); | ||
var hostname = _req$headers$host$spl4[0]; | ||
var tld = new RegExp('.' + conf.tld + '$'); | ||
@@ -410,6 +406,5 @@ var id = this.resolve(hostname.replace(tld, '')); | ||
} else { | ||
var _url$parse = url.parse(item.target); | ||
var _url$parse = url.parse(item.target), | ||
_hostname = _url$parse.hostname; | ||
var _hostname = _url$parse.hostname; | ||
target = 'ws://' + _hostname; | ||
@@ -433,11 +428,10 @@ } | ||
if (req.headers.host) { | ||
var _req$headers$host$spl5 = req.headers.host.split(':'); | ||
var _req$headers$host$spl5 = req.headers.host.split(':'), | ||
_req$headers$host$spl6 = _slicedToArray(_req$headers$host$spl5, 2), | ||
hostname = _req$headers$host$spl6[0], | ||
port = _req$headers$host$spl6[1]; | ||
var _req$headers$host$spl6 = _slicedToArray(_req$headers$host$spl5, 2); | ||
// If https make socket go through https proxy on 2001 | ||
var hostname = _req$headers$host$spl6[0]; | ||
var port = _req$headers$host$spl6[1]; | ||
// If https make socket go through https proxy on 2001 | ||
if (port === '443') { | ||
@@ -458,7 +452,6 @@ return tcpProxy.proxy(socket, conf.port + 1, hostname); | ||
} else { | ||
var _url$parse2 = url.parse(item.target); | ||
var _url$parse2 = url.parse(item.target), | ||
_hostname2 = _url$parse2.hostname, | ||
_port = _url$parse2.port; | ||
var _hostname2 = _url$parse2.hostname; | ||
var _port = _url$parse2.port; | ||
util.log('Connect - proxy socket to ' + _hostname2 + ':' + _port); | ||
@@ -465,0 +458,0 @@ tcpProxy.proxy(socket, _port || 80, _hostname2); |
@@ -40,3 +40,3 @@ 'use strict'; | ||
module.exports = function (group) { | ||
var opts = arguments.length <= 1 || arguments[1] === undefined ? { watch: true } : arguments[1]; | ||
var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { watch: true }; | ||
@@ -43,0 +43,0 @@ var dir = common.serversDir; |
@@ -5,7 +5,5 @@ 'use strict'; | ||
var _require = require('./common'); | ||
var _require = require('./common'), | ||
pidFile = _require.pidFile; | ||
var pidFile = _require.pidFile; | ||
module.exports = { | ||
@@ -12,0 +10,0 @@ create: create, |
@@ -5,8 +5,6 @@ 'use strict'; | ||
var _require = require('../common'); | ||
var _require = require('../common'), | ||
startupFile = _require.startupFile, | ||
pidFile = _require.pidFile; | ||
var startupFile = _require.startupFile; | ||
var pidFile = _require.pidFile; | ||
function killProcess() { | ||
@@ -13,0 +11,0 @@ if (!fs.existsSync(pidFile)) return; |
{ | ||
"name": "hotel", | ||
"version": "0.5.8", | ||
"version": "0.5.9", | ||
"description": "Local domains for everyone and more! ", | ||
@@ -58,3 +58,3 @@ "main": "lib", | ||
"respawn": "^2.4.1", | ||
"server-ready": "^0.2.0", | ||
"server-ready": "^0.3.1", | ||
"strip-ansi": "^3.0.0", | ||
@@ -64,10 +64,10 @@ "sudo-block": "^1.2.0", | ||
"unquote": "^1.1.0", | ||
"untildify": "^2.1.0", | ||
"untildify": "^3.0.2", | ||
"update-notifier": "^1.0.0", | ||
"user-startup": "^0.2.1", | ||
"vhost": "^3.0.2", | ||
"yargs": "^4.7.1" | ||
"yargs": "^6.3.0" | ||
}, | ||
"devDependencies": { | ||
"ava": "^0.15.2", | ||
"ava": "^0.16.0", | ||
"babel-cli": "^6.1.2", | ||
@@ -92,8 +92,9 @@ "babel-core": "^6.7.4", | ||
"sinon": "^1.17.3", | ||
"standard": "^7.1.2", | ||
"supertest": "^1.2.0", | ||
"standard": "^8.5.0", | ||
"supertest": "^2.0.1", | ||
"uid": "0.0.2", | ||
"vue": "^2.0.0-rc.5", | ||
"vue": "^2.0.3", | ||
"vue-hot-reload-api": "^2.0.6", | ||
"vue-html-loader": "^1.2.3", | ||
"vue-loader": "^8.5.2", | ||
"vue-loader": "^9.7.0", | ||
"vue-style-loader": "^1.0.0", | ||
@@ -100,0 +101,0 @@ "webpack": "^1.12.13", |
@@ -29,4 +29,2 @@ # hotel [![Mac/Linux Build Status](https://img.shields.io/travis/typicode/hotel/master.svg?label=Mac%20OSX%20%26%20Linux)](https://travis-ci.org/typicode/hotel) [![Windows Build status](https://img.shields.io/appveyor/ci/typicode/hotel/master.svg?label=Windows)](https://ci.appveyor.com/project/typicode/hotel/branch/master) [![](https://badge.fury.io/js/hotel.svg)](https://www.npmjs.com/package/hotel) [![](https://img.shields.io/badge/share%20on-twitter-00aced.svg)](https://twitter.com/intent/tweet?text=Start%20apps%20from%20your%20browser%20and%20get%20local%20domains%20without%20editing%20/etc/hosts%20http://i.imgur.com/DrLjbIi.gif&url=https://github.com/typicode/hotel) | ||
_* Local `.dev` domains are optional. To use them, configure your network or browser to use hotel's proxy auto-config file (`proxy.pac`). See instructions [here](https://github.com/typicode/hotel/blob/master/docs/README.md)._ | ||
## Install | ||
@@ -42,2 +40,8 @@ | ||
### Local dev domains (optional) | ||
To use local `.dev` domains, you need to configure your network or browser to use hotel's proxy auto-config file or you can skip this step for the moment and go directly to http://localhost:2000 | ||
[__See instructions here__](https://github.com/typicode/hotel/blob/master/docs/README.md). | ||
### Servers | ||
@@ -140,6 +144,2 @@ | ||
## Dev domain support | ||
See instructions [here](https://github.com/typicode/hotel/blob/master/docs/README.md). | ||
## Fallback URL | ||
@@ -146,0 +146,0 @@ |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
1069380
30
3266
+ Addedserver-ready@0.3.1(transitive)
+ Addeduntildify@3.0.3(transitive)
+ Addedyargs@6.6.0(transitive)
+ Addedyargs-parser@4.2.1(transitive)
- Removedlodash.assign@4.2.0(transitive)
- Removedserver-ready@0.2.0(transitive)
- Removedwindow-size@0.2.0(transitive)
- Removedyargs@4.8.1(transitive)
- Removedyargs-parser@2.4.1(transitive)
Updatedserver-ready@^0.3.1
Updateduntildify@^3.0.2
Updatedyargs@^6.3.0