diff --git a/lib/app/index.js b/lib/app/index.js index 6874e39e53..e123c51de0 100644 --- a/lib/app/index.js +++ b/lib/app/index.js @@ -21,7 +21,7 @@ helpers = require('./helpers'); helpers.viewHelpers(view); -_ = require('lodash'); +_ = require('underscore'); get('/:uid?', function(page, model, _arg, next) { var req, sess, uid; diff --git a/lib/app/schema.js b/lib/app/schema.js index 507f488650..216b3d5acf 100644 --- a/lib/app/schema.js +++ b/lib/app/schema.js @@ -5,7 +5,7 @@ content = require('./content'); moment = require('moment'); -_ = require('lodash'); +_ = require('underscore'); userSchema = { balance: 2, @@ -30,7 +30,7 @@ userSchema = { module.exports.newUserObject = function() { var guid, newUser, task, _i, _len, _ref; - newUser = _.clone(userSchema, true); + newUser = require('clone')(userSchema, true); _ref = content.defaultTasks; for (_i = 0, _len = _ref.length; _i < _len; _i++) { task = _ref[_i]; diff --git a/lib/app/scoring.js b/lib/app/scoring.js index d4c3ce4471..9b1fc94d94 100644 --- a/lib/app/scoring.js +++ b/lib/app/scoring.js @@ -5,7 +5,7 @@ async = require('async'); moment = require('moment'); -_ = require('lodash'); +_ = require('underscore'); content = require('./content'); diff --git a/lib/server/auth.js b/lib/server/auth.js index e193a16ee6..7c99f61e24 100644 --- a/lib/server/auth.js +++ b/lib/server/auth.js @@ -7,7 +7,7 @@ schema = require('../app/schema'); content = require('../app/content'); -_ = require('lodash'); +_ = require('underscore'); req = void 0; diff --git a/lib/server/serverRoutes.js b/lib/server/serverRoutes.js index 95b82edb10..50d93e30e2 100644 --- a/lib/server/serverRoutes.js +++ b/lib/server/serverRoutes.js @@ -3,7 +3,7 @@ var scoring, _; scoring = require('../app/scoring'); -_ = require('lodash'); +_ = require('underscore'); module.exports = function(expressApp, root, derby) { var deprecatedMessage, staticPages; diff --git a/package.json b/package.json index 822b13aef3..0c48fe4559 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitrpg", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "0.0.0-106", + "version": "0.0.0-142", "main": "./server.js", "dependencies": { "derby": "0.3.13", @@ -15,7 +15,8 @@ "moment": "*", "stripe": "*", "async": "*", - "lodash": "*" + "underscore": "*", + "clone": "*" }, "private": true, "devDependencies": { @@ -31,6 +32,6 @@ }, "engines": { "node": "0.8.x", - "npm": "1.1.x" + "npm": "1.1.x" } -} +} \ No newline at end of file diff --git a/src/app/index.coffee b/src/app/index.coffee index 26eb0db71c..cf59715202 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -10,7 +10,7 @@ scoring = require './scoring' schema = require './schema' helpers = require './helpers' helpers.viewHelpers view -_ = require 'lodash' +_ = require 'underscore' # ========== ROUTES ========== diff --git a/src/app/schema.coffee b/src/app/schema.coffee index 20b69ec289..6e89a79328 100644 --- a/src/app/schema.coffee +++ b/src/app/schema.coffee @@ -1,6 +1,6 @@ content = require './content' moment = require 'moment' -_ = require 'lodash' +_ = require 'underscore' userSchema = { balance: 2 @@ -16,7 +16,7 @@ userSchema = { module.exports.newUserObject = -> # deep clone, else further new users get duplicate objects - newUser = _.clone(userSchema, true) #deep + newUser = require('clone')(userSchema, true) #deep for task in content.defaultTasks guid = task.id = require('derby/node_modules/racer').uuid() newUser.tasks[guid] = task diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee index b67560878e..5a5ef3516a 100644 --- a/src/app/scoring.coffee +++ b/src/app/scoring.coffee @@ -1,6 +1,6 @@ async = require 'async' moment = require 'moment' -_ = require 'lodash' +_ = require 'underscore' content = require './content' helpers = require './helpers' MODIFIER = .03 # each new level, armor, weapon add 3% modifier (this number may change) diff --git a/src/server/auth.coffee b/src/server/auth.coffee index 1fc983f655..2523d5f51d 100644 --- a/src/server/auth.coffee +++ b/src/server/auth.coffee @@ -1,7 +1,7 @@ derby = require('derby') schema = require('../app/schema') content = require('../app/content') -_ = require('lodash') +_ = require('underscore') # Need this for later use by EveryAuth in the MiddleWare req = undefined diff --git a/src/server/serverRoutes.coffee b/src/server/serverRoutes.coffee index bac8000611..cc099a0d90 100644 --- a/src/server/serverRoutes.coffee +++ b/src/server/serverRoutes.coffee @@ -1,5 +1,5 @@ scoring = require('../app/scoring') -_ = require('lodash') +_ = require('underscore') module.exports = (expressApp, root, derby) ->