From 76f2bf05a6c79a74187e2fcf28b09d8cec689d33 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Mon, 31 Dec 2012 13:39:36 -0500 Subject: [PATCH] Revert "derby major versions" This reverts commit 25b2db4a7dc9eb45180ec82aa528df2ca02763d2. --- package.json | 7 ++++--- src/app/schema.coffee | 2 +- src/server/index.coffee | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 25b55fc4cf..3b6bde4609 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,10 @@ "version": "0.0.0-146", "main": "./server.js", "dependencies": { - "derby": "*", - "racer-db-mongo": "*", - "derby-ui-boot": "*", + "derby": "git://github.com/codeparty/derby#master", + "racer": "git://github.com/codeparty/racer#master", + "racer-db-mongo": "git://github.com/codeparty/racer-db-mongo#master", + "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#master", "derby-auth": "git://github.com/lefnire/derby-auth#master", "forever-monitor": "*", diff --git a/src/app/schema.coffee b/src/app/schema.coffee index 6e89a79328..e31224ac1e 100644 --- a/src/app/schema.coffee +++ b/src/app/schema.coffee @@ -18,7 +18,7 @@ module.exports.newUserObject = -> # deep clone, else further new users get duplicate objects newUser = require('clone')(userSchema, true) #deep for task in content.defaultTasks - guid = task.id = require('derby/node_modules/racer').uuid() + guid = task.id = require('racer').uuid() newUser.tasks[guid] = task switch task.type when 'habit' then newUser.habitIds.push guid diff --git a/src/server/index.coffee b/src/server/index.coffee index 761b357a06..ffadbfaf99 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -11,7 +11,7 @@ priv = require './private' ## RACER CONFIGURATION ## -racer = require 'derby/node_modules/racer' +racer = require 'racer' racer.io.set('transports', ['xhr-polling']) unless process.env.NODE_ENV == 'production' racer.use(racer.logPlugin)