Merge pull request HabitRPG#4097 from HabitRPG/paglias/modules

Update modules where possible and remove unused modules from package.json

.nodemonignore

@@ -1,13 +1,15 @@
-public/*
-views/*
-build
-build/*
+node_modules/**
+.bower-cache/**
+.bower-tmp/**
+.bower-registry/**
+public/**
+views/**
+build/**
+.git/**
 Gruntfile.js
 CHANGELOG.md
 .idea*
-.git*
 *.log
 newrelic_agent.log
-.bower-cache*
 *.swp
 *.swx

package.json

@@ -4,56 +4,51 @@
   "version": "0.0.0-152",
   "main": "./src/server.js",
   "dependencies": {
-    "async": "~0.2.9",
-    "bower": "~1.3.8",
+    "async": "~0.9.0",
+    "bower": "~1.3.12",
     "coffee-script": "1.6.x",
-    "connect-mongo": "*",
-    "connect-ratelimit": "0.0.6",
+    "connect-ratelimit": "0.0.7",
     "coupon-code": "~0.3.0",
     "domain-middleware": "~0.1.0",
-    "express": "3.5.x",
+    "express": "~3.17.5",
     "express-csv": "~0.6.0",
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.9",
-    "grunt-concurrent": "~0.3.1",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-contrib-stylus": "~0.8.0",
-    "grunt-contrib-uglify": "~0.2.4",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-hashres": "~0.3.2",
-    "grunt-nodemon": "~0.1.1",
-    "guid": "*",
-    "gzippo": "*",
+    "grunt-concurrent": "~1.0.0",
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-contrib-copy": "~0.6.0",
+    "grunt-contrib-cssmin": "~0.10.0",
+    "grunt-contrib-stylus": "~0.20.0",
+    "grunt-contrib-uglify": "~0.6.0",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-hashres": "~0.4.1",
+    "grunt-nodemon": "~0.3.0",
     "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#develop",
     "icalendar": "git://github.com/lefnire/node-icalendar#master",
-    "jade": "~0.35.0",
     "js2xmlparser": "~0.1.2",
-    "lodash": "~2.2.1",
-    "moment": "~2.4.0",
+    "lodash": "~2.4.1",
+    "jade": "~1.7.0",
+    "method-override": "~2.2.0",
     "mongoose": "~3.8.17",
+    "moment": "~2.8.3",
     "mongoose-id-autoinc": "~2013.7.14-4",
-    "nconf": "*",
+    "nconf": "~0.6.9",
     "newrelic": "~1.11.2",
     "nib": "~1.0.1",
     "nodemailer": "~0.5.2",
-    "optimist": "~0.5.2",
-    "passport": "~0.1.18",
+    "passport": "~0.2.1",
     "passport-facebook": "~1.0.2",
     "paypal-express-checkout": "git://github.com/HabitRPG/node-paypal-express-checkout#habitrpg",
     "paypal-ipn": "~1.0.1",
     "paypal-recurring": "git://github.com/jaybryant/paypal-recurring#656b496f43440893c984700191666a5c5c535dca",
     "pretty-data": "git://github.com/vkiryukhin/pretty-data#master",
-    "request": "~2.42.0",
-    "resolve": "~0.2.3",
+    "request": "~2.44.0",
     "stripe": "*",
-    "stylus": "~0.37.0",
     "swagger-node-express": "git://github.com/lefnire/swagger-node-express#habitrpg",
     "universal-analytics": "~0.3.2",
-    "validator": "~3.11.2",
-    "winston": "~0.7.2",
-    "winston-mail": "~0.2.7",
+    "validator": "~3.19.0",
+    "winston": "~0.8.0",
+    "winston-mail": "~0.2.9",
     "winston-newrelic": "~0.1.4"
   },
   "private": true,

public/js/env.js

@@ -9,7 +9,7 @@ if(window.moment && window.env.language && window.env.language.momentLang && win
   script.type = 'text/javascript';
   script.text = window.env.language.momentLang;
   head.appendChild(script);
-  window.moment.lang(window.env.language.momentLangCode);
+  window.moment.locale(window.env.language.momentLangCode);
 }
 
 window.habitrpgShared.i18n.strings = window.env.translations;

src/controllers/payments.js

@@ -108,7 +108,7 @@ function cancelSubscription(user, data){
   if(isProduction) emailUser(user, 'cancel-subscription');
   user.purchased.plan.dateTerminated =
     moment( now.format('MM') + '/' + moment(du).format('DD') + '/' + now.format('YYYY') )
-    .add('month',1)
+    .add(1, 'month')
     .toDate();
   ga.event('unsubscribe', 'Stripe').send();
 

src/server.js

@@ -109,7 +109,7 @@ if (cluster.isMaster && (isDev || isProd)) {
   app.use(middleware.forceSSL);
   app.use(express.urlencoded());
   app.use(express.json());
-  app.use(express.methodOverride());
+  app.use(require('method-override')());
   //app.use(express.cookieParser(nconf.get('SESSION_SECRET')));
   app.use(express.cookieParser());
   app.use(express.cookieSession({ secret: nconf.get('SESSION_SECRET'), httpOnly: false, cookie: { maxAge: TWO_WEEKS }}));

views/index.jade

@@ -1,4 +1,4 @@
-doctype 5
+doctype html
 //html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":applyingAction}', ui-keypress="{27:'castCancel()'}")
 html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":applyingAction}', ui-keyup="{27:'castCancel()'}")
   head

views/shared/tasks/task.jade

@@ -137,7 +137,8 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
                 a.pull-right.checklist-icons(ng-click='removeChecklistItem(task,$event,$index,true)')
                   span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
                 input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)')
-                input.inline-edit(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}")//-,ng-blur='saveTask(task,true)')
+                //-,ng-blur='saveTask(task,true)')
+                input.inline-edit(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}")
 
 
       form(ng-submit='saveTask(task)')

views/static/api.jade

@@ -1,4 +1,4 @@
-!!! 5
+doctype 5
 html
   head
     title Swagger UI

views/static/layout.jade

@@ -1,6 +1,6 @@
 //-Trick needed to pass 'env' to ./layout
 block vars
-doctype 5
+doctype html
 html(ng-app='habitrpgStatic')
 
   head

views/static/new-stuff.jade

@@ -1,5 +1,5 @@
 block vars
-doctype 5
+doctype html
 html(ng-app='habitrpgStatic')
 
   head