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

Merge pull request #19 from overleaf/msm-update-dependencies

Update dependencies
Miguel Serrano 6 лет назад
Родитель
Сommit
0fe8b4dc11

+ 0 - 1
services/contacts/.eslintrc

@@ -1,7 +1,6 @@
 // this file was auto-generated, do not edit it directly.
 // instead run bin/update_build_scripts from
 // https://github.com/sharelatex/sharelatex-dev-environment
-// Version: 1.3.5
 {
   "extends": [
     "standard",

+ 0 - 1
services/contacts/.prettierrc

@@ -1,7 +1,6 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.5
 {
   "semi": false,
   "singleQuote": true

+ 0 - 1
services/contacts/Dockerfile

@@ -1,7 +1,6 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.5
 
 FROM node:10.19.0 as base
 

+ 0 - 1
services/contacts/Makefile

@@ -1,7 +1,6 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.5
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)

+ 5 - 5
services/contacts/buildscript.txt

@@ -1,10 +1,10 @@
 contacts
---node-version=10.19.0
---script-version=1.3.5
+--acceptance-creds=None
 --dependencies=mongo
---language=es
 --docker-repos=gcr.io/overleaf-ops
---acceptance-creds=None
---env-pass-through=
 --env-add=
+--env-pass-through=
+--language=es
+--node-version=10.19.0
 --public-repo=False
+--script-version=2.0.0

+ 0 - 1
services/contacts/docker-compose.ci.yml

@@ -1,7 +1,6 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.5
 
 version: "2.3"
 

+ 0 - 1
services/contacts/docker-compose.yml

@@ -1,7 +1,6 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.3.5
 
 version: "2.3"
 

Разница между файлами не показана из-за своего большого размера
+ 706 - 99
services/contacts/package-lock.json


+ 23 - 23
services/contacts/package.json

@@ -15,44 +15,44 @@
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "nodemon --config nodemon.json",
     "lint": "node_modules/.bin/eslint .",
-    "format": "node_modules/.bin/prettier-eslint '**/*.js' --list-different",
-    "format:fix": "node_modules/.bin/prettier-eslint '**/*.js' --write"
+    "format": "node_modules/.bin/prettier-eslint $PWD'/**/*.js' --list-different",
+    "format:fix": "node_modules/.bin/prettier-eslint $PWD'/**/*.js' --write"
   },
   "dependencies": {
-    "async": "~0.8.0",
-    "body-parser": "~1.0.2",
-    "express": "~4.5.0",
-    "logger-sharelatex": "^1.7.0",
-    "metrics-sharelatex": "^2.2.0",
-    "mongojs": "2.4.0",
-    "request": "~2.47.0",
+    "async": "^2.6.3",
+    "body-parser": "^1.19.0",
+    "express": "^4.17.1",
+    "logger-sharelatex": "^1.9.0",
+    "metrics-sharelatex": "^2.6.1",
+    "mongojs": "3.1.0",
+    "request": "~2.88.2",
     "settings-sharelatex": "^1.1.0",
-    "underscore": "~1.6.0"
+    "underscore": "~1.9.2"
   },
   "devDependencies": {
-    "babel-eslint": "^10.0.3",
-    "bunyan": "~0.22.3",
-    "chai": "~1.9.1",
-    "eslint": "^6.6.0",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-config-standard": "^14.1.0",
+    "babel-eslint": "^10.1.0",
+    "bunyan": "~1.8.12",
+    "chai": "~4.2.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.1",
+    "eslint-config-standard": "^14.1.1",
     "eslint-config-standard-jsx": "^8.1.0",
     "eslint-config-standard-react": "^9.2.0",
     "eslint-plugin-chai-expect": "^2.1.0",
     "eslint-plugin-chai-friendly": "^0.5.0",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-mocha": "^6.2.2",
+    "eslint-plugin-mocha": "^6.3.0",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-react": "^7.18.3",
+    "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-standard": "^4.0.1",
-    "mocha": "^4.0.1",
-    "prettier": "^1.19.1",
+    "mocha": "^7.1.1",
+    "prettier": "^2.0.1",
     "prettier-eslint-cli": "^5.0.0",
-    "sandboxed-module": "~0.3.0",
-    "sinon": "~1.5.2",
-    "timekeeper": "0.0.5"
+    "sandboxed-module": "~2.0.3",
+    "sinon": "~9.0.1",
+    "timekeeper": "2.2.0"
   }
 }

+ 1 - 1
services/contacts/test/acceptance/js/GettingContactsTests.js

@@ -95,7 +95,7 @@ describe('Getting Contacts', function() {
       )
     })
 
-    return it('should respect a limit and only return top X contacts', function() {
+    return it('should respect a limit and only return top X contacts', function(done) {
       return request(
         {
           method: 'GET',

+ 2 - 2
services/contacts/test/unit/js/ContactsManagerTests.js

@@ -92,7 +92,7 @@ describe('ContactManager', function() {
       })
 
       return it('should call the callback with an error', function() {
-        return this.callback.calledWith(new Error()).should.equal(true)
+        return this.callback.calledWith(sinon.match(Error)).should.equal(true)
       })
     })
   })
@@ -136,7 +136,7 @@ describe('ContactManager', function() {
       })
 
       return it('should call the callback with an error', function() {
-        return this.callback.calledWith(new Error()).should.equal(true)
+        return this.callback.calledWith(sinon.match(Error)).should.equal(true)
       })
     })
   })

Некоторые файлы не были показаны из-за большого количества измененных файлов