Merge f8defb9 into 6107ebe

lib/ctx-utils/sublist.js

@@ -1,5 +1,5 @@
 'use strict';
-var uuid = require('node-uuid'),
+var uuid = require('uuid'),
     vmSim = require('../../src/vm-sim'),
     $metadata = require('../db-utils/metadata');
 

lib/nsobj/record.js

@@ -1,7 +1,7 @@
 'use strict';
 var $metadata = require('../db-utils/metadata'),
     $sublist = require('../ctx-utils/sublist'),
-    uuid = require('node-uuid');
+    uuid = require('uuid');
 
 /**
  * Return a new instance of nlobjRecord used for accessing and manipulating record objects.

nsapi.js

@@ -2,7 +2,7 @@
 var vmSim = require('./src/vm-sim');
 
 // load node-uuid before create window property in global
-require('node-uuid');
+require('uuid');
 
 var moment = require('moment');
 moment.createFromInputFallback = function(config) {

package.json

@@ -41,9 +41,9 @@
     "minimatch": "3.0.0",
     "moment": "2.11.2",
     "morgan": "1.6.1",
-    "node-uuid": "1.4.7",
     "ns-formula-parse": "0.3.0",
     "sync-request": "3.0.0",
+    "uuid": "^3.0.0",
     "xmldom": "0.1.22",
     "xpath": "0.0.21"
   },

src/init.js

@@ -5,7 +5,7 @@ var server = require('./server'),
     path = require('path'),
     glob = require('glob'),
     _ = require('lodash'),
-    uuid = require('node-uuid');
+    uuid = require('uuid');
 
 /**
  * Alternative a cache created by 'require(path)'.