mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Merge pull request #18 from overleaf/msm-update-dependencies
Update dependencies
This commit is contained in:
Miguel Serrano
GitHub
commit
4ab49ec6c5
13 changed files with 3000 additions and 1379 deletions
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ const logger = require('logger-sharelatex')
|
|||
logger.initialize('notifications-sharelatex')
|
||||
const express = require('express')
|
||||
const app = express()
|
||||
const methodOverride = require('method-override')
|
||||
const bodyParser = require('body-parser')
|
||||
const errorHandler = require('errorhandler')
|
||||
const controller = require('./app/js/NotificationsController')
|
||||
const mongojs = require('mongojs')
|
||||
const db = mongojs(Settings.mongo.url, ['notifications'])
|
||||
|
|
@ -21,12 +24,10 @@ metrics.memory.monitor(logger)
|
|||
|
||||
const HealthCheckController = require('./app/js/HealthCheckController')
|
||||
|
||||
app.configure(function() {
|
||||
app.use(express.methodOverride())
|
||||
app.use(express.bodyParser())
|
||||
app.use(metrics.http.monitor(logger))
|
||||
return app.use(express.errorHandler())
|
||||
})
|
||||
app.use(methodOverride())
|
||||
app.use(bodyParser())
|
||||
app.use(metrics.http.monitor(logger))
|
||||
app.use(errorHandler())
|
||||
|
||||
metrics.injectMetricsRoute(app)
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ module.exports = Notifications = {
|
|||
}
|
||||
return db.notifications.update(
|
||||
{ user_id: doc.user_id, key: notification.key },
|
||||
doc,
|
||||
{ $set : { ...doc } },
|
||||
{ upsert: true },
|
||||
callback
|
||||
)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ module.exports = {
|
|||
notifications
|
||||
) {
|
||||
if (err != null) {
|
||||
return res.send(500)
|
||||
return res.sendStatus(500)
|
||||
} else {
|
||||
return res.send()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
notifications
|
||||
--public-repo=True
|
||||
--language=es
|
||||
--env-add=
|
||||
--node-version=10.19.0
|
||||
--acceptance-creds=None
|
||||
--dependencies=mongo
|
||||
--docker-repos=gcr.io/overleaf-ops
|
||||
--env-add=
|
||||
--env-pass-through=
|
||||
--script-version=1.3.5
|
||||
--language=es
|
||||
--node-version=10.19.0
|
||||
--public-repo=True
|
||||
--script-version=2.0.0
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
4293
services/notifications/package-lock.json
generated
4293
services/notifications/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -11,46 +11,49 @@
|
|||
"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"
|
||||
},
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"async": "^0.1.22",
|
||||
"coffee-script": "^1.7.1",
|
||||
"express": "3.1.0",
|
||||
"logger-sharelatex": "^1.7.0",
|
||||
"metrics-sharelatex": "^2.2.0",
|
||||
"mongojs": "^2.4.0",
|
||||
"node-statsd": "0.0.3",
|
||||
"request": "^2.65.0",
|
||||
"async": "^2.6.3",
|
||||
"body-parser": "^1.19.0",
|
||||
"coffee-script": "^1.12.7",
|
||||
"errorhandler": "^1.5.1",
|
||||
"express": "4.17.1",
|
||||
"logger-sharelatex": "^1.9.1",
|
||||
"method-override": "^3.0.0",
|
||||
"metrics-sharelatex": "^2.6.2",
|
||||
"mongojs": "^3.1.0",
|
||||
"node-statsd": "0.1.1",
|
||||
"request": "^2.88.2",
|
||||
"settings-sharelatex": "^1.1.0",
|
||||
"underscore": "1.4.4"
|
||||
"underscore": "1.9.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-eslint": "^10.0.3",
|
||||
"bunyan": "^1.0.0",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"bunyan": "^1.8.12",
|
||||
"chai": "^4.2.0",
|
||||
"eslint": "^6.6.0",
|
||||
"eslint-config-prettier": "^6.9.0",
|
||||
"eslint-config-standard": "^14.1.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.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.17.0",
|
||||
"eslint-plugin-react": "^7.19.0",
|
||||
"eslint-plugin-standard": "^4.0.1",
|
||||
"mocha": "^4.1.0",
|
||||
"prettier": "^1.19.1",
|
||||
"mocha": "^7.1.1",
|
||||
"prettier": "^2.0.2",
|
||||
"prettier-eslint-cli": "^5.0.0",
|
||||
"sandboxed-module": "^2.0.3",
|
||||
"sinon": "^6.3.5"
|
||||
"sinon": "^9.0.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ describe('Notifications Tests', function() {
|
|||
sinon.assert.calledWith(
|
||||
this.updateStub,
|
||||
this.expectedQuery,
|
||||
this.expectedDocument,
|
||||
{ $set: this.expectedDocument },
|
||||
{ upsert: true }
|
||||
)
|
||||
return done()
|
||||
|
|
@ -154,7 +154,7 @@ describe('Notifications Tests', function() {
|
|||
sinon.assert.calledWith(
|
||||
this.updateStub,
|
||||
this.expectedQuery,
|
||||
this.expectedDocument,
|
||||
{ $set: this.expectedDocument },
|
||||
{ upsert: true }
|
||||
)
|
||||
return done()
|
||||
|
|
@ -194,7 +194,7 @@ describe('Notifications Tests', function() {
|
|||
sinon.assert.calledWith(
|
||||
this.updateStub,
|
||||
this.expectedQuery,
|
||||
this.expectedDocument,
|
||||
{ $set: this.expectedDocument },
|
||||
{ upsert: true }
|
||||
)
|
||||
return done()
|
||||
|
|
|
|||
Loading…
Reference in a new issue