Merge pull request #21 from overleaf/sk-dep-upgrades-2019-06

update logger and metrics
This commit is contained in:
Shane Kilkelly 2019-07-01 10:05:19 +01:00 committed by GitHub
commit 1e74d545c4
6 changed files with 201 additions and 167 deletions

View file

@ -1,7 +1,7 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.12 # Version: 1.1.21
BUILD_NUMBER ?= local BUILD_NUMBER ?= local
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@ -26,7 +26,9 @@ test: test_unit test_acceptance
test_unit: test_unit:
@[ ! -d test/unit ] && echo "spelling has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit @[ ! -d test/unit ] && echo "spelling has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit
test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test run test_acceptance: test_clean test_acceptance_pre_run test_acceptance_run
test_acceptance_run:
@[ ! -d test/acceptance ] && echo "spelling has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance @[ ! -d test/acceptance ] && echo "spelling has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance
test_clean: test_clean:

View file

@ -5,4 +5,4 @@ spelling
--dependencies=mongo,redis --dependencies=mongo,redis
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--build-target=docker --build-target=docker
--script-version=1.1.12 --script-version=1.1.21

View file

@ -1,7 +1,7 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.12 # Version: 1.1.21
version: "2" version: "2"
@ -10,6 +10,8 @@ services:
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
user: node user: node
command: npm run test:unit:_run command: npm run test:unit:_run
environment:
NODE_ENV: test
test_acceptance: test_acceptance:
@ -21,6 +23,7 @@ services:
MONGO_HOST: mongo MONGO_HOST: mongo
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP} MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
depends_on: depends_on:
- mongo - mongo
- redis - redis

View file

@ -1,7 +1,7 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.12 # Version: 1.1.21
version: "2" version: "2"
@ -13,6 +13,7 @@ services:
working_dir: /app working_dir: /app
environment: environment:
MOCHA_GREP: ${MOCHA_GREP} MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
command: npm run test:unit command: npm run test:unit
user: node user: node
@ -27,6 +28,8 @@ services:
MONGO_HOST: mongo MONGO_HOST: mongo
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP} MOCHA_GREP: ${MOCHA_GREP}
LOG_LEVEL: ERROR
NODE_ENV: test
user: node user: node
depends_on: depends_on:
- mongo - mongo
@ -49,3 +52,4 @@ services:
mongo: mongo:
image: mongo:3.4 image: mongo:3.4

View file

@ -3,19 +3,24 @@
"version": "0.1.4", "version": "0.1.4",
"dependencies": { "dependencies": {
"@google-cloud/common": { "@google-cloud/common": {
"version": "0.27.0", "version": "0.32.1",
"from": "@google-cloud/common@>=0.27.0 <0.28.0", "from": "@google-cloud/common@>=0.32.0 <0.33.0",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.27.0.tgz" "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.32.1.tgz"
}, },
"@google-cloud/debug-agent": { "@google-cloud/debug-agent": {
"version": "3.0.1", "version": "3.2.0",
"from": "@google-cloud/debug-agent@>=3.0.0 <4.0.0", "from": "@google-cloud/debug-agent@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-3.0.1.tgz", "resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-3.2.0.tgz",
"dependencies": { "dependencies": {
"coffeescript": { "coffeescript": {
"version": "2.3.2", "version": "2.4.1",
"from": "coffeescript@>=2.0.0 <3.0.0", "from": "coffeescript@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.3.2.tgz" "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.4.1.tgz"
},
"semver": {
"version": "6.1.1",
"from": "semver@>=6.0.0 <7.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz"
} }
} }
}, },
@ -29,43 +34,43 @@
"from": "@google-cloud/common@>=0.26.0 <0.27.0", "from": "@google-cloud/common@>=0.26.0 <0.27.0",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.26.2.tgz" "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.26.2.tgz"
}, },
"through2": { "@google-cloud/promisify": {
"version": "3.0.0", "version": "0.3.1",
"from": "through2@>=3.0.0 <4.0.0", "from": "@google-cloud/promisify@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz" "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz"
} },
} "arrify": {
}, "version": "1.0.1",
"@google-cloud/projectify": { "from": "arrify@>=1.0.1 <2.0.0",
"version": "0.3.2", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
"from": "@google-cloud/projectify@>=0.3.2 <0.4.0", },
"resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.2.tgz" "gcp-metadata": {
}, "version": "0.9.3",
"@google-cloud/promisify": { "from": "gcp-metadata@>=0.9.0 <0.10.0",
"version": "0.3.1", "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.9.3.tgz"
"from": "@google-cloud/promisify@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz"
},
"@google-cloud/trace-agent": {
"version": "3.5.2",
"from": "@google-cloud/trace-agent@>=3.2.0 <4.0.0",
"resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.5.2.tgz",
"dependencies": {
"@google-cloud/common": {
"version": "0.30.2",
"from": "@google-cloud/common@>=0.30.0 <0.31.0",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.30.2.tgz"
}, },
"google-auth-library": { "google-auth-library": {
"version": "3.0.1", "version": "2.0.2",
"from": "google-auth-library@>=3.0.0 <4.0.0", "from": "google-auth-library@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.0.1.tgz" "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-2.0.2.tgz",
"dependencies": {
"gcp-metadata": {
"version": "0.7.0",
"from": "gcp-metadata@>=0.7.0 <0.8.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.7.0.tgz"
}
}
}, },
"lru-cache": { "lru-cache": {
"version": "5.1.1", "version": "5.1.1",
"from": "lru-cache@^5.0.0", "from": "lru-cache@^5.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz" "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
}, },
"through2": {
"version": "3.0.1",
"from": "through2@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"
},
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"from": "yallist@^3.0.2", "from": "yallist@^3.0.2",
@ -73,6 +78,28 @@
} }
} }
}, },
"@google-cloud/projectify": {
"version": "0.3.3",
"from": "@google-cloud/projectify@>=0.3.3 <0.4.0",
"resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.3.tgz"
},
"@google-cloud/promisify": {
"version": "0.4.0",
"from": "@google-cloud/promisify@>=0.4.0 <0.5.0",
"resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.4.0.tgz"
},
"@google-cloud/trace-agent": {
"version": "3.6.1",
"from": "@google-cloud/trace-agent@>=3.2.0 <4.0.0",
"resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.6.1.tgz",
"dependencies": {
"semver": {
"version": "6.1.1",
"from": "semver@^6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz"
}
}
},
"@protobufjs/aspromise": { "@protobufjs/aspromise": {
"version": "1.1.2", "version": "1.1.2",
"from": "@protobufjs/aspromise@>=1.1.2 <2.0.0", "from": "@protobufjs/aspromise@>=1.1.2 <2.0.0",
@ -124,14 +151,14 @@
"resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz" "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"
}, },
"@sindresorhus/is": { "@sindresorhus/is": {
"version": "0.13.0", "version": "0.15.0",
"from": "@sindresorhus/is@>=0.13.0 <0.14.0", "from": "@sindresorhus/is@>=0.15.0 <0.16.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.13.0.tgz" "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.15.0.tgz"
}, },
"@types/caseless": { "@types/caseless": {
"version": "0.12.1", "version": "0.12.2",
"from": "@types/caseless@*", "from": "@types/caseless@*",
"resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz" "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"
}, },
"@types/console-log-level": { "@types/console-log-level": {
"version": "1.4.0", "version": "1.4.0",
@ -154,9 +181,9 @@
"resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz" "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz"
}, },
"@types/node": { "@types/node": {
"version": "10.12.20", "version": "12.0.8",
"from": "@types/node@*", "from": "@types/node@*",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.20.tgz" "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.8.tgz"
}, },
"@types/request": { "@types/request": {
"version": "2.48.1", "version": "2.48.1",
@ -178,20 +205,25 @@
"from": "abbrev@>=1.0.0 <2.0.0", "from": "abbrev@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
}, },
"abort-controller": {
"version": "3.0.0",
"from": "abort-controller@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"
},
"accepts": { "accepts": {
"version": "1.3.5", "version": "1.3.5",
"from": "accepts@>=1.3.5 <1.4.0", "from": "accepts@>=1.3.5 <1.4.0",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz" "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"
}, },
"acorn": { "acorn": {
"version": "5.7.3", "version": "6.1.1",
"from": "acorn@>=5.0.3 <6.0.0", "from": "acorn@>=6.0.0 <7.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz" "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"
}, },
"agent-base": { "agent-base": {
"version": "4.2.1", "version": "4.3.0",
"from": "agent-base@>=4.1.0 <5.0.0", "from": "agent-base@>=4.1.0 <5.0.0",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz" "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"
}, },
"ajv": { "ajv": {
"version": "6.6.2", "version": "6.6.2",
@ -219,9 +251,9 @@
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
}, },
"arrify": { "arrify": {
"version": "1.0.1", "version": "2.0.1",
"from": "arrify@>=1.0.1 <2.0.0", "from": "arrify@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz" "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
}, },
"asn1": { "asn1": {
"version": "0.2.4", "version": "0.2.4",
@ -264,9 +296,9 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz" "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"
}, },
"axios": { "axios": {
"version": "0.18.0", "version": "0.18.1",
"from": "axios@>=0.18.0 <0.19.0", "from": "axios@>=0.18.0 <0.19.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz" "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz"
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
@ -289,9 +321,9 @@
"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz" "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"
}, },
"bindings": { "bindings": {
"version": "1.4.0", "version": "1.5.0",
"from": "bindings@>=1.2.1 <2.0.0", "from": "bindings@>=1.2.1 <2.0.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.4.0.tgz" "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"
}, },
"bintrees": { "bintrees": {
"version": "1.0.1", "version": "1.0.1",
@ -340,15 +372,14 @@
"resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
}, },
"builtin-modules": { "builtin-modules": {
"version": "3.0.0", "version": "3.1.0",
"from": "builtin-modules@>=3.0.0 <4.0.0", "from": "builtin-modules@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz" "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz"
}, },
"bunyan": { "bunyan": {
"version": "1.8.12", "version": "1.8.12",
"from": "bunyan@>=1.0.0 <2.0.0", "from": "bunyan@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz", "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"
"dev": true
}, },
"bytes": { "bytes": {
"version": "3.0.0", "version": "3.0.0",
@ -407,9 +438,9 @@
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
}, },
"console-log-level": { "console-log-level": {
"version": "1.4.0", "version": "1.4.1",
"from": "console-log-level@>=1.4.0 <2.0.0", "from": "console-log-level@>=1.4.0 <2.0.0",
"resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.4.0.tgz" "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.4.1.tgz"
}, },
"content-disposition": { "content-disposition": {
"version": "0.5.2", "version": "0.5.2",
@ -467,9 +498,9 @@
"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz" "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"
}, },
"delay": { "delay": {
"version": "4.1.0", "version": "4.3.0",
"from": "delay@>=4.0.1 <5.0.0", "from": "delay@>=4.0.1 <5.0.0",
"resolved": "https://registry.npmjs.org/delay/-/delay-4.1.0.tgz" "resolved": "https://registry.npmjs.org/delay/-/delay-4.3.0.tgz"
}, },
"delayed-stream": { "delayed-stream": {
"version": "1.0.0", "version": "1.0.0",
@ -506,13 +537,12 @@
"version": "0.8.7", "version": "0.8.7",
"from": "dtrace-provider@>=0.8.0 <0.9.0", "from": "dtrace-provider@>=0.8.0 <0.9.0",
"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz", "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz",
"dev": true,
"optional": true "optional": true
}, },
"duplexify": { "duplexify": {
"version": "3.6.1", "version": "3.7.1",
"from": "duplexify@>=3.6.0 <4.0.0", "from": "duplexify@>=3.6.0 <4.0.0",
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz" "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"
}, },
"each-series": { "each-series": {
"version": "1.0.0", "version": "1.0.0",
@ -525,9 +555,9 @@
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz" "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
}, },
"ecdsa-sig-formatter": { "ecdsa-sig-formatter": {
"version": "1.0.10", "version": "1.0.11",
"from": "ecdsa-sig-formatter@1.0.10", "from": "ecdsa-sig-formatter@1.0.11",
"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz" "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
}, },
"ee-first": { "ee-first": {
"version": "1.1.1", "version": "1.1.1",
@ -565,9 +595,9 @@
"resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
"dependencies": { "dependencies": {
"es6-promise": { "es6-promise": {
"version": "4.2.5", "version": "4.2.8",
"from": "es6-promise@>=4.0.3 <5.0.0", "from": "es6-promise@>=4.0.3 <5.0.0",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz" "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"
} }
} }
}, },
@ -587,6 +617,11 @@
"from": "etag@>=1.8.1 <1.9.0", "from": "etag@>=1.8.1 <1.9.0",
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
}, },
"event-target-shim": {
"version": "5.0.1",
"from": "event-target-shim@>=5.0.0 <6.0.0",
"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"
},
"express": { "express": {
"version": "4.16.4", "version": "4.16.4",
"from": "express@>=4.12.1 <5.0.0", "from": "express@>=4.12.1 <5.0.0",
@ -647,9 +682,9 @@
"resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz" "resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz"
}, },
"follow-redirects": { "follow-redirects": {
"version": "1.6.1", "version": "1.5.10",
"from": "follow-redirects@>=1.3.0 <2.0.0", "from": "follow-redirects@1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"dependencies": { "dependencies": {
"debug": { "debug": {
"version": "3.1.0", "version": "3.1.0",
@ -705,14 +740,14 @@
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz" "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"
}, },
"gaxios": { "gaxios": {
"version": "1.2.7", "version": "1.8.4",
"from": "gaxios@>=1.0.4 <2.0.0", "from": "gaxios@>=1.2.1 <2.0.0",
"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.2.7.tgz" "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.8.4.tgz"
}, },
"gcp-metadata": { "gcp-metadata": {
"version": "0.9.3", "version": "1.0.0",
"from": "gcp-metadata@>=0.9.0 <0.10.0", "from": "gcp-metadata@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.9.3.tgz" "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-1.0.0.tgz"
}, },
"get-func-name": { "get-func-name": {
"version": "2.0.0", "version": "2.0.0",
@ -730,15 +765,10 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz" "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"
}, },
"google-auth-library": { "google-auth-library": {
"version": "2.0.2", "version": "3.1.2",
"from": "google-auth-library@>=2.0.0 <3.0.0", "from": "google-auth-library@>=3.1.1 <4.0.0",
"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-2.0.2.tgz", "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.1.2.tgz",
"dependencies": { "dependencies": {
"gcp-metadata": {
"version": "0.7.0",
"from": "gcp-metadata@>=0.7.0 <0.8.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.7.0.tgz"
},
"lru-cache": { "lru-cache": {
"version": "5.1.1", "version": "5.1.1",
"from": "lru-cache@>=5.0.0 <6.0.0", "from": "lru-cache@>=5.0.0 <6.0.0",
@ -752,9 +782,9 @@
} }
}, },
"google-p12-pem": { "google-p12-pem": {
"version": "1.0.3", "version": "1.0.4",
"from": "google-p12-pem@>=1.0.0 <2.0.0", "from": "google-p12-pem@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.3.tgz" "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.4.tgz"
}, },
"graceful-fs": { "graceful-fs": {
"version": "4.1.15", "version": "4.1.15",
@ -768,14 +798,14 @@
"dev": true "dev": true
}, },
"gtoken": { "gtoken": {
"version": "2.3.2", "version": "2.3.3",
"from": "gtoken@>=2.3.0 <3.0.0", "from": "gtoken@>=2.3.2 <3.0.0",
"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.2.tgz", "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.3.tgz",
"dependencies": { "dependencies": {
"mime": { "mime": {
"version": "2.4.0", "version": "2.4.4",
"from": "mime@>=2.2.0 <3.0.0", "from": "mime@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz" "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"
} }
} }
}, },
@ -842,9 +872,9 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz" "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
}, },
"ms": { "ms": {
"version": "2.1.1", "version": "2.1.2",
"from": "ms@>=2.1.1 <3.0.0", "from": "ms@>=2.1.1 <3.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
} }
} }
}, },
@ -879,9 +909,9 @@
"resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz" "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz"
}, },
"is-buffer": { "is-buffer": {
"version": "1.1.6", "version": "2.0.3",
"from": "is-buffer@>=1.1.5 <2.0.0", "from": "is-buffer@>=2.0.2 <3.0.0",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz" "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz"
}, },
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
@ -944,14 +974,14 @@
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz" "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"
}, },
"jwa": { "jwa": {
"version": "1.2.0", "version": "1.4.1",
"from": "jwa@>=1.2.0 <2.0.0", "from": "jwa@>=1.4.1 <2.0.0",
"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz" "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"
}, },
"jws": { "jws": {
"version": "3.2.1", "version": "3.2.2",
"from": "jws@>=3.1.5 <4.0.0", "from": "jws@>=3.1.5 <4.0.0",
"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz" "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"
}, },
"lodash.pickby": { "lodash.pickby": {
"version": "4.6.0", "version": "4.6.0",
@ -959,27 +989,9 @@
"resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz" "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz"
}, },
"logger-sharelatex": { "logger-sharelatex": {
"version": "1.6.0", "version": "1.7.0",
"from": "logger-sharelatex@1.6.0", "from": "logger-sharelatex@1.7.0",
"resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.6.0.tgz", "resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.7.0.tgz"
"dependencies": {
"bunyan": {
"version": "1.5.1",
"from": "bunyan@1.5.1",
"resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"
},
"coffee-script": {
"version": "1.12.4",
"from": "coffee-script@1.12.4",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"
},
"dtrace-provider": {
"version": "0.6.0",
"from": "dtrace-provider@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz",
"optional": true
}
}
}, },
"lolex": { "lolex": {
"version": "1.3.2", "version": "1.3.2",
@ -1028,9 +1040,9 @@
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
}, },
"metrics-sharelatex": { "metrics-sharelatex": {
"version": "2.1.1", "version": "2.2.0",
"from": "metrics-sharelatex@2.1.1", "from": "metrics-sharelatex@2.2.0",
"resolved": "https://registry.npmjs.org/metrics-sharelatex/-/metrics-sharelatex-2.1.1.tgz", "resolved": "https://registry.npmjs.org/metrics-sharelatex/-/metrics-sharelatex-2.2.0.tgz",
"dependencies": { "dependencies": {
"coffee-script": { "coffee-script": {
"version": "1.6.0", "version": "1.6.0",
@ -1109,7 +1121,6 @@
"version": "2.23.0", "version": "2.23.0",
"from": "moment@>=2.10.6 <3.0.0", "from": "moment@>=2.10.6 <3.0.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz",
"dev": true,
"optional": true "optional": true
}, },
"mongodb": { "mongodb": {
@ -1176,14 +1187,14 @@
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz" "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"
}, },
"node-fetch": { "node-fetch": {
"version": "2.3.0", "version": "2.6.0",
"from": "node-fetch@>=2.2.0 <3.0.0", "from": "node-fetch@>=2.3.0 <3.0.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz" "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"
}, },
"node-forge": { "node-forge": {
"version": "0.7.6", "version": "0.8.4",
"from": "node-forge@>=0.7.5 <0.8.0", "from": "node-forge@>=0.8.0 <0.9.0",
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz" "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.4.tgz"
}, },
"node-pre-gyp": { "node-pre-gyp": {
"version": "0.6.39", "version": "0.6.39",
@ -1313,14 +1324,14 @@
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz" "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"
}, },
"p-limit": { "p-limit": {
"version": "2.1.0", "version": "2.2.0",
"from": "p-limit@>=2.0.0 <3.0.0", "from": "p-limit@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz" "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"
}, },
"p-try": { "p-try": {
"version": "2.0.0", "version": "2.2.0",
"from": "p-try@>=2.0.0 <3.0.0", "from": "p-try@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz" "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
}, },
"parse-duration": { "parse-duration": {
"version": "0.1.1", "version": "0.1.1",
@ -1333,9 +1344,9 @@
"resolved": "https://registry.npmjs.org/parse-mongo-url/-/parse-mongo-url-1.1.1.tgz" "resolved": "https://registry.npmjs.org/parse-mongo-url/-/parse-mongo-url-1.1.1.tgz"
}, },
"parse-ms": { "parse-ms": {
"version": "2.0.0", "version": "2.1.0",
"from": "parse-ms@>=2.0.0 <3.0.0", "from": "parse-ms@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.0.0.tgz" "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz"
}, },
"parseurl": { "parseurl": {
"version": "1.3.2", "version": "1.3.2",
@ -1383,14 +1394,21 @@
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
}, },
"prom-client": { "prom-client": {
"version": "11.2.1", "version": "11.5.1",
"from": "prom-client@>=11.1.3 <12.0.0", "from": "prom-client@>=11.1.3 <12.0.0",
"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.2.1.tgz" "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.5.1.tgz"
}, },
"protobufjs": { "protobufjs": {
"version": "6.8.8", "version": "6.8.8",
"from": "protobufjs@>=6.8.6 <6.9.0", "from": "protobufjs@>=6.8.6 <6.9.0",
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz" "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz",
"dependencies": {
"@types/node": {
"version": "10.14.9",
"from": "@types/node@>=10.1.0 <11.0.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.9.tgz"
}
}
}, },
"proxy-addr": { "proxy-addr": {
"version": "2.0.4", "version": "2.0.4",
@ -1423,9 +1441,9 @@
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz" "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"
}, },
"raven": { "raven": {
"version": "1.2.1", "version": "1.1.3",
"from": "raven@>=1.1.3 <2.0.0", "from": "raven@1.1.3",
"resolved": "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz", "resolved": "https://registry.npmjs.org/raven/-/raven-1.1.3.tgz",
"dependencies": { "dependencies": {
"uuid": { "uuid": {
"version": "3.0.0", "version": "3.0.0",
@ -1484,9 +1502,21 @@
"resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz" "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz"
}, },
"require-in-the-middle": { "require-in-the-middle": {
"version": "3.1.0", "version": "4.0.0",
"from": "require-in-the-middle@>=3.0.0 <4.0.0", "from": "require-in-the-middle@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-3.1.0.tgz" "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-4.0.0.tgz",
"dependencies": {
"debug": {
"version": "4.1.1",
"from": "debug@>=4.1.1 <5.0.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"
},
"ms": {
"version": "2.1.2",
"from": "ms@^2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
}
}
}, },
"require-like": { "require-like": {
"version": "0.1.2", "version": "0.1.2",
@ -1494,9 +1524,9 @@
"resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz" "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz"
}, },
"resolve": { "resolve": {
"version": "1.10.0", "version": "1.11.0",
"from": "resolve@>=1.5.0 <2.0.0", "from": "resolve@>=1.10.0 <2.0.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz" "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz"
}, },
"resolve-from": { "resolve-from": {
"version": "2.0.0", "version": "2.0.0",
@ -1670,11 +1700,6 @@
"from": "strip-json-comments@>=2.0.1 <2.1.0", "from": "strip-json-comments@>=2.0.1 <2.1.0",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
}, },
"symbol-observable": {
"version": "1.2.0",
"from": "symbol-observable@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"
},
"tar": { "tar": {
"version": "2.2.1", "version": "2.2.1",
"from": "tar@>=2.2.1 <3.0.0", "from": "tar@>=2.2.1 <3.0.0",

View file

@ -25,9 +25,9 @@
"body-parser": "^1.12.0", "body-parser": "^1.12.0",
"coffee-script": "^1.9.1", "coffee-script": "^1.9.1",
"express": "^4.12.1", "express": "^4.12.1",
"logger-sharelatex": "^1.6.0", "logger-sharelatex": "^1.7.0",
"lru-cache": "^4.0.0", "lru-cache": "^4.0.0",
"metrics-sharelatex": "^2.1.1", "metrics-sharelatex": "^2.2.0",
"mongojs": "2.4.0", "mongojs": "2.4.0",
"node-statsd": "0.0.3", "node-statsd": "0.0.3",
"redis": "~0.8.4", "redis": "~0.8.4",