From 4dd37bda60bfe6f3937661110b002bff7927ff5e Mon Sep 17 00:00:00 2001 From: Roman Shtylman Date: Thu, 11 Dec 2014 09:32:00 -0800 Subject: [PATCH] update dependencies --- bookrc.js | 3 ++- package.json | 25 +++++++++++++------------ server.js | 22 +++++++++++----------- static/css/font-awesome.css | 7 +++++-- static/css/widgets.css | 0 static/favicon.ico | Bin 0 -> 1406 bytes views/index.html | 3 --- 7 files changed, 31 insertions(+), 29 deletions(-) delete mode 100644 static/css/widgets.css create mode 100644 static/favicon.ico diff --git a/bookrc.js b/bookrc.js index 970e49d..db833b7 100644 --- a/bookrc.js +++ b/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; diff --git a/package.json b/package.json index 8d36d16..e2445ec 100644 --- a/package.json +++ b/package.json @@ -9,28 +9,29 @@ }, "dependencies": { "book": "1.3.1", - "optimist": "0.6.0", - "debug": "0.8.0", + "optimist": "0.6.1", + "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", - "taters": "0.1.0", - "express": "3.4.7", + "hbs": "2.7.0", + "taters": "1.0.0", + "express": "4.10.5", "makeup": "0.0.1", "enchilada": "0.11.0", "bouncy": "3.2.2", - "superstack": "0.0.4", - "stylish": "0.4.1", + "stackup": "0.0.5", + "stylish": "0.5.0", "makeover": "0.0.1", - "tldjs": "1.3.1", - "finished": "1.1.2", - "dotenv": "0.4.0" + "tldjs": "1.5.1", + "on-finished": "2.1.1", + "localenv": "0.2.2", + "serve-favicon": "2.1.7" }, "devDependencies": { - "mocha": "1.18.2", - "localtunnel": "1.1.2" + "mocha": "2.0.1", + "localtunnel": "1.5.0" }, "scripts": { "test": "mocha --ui qunit --reporter list -- test", diff --git a/server.js b/server.js index 77a5165..05ca5e6 100644 --- a/server.js +++ b/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, - cache: kProduction, + compress: PRODUCTION, + 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, - cache: kProduction + compress: PRODUCTION, + 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(); diff --git a/static/css/font-awesome.css b/static/css/font-awesome.css index 048cff9..3395944 100644 --- a/static/css/font-awesome.css +++ b/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?#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?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'); font-weight: normal; font-style: normal; } diff --git a/static/css/widgets.css b/static/css/widgets.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..895fc96a76b68b4924f1c51d022e1b82fa0f461f GIT binary patch literal 1406 zcmZQzU<5(|0R}M0U}azs1F|%L7$l?s#Ec9aKoZP=&}i&OouUjIY8@C}uZw4x5z5N2 zvEG^C^vXtt_xtJ?p3O32c(KTx;lsgZhW%5M85Sf}k-mf`L80)|7ga~M{a znlL=>m1Q`#uoPkbC~GtXMnhnDh5$DU1D6mx+;2QAKt3ZQFH}H~1y~00GcqzVg9QXw z_<%(a7y$V|wJgF=E>MgE#Aid|14}IyCM5MhEnxFF;pTzOK(>#80puP=gnOXwAd33` mpMe2}f66m3eB@_fcnmb^7!b1nO#opK8zcsj1F3 - localtunnel @@ -87,7 +86,5 @@ your url is: https://gqgh.localtunnel.me - -