update dependencies

bookrc.js

@@ -1,12 +1,13 @@
 /// bookrc logging setup
 var log = require('book').default();
-require('superstack');
+require('stackup');
 
 log.use(require('book-git')(__dirname));
 log.use(require('book-raven')(process.env.SENTRY_DSN));
 
 process.on('uncaughtException', function(err) {
     log.error(err);
+    process.exit(1);
 });
 
 module.exports = log;

package.json

@@ -9,28 +9,29 @@
   },
   "dependencies": {
     "book": "1.3.1",
-    "optimist": "0.6.0",
+    "optimist": "0.6.1",
-    "debug": "0.8.0",
+    "debug": "2.1.0",
     "bookrc": "0.0.1",
     "book-git": "0.0.2",
     "book-raven": "1.0.1",
     "browserkthx": "0.0.2",
-    "hbs": "2.4.0",
+    "hbs": "2.7.0",
-    "taters": "0.1.0",
+    "taters": "1.0.0",
-    "express": "3.4.7",
+    "express": "4.10.5",
     "makeup": "0.0.1",
     "enchilada": "0.11.0",
     "bouncy": "3.2.2",
-    "superstack": "0.0.4",
+    "stackup": "0.0.5",
-    "stylish": "0.4.1",
+    "stylish": "0.5.0",
     "makeover": "0.0.1",
-    "tldjs": "1.3.1",
+    "tldjs": "1.5.1",
-    "finished": "1.1.2",
+    "on-finished": "2.1.1",
-    "dotenv": "0.4.0"
+    "localenv": "0.2.2",
+    "serve-favicon": "2.1.7"
   },
   "devDependencies": {
-    "mocha": "1.18.2",
+    "mocha": "2.0.1",
-    "localtunnel": "1.1.2"
+    "localtunnel": "1.5.0"
   },
   "scripts": {
     "test": "mocha --ui qunit --reporter list -- test",

server.js

@@ -8,13 +8,14 @@ var makeover = require('makeover');
 var makeup = require('makeup');
 var browserkthx = require('browserkthx');
 var tldjs = require('tldjs');
-var on_finished = require('finished');
+var on_finished = require('on-finished');
+var favicon = require('serve-favicon');
 var debug = require('debug')('localtunnel-server');
 
 var Proxy = require('./proxy');
 var rand_id = require('./lib/rand_id');
 
-var kProduction = process.env.NODE_ENV === 'production';
+var PRODUCTION = process.env.NODE_ENV === 'production';
 
 // id -> client http server
 var clients = Object.create(null);
@@ -145,15 +146,17 @@ module.exports = function(opt) {
     app.set('views', __dirname + '/views');
     app.engine('html', require('hbs').__express);
 
-    app.use(express.favicon());
+    taters(app, {
+        cache: PRODUCTION
+    });
 
+    app.use(favicon(__dirname + '/static/favicon.ico'));
     app.use(browserkthx({ ie: '< 9' }));
-    app.use(taters({ cache: kProduction }));
 
     app.use(stylish({
         src: __dirname + '/static/',
-        compress: kProduction,
+        compress: PRODUCTION,
-        cache: kProduction,
+        cache: PRODUCTION,
         setup: function(stylus) {
             return stylus.use(makeover());
         }
@@ -161,15 +164,12 @@ module.exports = function(opt) {
 
     app.use(enchilada({
         src: __dirname + '/static/',
-        compress: kProduction,
+        compress: PRODUCTION,
-        cache: kProduction
+        cache: PRODUCTION
     }));
 
-    app.use('/css/widgets.css', makeup(__dirname + '/static/css/widgets.css'));
     app.use(express.static(__dirname + '/static'));
 
-    app.use(app.router);
-
     app.get('/', function(req, res, next) {
         if (req.query['new'] === undefined) {
             return next();

static/css/font-awesome.css

@@ -6,8 +6,11 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
+  src: url('/fonts/fontawesome-webfont.eot?v=4.0.3');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
+  src: url('/fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),
+       url('/fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),
+       url('/fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'),
+       url('/fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

views/index.html

@@ -11,7 +11,6 @@
     <link rel="stylesheet" type="text/css" media="screen" href="/css/font-awesome.css">
     <link rel="stylesheet" type="text/css" media="screen" href="/css/style.css">
     <link rel="stylesheet" type="text/css" media="screen" href="/css/grid.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="/css/widgets.css">
 
     <title>localtunnel</title>
   </head>
@@ -87,7 +86,5 @@ your url is: https://gqgh.localtunnel.me</pre></div>
 
     <script src="/js/index.js"></script>
 
-    <script>!function(d,s,id) {var js,cjs=d.getElementsByTagName(s)[0],e=d.getElementById(id);if(e){return;}js=d.createElement(s);js.id=id;js.src="https://www.coinbase.com/assets/tips.js";cjs.parentNode.insertBefore(js,cjs);}(document, 'script', 'coinbase-tips');</script>
-
   </body>
 </html>