Просмотр исходного кода

Merge pull request #559 from sharelatex/sk-node-6

Update to node6
Shane Kilkelly 9 лет назад
Родитель
Сommit
3a26a8f2d5
3 измененных файлов с 5 добавлено и 3 удалено
  1. 1 1
      .nvmrc
  2. 3 1
      migrations/1_move_doc_lines_to_doc_collection.coffee
  3. 1 1
      package.json

+ 1 - 1
.nvmrc

@@ -1 +1 @@
-0.10.26
+6.11.2

+ 3 - 1
migrations/1_move_doc_lines_to_doc_collection.coffee

@@ -1,4 +1,6 @@
 Settings = require "settings-sharelatex"
+bson = require('bson')
+BSON = new bson()
 fs = require("fs")
 mongojs = require("mongojs")
 ObjectId = mongojs.ObjectId
@@ -61,7 +63,7 @@ getAllDocs = (project_id, callback = (error, docs) ->) ->
 		if !project?
 			console.log "no such project #{project_id}"
 			return callback()
-		size = require("../node_modules/mongojs/node_modules/mongodb/node_modules/bson/").BSONPure.BSON.calculateObjectSize(project)
+		size = BSON.calculateObjectSize(project)
 		if size > 12000000 #12mb
 			return markProjectAsToLargeAndFinished project_id, callback
 		findAllDocsInProject project, (error, docs) ->

+ 1 - 1
package.json

@@ -10,7 +10,7 @@
     "grunt-shell": "^1.1.1",
     "load-grunt-config": "^0.19.2",
     "lodash": "^3.0.0",
-    "mongojs": "^0.18.1",
+    "mongojs": "2.4.0",
     "redis": "^2.6.2",
     "rimraf": "~2.2.6",
     "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git",