From 0a109895f77ca0bae9c6f5065e464aa5c06adead Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Thu, 22 Sep 2016 16:32:10 +0800
Subject: [PATCH] merge realtime/package.json into top level package.json

---
 doc/production/first-deploy.md |  2 --
 doc/production/pull-changes.md |  4 +---
 package.json                   |  2 ++
 realtime/package.json          | 10 ----------
 4 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 realtime/package.json

diff --git a/doc/production/first-deploy.md b/doc/production/first-deploy.md
index cf98eda4..cc3a1f4a 100644
--- a/doc/production/first-deploy.md
+++ b/doc/production/first-deploy.md
@@ -87,8 +87,6 @@ server to see what problems show up:
     sudo npm install -g forever
     (crontab -u metamaps -l 2>/dev/null; echo "@reboot $(which forever) --append -l /home/metamaps/logs/forever.realtime.log start /home/metamaps/metamaps/realtime/realtime-server.js") | crontab -u metamaps -
 
-    cd /home/metamaps/metamaps/realtime
-    npm install
     mkdir -p /home/metamaps/logs
     forever --append -l /home/metamaps/logs/forever.realtime.log \
       start /home/metamaps/metamaps/realtime/realtime-server.js
diff --git a/doc/production/pull-changes.md b/doc/production/pull-changes.md
index 0fb5d568..30f41cf5 100644
--- a/doc/production/pull-changes.md
+++ b/doc/production/pull-changes.md
@@ -29,9 +29,7 @@ Now that you have the code, run these commands:
     rake perms:fix
     passenger-config restart-app .
 
-    cd realtime
-    npm install
-    forever list #find the uid, e.g. xQKv
+    forever list #find the uid of the realtime server, e.g. xQKv
     forever restart xQKv
 
     sudo service metamaps_delayed_job restart
diff --git a/package.json b/package.json
index 495b4f4b..925323ac 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,11 @@
     "chai": "^3.5.0",
     "jquery": "1.12.1",
     "mocha": "^3.0.2",
+    "node-uuid": "1.2.0",
     "react": "^15.3.0",
     "react-dom": "^15.3.0",
     "requirejs": "^2.1.1",
+    "socket.io": "0.9.12",
     "underscore": "^1.4.4",
     "webpack": "^1.13.1"
   }
diff --git a/realtime/package.json b/realtime/package.json
deleted file mode 100644
index 5b5b08f4..00000000
--- a/realtime/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "RoR-real-time",
-  "description": "providing real-time sychronization for ruby on rails",
-  "version": "0.0.1",
-  "private": true,
-  "dependencies": {
-    "socket.io": "0.9.12",
-    "node-uuid": "1.2.0"
-  }
-}