diff --git a/package.json b/package.json index 0ea7a9e261..e66eebb5a1 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "moment": "*", "stripe": "*", "async": "*", - "underscore": "*", - "clone": "*", + "lodash": "*", "coffee-script": "*" }, "private": true, diff --git a/src/app/index.coffee b/src/app/index.coffee index 8e882c5b3f..94942ee76f 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -11,7 +11,7 @@ scoring = require './scoring' schema = require './schema' helpers = require './helpers' helpers.viewHelpers view -_ = require('underscore') +_ = require('lodash') # ========== ROUTES ========== diff --git a/src/app/schema.coffee b/src/app/schema.coffee index dd28aa4f61..99e1d6b7a7 100644 --- a/src/app/schema.coffee +++ b/src/app/schema.coffee @@ -1,6 +1,6 @@ content = require './content' moment = require 'moment' -_ = require 'underscore' +_ = require 'lodash' userSchema = { balance: 2 @@ -16,7 +16,7 @@ userSchema = { module.exports.newUserObject = -> # deep clone, else further new users get duplicate objects - newUser = require('clone')(userSchema, true) #deep + newUser = _.cloneDeep(userSchema) for task in content.defaultTasks guid = task.id = require('racer').uuid() newUser.tasks[guid] = task diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee index d33aff20ee..c1ef1512e0 100644 --- a/src/app/scoring.coffee +++ b/src/app/scoring.coffee @@ -1,6 +1,6 @@ async = require 'async' moment = require 'moment' -_ = require 'underscore' +_ = require 'lodash' 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/serverRoutes.coffee b/src/server/serverRoutes.coffee index ddd856bb05..b0243699f9 100644 --- a/src/server/serverRoutes.coffee +++ b/src/server/serverRoutes.coffee @@ -1,5 +1,5 @@ scoring = require('../app/scoring') -_ = require('underscore') +_ = require('lodash') module.exports = (expressApp, root, derby) ->