From 54ec10598651a3fe17990c0a58836e05479e249d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 16:09:35 -0400 Subject: [PATCH 1/2] random attempt to fix bad dep check --- src/meta/dependencies.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/meta/dependencies.js b/src/meta/dependencies.js index 791e3d57ab..8b1af04806 100644 --- a/src/meta/dependencies.js +++ b/src/meta/dependencies.js @@ -26,20 +26,20 @@ module.exports = function(Meta) { } try { - var pkgData = JSON.parse(pkgData), - ok = !semver.validRange(pkg.dependencies[module]) || semver.satisfies(pkgData.version, pkg.dependencies[module]); + pkgData = JSON.parse(pkgData); + var ok = !semver.validRange(pkg.dependencies[module]) || semver.satisfies(pkgData.version, pkg.dependencies[module]); if (ok || (pkgData._resolved && pkgData._resolved.indexOf('//github.com') !== -1)) { next(true); } else { - process.stdout.write('[' + 'outdated'.yellow + '] ' + module.bold + ' installed v' + pkgData.version + ', package.json requires ' + pkg.dependencies[module] + '\n') + process.stdout.write('[' + 'outdated'.yellow + '] ' + module.bold + ' installed v' + pkgData.version + ', package.json requires ' + pkg.dependencies[module] + '\n'); next(false); } } catch(e) { winston.error('[meta/dependencies] Could not read: ' + module); process.exit(); } - }) + }); }, function(ok) { callback(!ok && global.env !== 'development' ? new Error('dependencies-out-of-date') : null); }); From 4b91d7ec3df6474fe091ab224fb067e33252deea Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 16:18:55 -0400 Subject: [PATCH 2/2] req.route is not defined if you go to some bogus url --- src/middleware/middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 769882c49d..1e787c1def 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -300,7 +300,7 @@ middleware.renderHeader = function(req, res, data, callback) { templateValues.template = {name: res.locals.template}; templateValues.template[res.locals.template] = true; - if (req.route.path === '/') { + if (req.route && req.route.path === '/') { modifyTitle(templateValues); } @@ -346,7 +346,7 @@ middleware.processRender = function(req, res, next) { } if (res.locals.isAPI) { - if (req.route.path === '/api/') { + if (req.route && req.route.path === '/api/') { options.title = '[[pages:home]]'; }