bulk upgrade to 1.1.12, moved to npm rather than git

This commit is contained in:
Henry Oswald 2019-01-31 16:44:24 +00:00
parent 37458ef655
commit b38b5989db
8 changed files with 118 additions and 522 deletions

View file

@ -48,8 +48,11 @@ pipeline {
} }
} }
stage('Package and publish build') { stage('Package and docker push') {
steps { steps {
sh 'echo ${BUILD_NUMBER} > build_number.txt'
sh 'touch build.tar.gz' // Avoid tar warning about files changing during read
sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make tar'
withCredentials([file(credentialsId: 'gcr.io_overleaf-ops', variable: 'DOCKER_REPO_KEY_PATH')]) { withCredentials([file(credentialsId: 'gcr.io_overleaf-ops', variable: 'DOCKER_REPO_KEY_PATH')]) {
sh 'docker login -u _json_key --password-stdin https://gcr.io/overleaf-ops < ${DOCKER_REPO_KEY_PATH}' sh 'docker login -u _json_key --password-stdin https://gcr.io/overleaf-ops < ${DOCKER_REPO_KEY_PATH}'
@ -60,9 +63,12 @@ pipeline {
} }
} }
stage('Publish build number') { stage('Publish to s3') {
steps { steps {
sh 'echo ${BRANCH_NAME}-${BUILD_NUMBER} > build_number.txt' sh 'echo ${BRANCH_NAME}-${BUILD_NUMBER} > build_number.txt'
withAWS(credentials:'S3_CI_BUILDS_AWS_KEYS', region:"${S3_REGION_BUILD_ARTEFACTS}") {
s3Upload(file:'build.tar.gz', bucket:"${S3_BUCKET_BUILD_ARTEFACTS}", path:"${JOB_NAME}/${BUILD_NUMBER}.tar.gz")
}
withAWS(credentials:'S3_CI_BUILDS_AWS_KEYS', region:"${S3_REGION_BUILD_ARTEFACTS}") { withAWS(credentials:'S3_CI_BUILDS_AWS_KEYS', region:"${S3_REGION_BUILD_ARTEFACTS}") {
// The deployment process uses this file to figure out the latest build // The deployment process uses this file to figure out the latest build
s3Upload(file:'build_number.txt', bucket:"${S3_BUCKET_BUILD_ARTEFACTS}", path:"${JOB_NAME}/latest") s3Upload(file:'build_number.txt', bucket:"${S3_BUCKET_BUILD_ARTEFACTS}", path:"${JOB_NAME}/latest")

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.10 # Version: 1.1.12
BUILD_NUMBER ?= local BUILD_NUMBER ?= local
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@ -13,7 +13,6 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
MOCHA_GREP=${MOCHA_GREP} \ MOCHA_GREP=${MOCHA_GREP} \
docker-compose ${DOCKER_COMPOSE_FLAGS} docker-compose ${DOCKER_COMPOSE_FLAGS}
clean: clean:
docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
@ -40,6 +39,9 @@ build:
--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
. .
tar:
$(DOCKER_COMPOSE) up tar
publish: publish:
docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)

View file

@ -4,7 +4,7 @@ metrics.initialize("spelling")
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
logger = require 'logger-sharelatex' logger = require 'logger-sharelatex'
logger.initialize("spelling-sharelatex") logger.initialize("spelling")
if Settings.sentry?.dsn? if Settings.sentry?.dsn?
logger.initializeErrorReporting(Settings.sentry.dsn) logger.initializeErrorReporting(Settings.sentry.dsn)
metrics.memory.monitor(logger) metrics.memory.monitor(logger)

View file

@ -1,9 +1,8 @@
--script-version=1.1.10
spelling spelling
--language=coffeescript
--node-version=6.9.5 --node-version=6.9.5
--acceptance-creds=None --acceptance-creds=None
--language=coffeescript
--dependencies=mongo,redis --dependencies=mongo,redis
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--kube=false
--build-target=docker --build-target=docker
--script-version=1.1.12

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.10 # Version: 1.1.12
version: "2" version: "2"
@ -11,6 +11,7 @@ services:
user: node user: node
command: npm run test:unit:_run command: npm run test:unit:_run
test_acceptance: test_acceptance:
build: . build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
@ -26,6 +27,16 @@ services:
user: node user: node
command: npm run test:acceptance:_run command: npm run test:acceptance:_run
tar:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
volumes:
- ./:/tmp/build/
command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
user: root
redis: redis:
image: redis image: 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.10 # Version: 1.1.12
version: "2" version: "2"
@ -33,6 +33,16 @@ services:
- redis - redis
command: npm run test:acceptance command: npm run test:acceptance
tar:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
volumes:
- ./:/tmp/build/
command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
user: root
redis: redis:
image: redis image: redis

View file

@ -47,14 +47,29 @@
"resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz" "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz"
}, },
"@google-cloud/trace-agent": { "@google-cloud/trace-agent": {
"version": "3.5.0", "version": "3.5.2",
"from": "@google-cloud/trace-agent@>=3.2.0 <4.0.0", "from": "@google-cloud/trace-agent@>=3.2.0 <4.0.0",
"resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.5.0.tgz", "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.5.2.tgz",
"dependencies": { "dependencies": {
"@google-cloud/common": { "@google-cloud/common": {
"version": "0.28.0", "version": "0.30.2",
"from": "@google-cloud/common@>=0.28.0 <0.29.0", "from": "@google-cloud/common@>=0.30.0 <0.31.0",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.28.0.tgz" "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.30.2.tgz"
},
"google-auth-library": {
"version": "3.0.1",
"from": "google-auth-library@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.0.1.tgz"
},
"lru-cache": {
"version": "5.1.1",
"from": "lru-cache@^5.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
},
"yallist": {
"version": "3.0.3",
"from": "yallist@^3.0.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"
} }
} }
}, },
@ -113,21 +128,6 @@
"from": "@sindresorhus/is@>=0.13.0 <0.14.0", "from": "@sindresorhus/is@>=0.13.0 <0.14.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.13.0.tgz" "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.13.0.tgz"
}, },
"@sinonjs/commons": {
"version": "1.3.0",
"from": "@sinonjs/commons@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.3.0.tgz"
},
"@sinonjs/formatio": {
"version": "3.1.0",
"from": "@sinonjs/formatio@>=3.1.0 <4.0.0",
"resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.1.0.tgz"
},
"@sinonjs/samsam": {
"version": "3.0.2",
"from": "@sinonjs/samsam@>=3.0.2 <4.0.0",
"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.0.2.tgz"
},
"@types/caseless": { "@types/caseless": {
"version": "0.12.1", "version": "0.12.1",
"from": "@types/caseless@*", "from": "@types/caseless@*",
@ -154,9 +154,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.18", "version": "10.12.20",
"from": "@types/node@*", "from": "@types/node@*",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz" "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.20.tgz"
}, },
"@types/request": { "@types/request": {
"version": "2.48.1", "version": "2.48.1",
@ -169,9 +169,9 @@
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz" "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz"
}, },
"@types/tough-cookie": { "@types/tough-cookie": {
"version": "2.3.4", "version": "2.3.5",
"from": "@types/tough-cookie@*", "from": "@types/tough-cookie@*",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.4.tgz" "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz"
}, },
"abbrev": { "abbrev": {
"version": "1.1.1", "version": "1.1.1",
@ -203,11 +203,6 @@
"from": "ansi-regex@>=2.0.0 <3.0.0", "from": "ansi-regex@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
}, },
"ansi-styles": {
"version": "1.1.0",
"from": "ansi-styles@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
},
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
"from": "aproba@>=1.0.3 <2.0.0", "from": "aproba@>=1.0.3 <2.0.0",
@ -218,33 +213,11 @@
"from": "are-we-there-yet@>=1.1.2 <1.2.0", "from": "are-we-there-yet@>=1.1.2 <1.2.0",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz" "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"
}, },
"argparse": {
"version": "0.1.16",
"from": "argparse@>=0.1.11 <0.2.0",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
"dependencies": {
"underscore": {
"version": "1.7.0",
"from": "underscore@>=1.7.0 <1.8.0",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
},
"underscore.string": {
"version": "2.4.0",
"from": "underscore.string@>=2.4.0 <2.5.0",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
}
}
},
"array-flatten": { "array-flatten": {
"version": "1.1.1", "version": "1.1.1",
"from": "array-flatten@1.1.1", "from": "array-flatten@1.1.1",
"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"
}, },
"array-from": {
"version": "2.1.1",
"from": "array-from@>=2.1.1 <3.0.0",
"resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"
},
"arrify": { "arrify": {
"version": "1.0.1", "version": "1.0.1",
"from": "arrify@>=1.0.1 <2.0.0", "from": "arrify@>=1.0.1 <2.0.0",
@ -300,6 +273,11 @@
"from": "balanced-match@>=1.0.0 <2.0.0", "from": "balanced-match@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
}, },
"base64-js": {
"version": "1.3.0",
"from": "base64-js@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"
},
"bcrypt-pbkdf": { "bcrypt-pbkdf": {
"version": "1.0.2", "version": "1.0.2",
"from": "bcrypt-pbkdf@>=1.0.0 <2.0.0", "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
@ -311,9 +289,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.3.1", "version": "1.4.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.3.1.tgz" "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.4.0.tgz"
}, },
"bintrees": { "bintrees": {
"version": "1.0.1", "version": "1.0.1",
@ -387,26 +365,9 @@
"from": "chai@latest", "from": "chai@latest",
"resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz" "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"
}, },
"chalk": {
"version": "0.5.1",
"from": "chalk@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
"dependencies": {
"ansi-regex": {
"version": "0.2.1",
"from": "ansi-regex@^0.2.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
},
"strip-ansi": {
"version": "0.3.0",
"from": "strip-ansi@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"
}
}
},
"check-error": { "check-error": {
"version": "1.0.2", "version": "1.0.2",
"from": "check-error@>=1.0.2 <2.0.0", "from": "check-error@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz" "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"
}, },
"co": { "co": {
@ -424,11 +385,6 @@
"from": "coffee-script@>=1.9.1 <2.0.0", "from": "coffee-script@>=1.9.1 <2.0.0",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz" "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"
}, },
"colors": {
"version": "0.6.2",
"from": "colors@>=0.6.2 <0.7.0",
"resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
},
"combined-stream": { "combined-stream": {
"version": "1.0.7", "version": "1.0.7",
"from": "combined-stream@>=1.0.6 <1.1.0", "from": "combined-stream@>=1.0.6 <1.1.0",
@ -495,11 +451,6 @@
"from": "dashdash@>=1.12.0 <2.0.0", "from": "dashdash@>=1.12.0 <2.0.0",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"
}, },
"dateformat": {
"version": "1.0.2-1.2.3",
"from": "dateformat@1.0.2-1.2.3",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"
},
"debug": { "debug": {
"version": "2.6.9", "version": "2.6.9",
"from": "debug@2.6.9", "from": "debug@2.6.9",
@ -628,28 +579,14 @@
"escape-string-regexp": { "escape-string-regexp": {
"version": "1.0.5", "version": "1.0.5",
"from": "escape-string-regexp@>=1.0.0 <2.0.0", "from": "escape-string-regexp@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
}, "dev": true
"esprima": {
"version": "1.0.4",
"from": "esprima@>=1.0.2 <1.1.0",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
}, },
"etag": { "etag": {
"version": "1.8.1", "version": "1.8.1",
"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"
}, },
"eventemitter2": {
"version": "0.4.14",
"from": "eventemitter2@>=0.4.13 <0.5.0",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
},
"exit": {
"version": "0.1.2",
"from": "exit@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.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",
@ -682,6 +619,16 @@
"from": "fast-json-stable-stringify@>=2.0.0 <3.0.0", "from": "fast-json-stable-stringify@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz" "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"
}, },
"fast-text-encoding": {
"version": "1.0.0",
"from": "fast-text-encoding@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz"
},
"file-uri-to-path": {
"version": "1.0.0",
"from": "file-uri-to-path@1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
},
"finalhandler": { "finalhandler": {
"version": "1.1.1", "version": "1.1.1",
"from": "finalhandler@1.1.1", "from": "finalhandler@1.1.1",
@ -699,37 +646,10 @@
"from": "findit2@>=2.2.3 <3.0.0", "from": "findit2@>=2.2.3 <3.0.0",
"resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz" "resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz"
}, },
"findup-sync": {
"version": "0.1.3",
"from": "findup-sync@>=0.1.2 <0.2.0",
"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
"dependencies": {
"glob": {
"version": "3.2.11",
"from": "glob@>=3.2.9 <3.3.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"
},
"lodash": {
"version": "2.4.2",
"from": "lodash@>=2.4.1 <2.5.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
},
"lru-cache": {
"version": "2.7.3",
"from": "lru-cache@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
},
"minimatch": {
"version": "0.3.0",
"from": "minimatch@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
}
}
},
"follow-redirects": { "follow-redirects": {
"version": "1.6.0", "version": "1.6.1",
"from": "follow-redirects@>=1.3.0 <2.0.0", "from": "follow-redirects@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.0.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
"dependencies": { "dependencies": {
"debug": { "debug": {
"version": "3.1.0", "version": "3.1.0",
@ -764,18 +684,6 @@
"from": "fresh@0.5.2", "from": "fresh@0.5.2",
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
}, },
"fs-extra": {
"version": "0.9.1",
"from": "fs-extra@>=0.9.1 <0.10.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.9.1.tgz",
"dependencies": {
"ncp": {
"version": "0.5.1",
"from": "ncp@>=0.5.1 <0.6.0",
"resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz"
}
}
},
"fs.realpath": { "fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"from": "fs.realpath@>=1.0.0 <2.0.0", "from": "fs.realpath@>=1.0.0 <2.0.0",
@ -797,9 +705,9 @@
"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.0.4", "version": "1.2.7",
"from": "gaxios@>=1.0.2 <2.0.0", "from": "gaxios@>=1.0.4 <2.0.0",
"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.0.4.tgz" "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.2.7.tgz"
}, },
"gcp-metadata": { "gcp-metadata": {
"version": "0.9.3", "version": "0.9.3",
@ -811,11 +719,6 @@
"from": "get-func-name@>=2.0.0 <3.0.0", "from": "get-func-name@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz" "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"
}, },
"getobject": {
"version": "0.1.0",
"from": "getobject@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
},
"getpass": { "getpass": {
"version": "0.1.7", "version": "0.1.7",
"from": "getpass@>=0.1.1 <0.2.0", "from": "getpass@>=0.1.1 <0.2.0",
@ -864,214 +767,15 @@
"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
"dev": true "dev": true
}, },
"grunt": {
"version": "0.4.5",
"from": "grunt@>=0.4.5 <0.5.0",
"resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
"dependencies": {
"coffee-script": {
"version": "1.3.3",
"from": "coffee-script@>=1.3.3 <1.4.0",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
},
"glob": {
"version": "3.1.21",
"from": "glob@>=3.1.21 <3.2.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"
},
"graceful-fs": {
"version": "1.2.3",
"from": "graceful-fs@>=1.2.0 <1.3.0",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
},
"iconv-lite": {
"version": "0.2.11",
"from": "iconv-lite@>=0.2.11 <0.3.0",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
},
"inherits": {
"version": "1.0.2",
"from": "inherits@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
},
"lru-cache": {
"version": "2.7.3",
"from": "lru-cache@2",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
},
"minimatch": {
"version": "0.2.14",
"from": "minimatch@>=0.2.12 <0.3.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
},
"nopt": {
"version": "1.0.10",
"from": "nopt@>=1.0.10 <1.1.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
},
"rimraf": {
"version": "2.2.8",
"from": "rimraf@>=2.2.8 <2.3.0",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
},
"grunt-bunyan": {
"version": "0.5.0",
"from": "grunt-bunyan@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/grunt-bunyan/-/grunt-bunyan-0.5.0.tgz",
"dependencies": {
"lodash": {
"version": "2.4.2",
"from": "lodash@>=2.4.1 <2.5.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
}
}
},
"grunt-contrib-clean": {
"version": "0.6.0",
"from": "grunt-contrib-clean@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-0.6.0.tgz",
"dependencies": {
"rimraf": {
"version": "2.2.8",
"from": "rimraf@~2.2.1",
"resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
},
"grunt-contrib-coffee": {
"version": "0.11.1",
"from": "grunt-contrib-coffee@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.11.1.tgz",
"dependencies": {
"coffee-script": {
"version": "1.7.1",
"from": "coffee-script@>=1.7.0 <1.8.0",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz"
},
"lodash": {
"version": "2.4.2",
"from": "lodash@>=2.4.1 <2.5.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
},
"mkdirp": {
"version": "0.3.5",
"from": "mkdirp@>=0.3.5 <0.4.0",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
}
}
},
"grunt-execute": {
"version": "0.2.2",
"from": "grunt-execute@>=0.2.2 <0.3.0",
"resolved": "https://registry.npmjs.org/grunt-execute/-/grunt-execute-0.2.2.tgz"
},
"grunt-legacy-log": {
"version": "0.1.3",
"from": "grunt-legacy-log@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz",
"dependencies": {
"lodash": {
"version": "2.4.2",
"from": "lodash@>=2.4.1 <2.5.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
},
"underscore.string": {
"version": "2.3.3",
"from": "underscore.string@>=2.3.3 <2.4.0",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
}
}
},
"grunt-legacy-log-utils": {
"version": "0.1.1",
"from": "grunt-legacy-log-utils@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz",
"dependencies": {
"lodash": {
"version": "2.4.2",
"from": "lodash@>=2.4.1 <2.5.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
},
"underscore.string": {
"version": "2.3.3",
"from": "underscore.string@>=2.3.3 <2.4.0",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
}
}
},
"grunt-legacy-util": {
"version": "0.2.0",
"from": "grunt-legacy-util@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"
},
"grunt-mocha-test": {
"version": "0.11.0",
"from": "grunt-mocha-test@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.11.0.tgz",
"dependencies": {
"commander": {
"version": "2.0.0",
"from": "commander@2.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"
},
"diff": {
"version": "1.0.7",
"from": "diff@1.0.7",
"resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz"
},
"glob": {
"version": "3.2.3",
"from": "glob@3.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz"
},
"graceful-fs": {
"version": "2.0.3",
"from": "graceful-fs@>=2.0.0 <2.1.0",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
},
"growl": {
"version": "1.7.0",
"from": "growl@>=1.7.0 <1.8.0",
"resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz"
},
"lru-cache": {
"version": "2.7.3",
"from": "lru-cache@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
},
"minimatch": {
"version": "0.2.14",
"from": "minimatch@>=0.2.11 <0.3.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
},
"mkdirp": {
"version": "0.3.5",
"from": "mkdirp@0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"mocha": {
"version": "1.20.1",
"from": "mocha@>=1.20.0 <1.21.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz"
}
}
},
"gtoken": { "gtoken": {
"version": "2.3.0", "version": "2.3.2",
"from": "gtoken@>=2.3.0 <3.0.0", "from": "gtoken@>=2.3.0 <3.0.0",
"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.2.tgz",
"dependencies": { "dependencies": {
"mime": { "mime": {
"version": "2.4.0", "version": "2.4.0",
"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.0.tgz"
},
"pify": {
"version": "3.0.0",
"from": "pify@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
} }
} }
}, },
@ -1085,18 +789,6 @@
"from": "har-validator@>=5.1.0 <5.2.0", "from": "har-validator@>=5.1.0 <5.2.0",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz" "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"
}, },
"has-ansi": {
"version": "0.1.0",
"from": "has-ansi@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
"dependencies": {
"ansi-regex": {
"version": "0.2.1",
"from": "ansi-regex@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
}
}
},
"has-flag": { "has-flag": {
"version": "2.0.0", "version": "2.0.0",
"from": "has-flag@>=2.0.0 <3.0.0", "from": "has-flag@>=2.0.0 <3.0.0",
@ -1110,7 +802,7 @@
}, },
"hawk": { "hawk": {
"version": "3.1.3", "version": "3.1.3",
"from": "hawk@3.1.3", "from": "hawk@>=3.1.3 <3.2.0",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz" "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
}, },
"he": { "he": {
@ -1120,20 +812,15 @@
"dev": true "dev": true
}, },
"hex2dec": { "hex2dec": {
"version": "1.1.1", "version": "1.1.2",
"from": "hex2dec@>=1.0.1 <2.0.0", "from": "hex2dec@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/hex2dec/-/hex2dec-1.1.1.tgz" "resolved": "https://registry.npmjs.org/hex2dec/-/hex2dec-1.1.2.tgz"
}, },
"hoek": { "hoek": {
"version": "2.16.3", "version": "2.16.3",
"from": "hoek@>=2.0.0 <3.0.0", "from": "hoek@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
}, },
"hooker": {
"version": "0.2.3",
"from": "hooker@>=0.2.3 <0.3.0",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
},
"http-errors": { "http-errors": {
"version": "1.6.3", "version": "1.6.3",
"from": "http-errors@>=1.6.3 <1.7.0", "from": "http-errors@>=1.6.3 <1.7.0",
@ -1216,28 +903,6 @@
"from": "isstream@>=0.1.2 <0.2.0", "from": "isstream@>=0.1.2 <0.2.0",
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
}, },
"jade": {
"version": "0.26.3",
"from": "jade@0.26.3",
"resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
"dependencies": {
"commander": {
"version": "0.6.1",
"from": "commander@0.6.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"
},
"mkdirp": {
"version": "0.3.0",
"from": "mkdirp@0.3.0",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
}
}
},
"js-yaml": {
"version": "2.0.5",
"from": "js-yaml@>=2.0.5 <2.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz"
},
"jsbn": { "jsbn": {
"version": "0.1.1", "version": "0.1.1",
"from": "jsbn@>=0.1.0 <0.2.0", "from": "jsbn@>=0.1.0 <0.2.0",
@ -1268,11 +933,6 @@
"from": "json-stringify-safe@>=5.0.1 <5.1.0", "from": "json-stringify-safe@>=5.0.1 <5.1.0",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
}, },
"jsonfile": {
"version": "1.1.1",
"from": "jsonfile@>=1.1.0 <1.2.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz"
},
"jsonify": { "jsonify": {
"version": "0.0.0", "version": "0.0.0",
"from": "jsonify@>=0.0.0 <0.1.0", "from": "jsonify@>=0.0.0 <0.1.0",
@ -1283,30 +943,15 @@
"from": "jsprim@>=1.2.2 <2.0.0", "from": "jsprim@>=1.2.2 <2.0.0",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz" "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"
}, },
"just-extend": {
"version": "4.0.2",
"from": "just-extend@>=4.0.2 <5.0.0",
"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz"
},
"jwa": { "jwa": {
"version": "1.1.6", "version": "1.2.0",
"from": "jwa@>=1.1.5 <2.0.0", "from": "jwa@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz" "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"
}, },
"jws": { "jws": {
"version": "3.1.5", "version": "3.2.1",
"from": "jws@>=3.1.5 <4.0.0", "from": "jws@>=3.1.5 <4.0.0",
"resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz" "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz"
},
"lodash": {
"version": "0.9.2",
"from": "lodash@>=0.9.2 <0.10.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
},
"lodash.get": {
"version": "4.4.2",
"from": "lodash.get@>=4.4.2 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"
}, },
"lodash.pickby": { "lodash.pickby": {
"version": "4.6.0", "version": "4.6.0",
@ -1314,9 +959,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.5.9", "version": "1.6.0",
"from": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9", "from": "logger-sharelatex@1.6.0",
"resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#e8e1b95052f62e107336053e4a983f81cdbdf589", "resolved": "https://registry.npmjs.org/logger-sharelatex/-/logger-sharelatex-1.6.0.tgz",
"dependencies": { "dependencies": {
"bunyan": { "bunyan": {
"version": "1.5.1", "version": "1.5.1",
@ -1328,36 +973,11 @@
"from": "coffee-script@1.12.4", "from": "coffee-script@1.12.4",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz" "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"
}, },
"diff": {
"version": "3.5.0",
"from": "diff@>=3.5.0 <4.0.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"
},
"dtrace-provider": { "dtrace-provider": {
"version": "0.6.0", "version": "0.6.0",
"from": "dtrace-provider@>=0.6.0 <0.7.0", "from": "dtrace-provider@>=0.6.0 <0.7.0",
"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz", "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz",
"optional": true "optional": true
},
"has-flag": {
"version": "3.0.0",
"from": "has-flag@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
},
"lolex": {
"version": "3.0.0",
"from": "lolex@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-3.0.0.tgz"
},
"sinon": {
"version": "7.2.2",
"from": "sinon@latest",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-7.2.2.tgz"
},
"supports-color": {
"version": "5.5.0",
"from": "supports-color@>=5.5.0 <6.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
} }
} }
}, },
@ -1399,7 +1019,7 @@
}, },
"mersenne": { "mersenne": {
"version": "0.0.4", "version": "0.0.4",
"from": "mersenne@*", "from": "mersenne@>=0.0.3 <0.1.0",
"resolved": "https://registry.npmjs.org/mersenne/-/mersenne-0.0.4.tgz" "resolved": "https://registry.npmjs.org/mersenne/-/mersenne-0.0.4.tgz"
}, },
"methods": { "methods": {
@ -1408,18 +1028,18 @@
"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.0.12", "version": "2.1.1",
"from": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12", "from": "metrics-sharelatex@2.1.1",
"resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#3ac1621ef049e2f2d88a83b3a41011333d609662", "resolved": "https://registry.npmjs.org/metrics-sharelatex/-/metrics-sharelatex-2.1.1.tgz",
"dependencies": { "dependencies": {
"coffee-script": { "coffee-script": {
"version": "1.6.0", "version": "1.6.0",
"from": "coffee-script@1.6.0", "from": "coffee-script@https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz" "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz"
}, },
"underscore": { "underscore": {
"version": "1.6.0", "version": "1.6.0",
"from": "underscore@>=1.6.0 <1.7.0", "from": "underscore@https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
} }
} }
@ -1441,7 +1061,7 @@
}, },
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"from": "minimatch@>=3.0.4 <4.0.0", "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
}, },
"minimist": { "minimist": {
@ -1555,28 +1175,6 @@
"from": "negotiator@0.6.1", "from": "negotiator@0.6.1",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz" "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"
}, },
"nise": {
"version": "1.4.8",
"from": "nise@>=1.4.7 <2.0.0",
"resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz",
"dependencies": {
"isarray": {
"version": "0.0.1",
"from": "isarray@0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
},
"lolex": {
"version": "2.7.5",
"from": "lolex@>=2.3.2 <3.0.0",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz"
},
"path-to-regexp": {
"version": "1.7.0",
"from": "path-to-regexp@>=1.7.0 <2.0.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"
}
}
},
"node-fetch": { "node-fetch": {
"version": "2.3.0", "version": "2.3.0",
"from": "node-fetch@>=2.2.0 <3.0.0", "from": "node-fetch@>=2.2.0 <3.0.0",
@ -1696,7 +1294,7 @@
}, },
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"from": "once@>=1.3.2 <2.0.0", "from": "once@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz" "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
}, },
"os-homedir": { "os-homedir": {
@ -1761,7 +1359,7 @@
}, },
"pathval": { "pathval": {
"version": "1.1.0", "version": "1.1.0",
"from": "pathval@>=1.1.0 <2.0.0", "from": "pathval@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz" "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"
}, },
"performance-now": { "performance-now": {
@ -1896,9 +1494,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.9.0", "version": "1.10.0",
"from": "resolve@>=1.5.0 <2.0.0", "from": "resolve@>=1.5.0 <2.0.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz" "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"
}, },
"resolve-from": { "resolve-from": {
"version": "2.0.0", "version": "2.0.0",
@ -1981,8 +1579,8 @@
}, },
"settings-sharelatex": { "settings-sharelatex": {
"version": "1.1.0", "version": "1.1.0",
"from": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0", "from": "settings-sharelatex@1.1.0",
"resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#93f63d029b52fef8825c3a401b2b6a7ba29b4750", "resolved": "https://registry.npmjs.org/settings-sharelatex/-/settings-sharelatex-1.1.0.tgz",
"dependencies": { "dependencies": {
"coffee-script": { "coffee-script": {
"version": "1.6.0", "version": "1.6.0",
@ -1992,14 +1590,9 @@
} }
}, },
"shimmer": { "shimmer": {
"version": "1.2.0", "version": "1.2.1",
"from": "shimmer@>=1.2.0 <2.0.0", "from": "shimmer@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.0.tgz" "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz"
},
"sigmund": {
"version": "1.0.1",
"from": "sigmund@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
}, },
"signal-exit": { "signal-exit": {
"version": "3.0.2", "version": "3.0.2",
@ -2077,11 +1670,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"
}, },
"supports-color": {
"version": "0.2.0",
"from": "supports-color@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
},
"symbol-observable": { "symbol-observable": {
"version": "1.2.0", "version": "1.2.0",
"from": "symbol-observable@>=1.2.0 <2.0.0", "from": "symbol-observable@>=1.2.0 <2.0.0",
@ -2107,11 +1695,6 @@
"from": "teeny-request@>=3.11.1 <4.0.0", "from": "teeny-request@>=3.11.1 <4.0.0",
"resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz" "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz"
}, },
"text-encoding": {
"version": "0.6.4",
"from": "text-encoding@>=0.6.4 <0.7.0",
"resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"
},
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",
"from": "through@>=2.0.0 <3.0.0", "from": "through@>=2.0.0 <3.0.0",
@ -2127,11 +1710,6 @@
"from": "thunky@>=0.1.0 <0.2.0", "from": "thunky@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz" "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz"
}, },
"timekeeper": {
"version": "1.0.0",
"from": "timekeeper@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/timekeeper/-/timekeeper-1.0.0.tgz"
},
"to-mongodb-core": { "to-mongodb-core": {
"version": "2.0.0", "version": "2.0.0",
"from": "to-mongodb-core@>=2.0.0 <3.0.0", "from": "to-mongodb-core@>=2.0.0 <3.0.0",
@ -2179,11 +1757,6 @@
"from": "underscore@1.4.4", "from": "underscore@1.4.4",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz" "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
}, },
"underscore.string": {
"version": "2.2.1",
"from": "underscore.string@>=2.2.1 <2.3.0",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
},
"unpipe": { "unpipe": {
"version": "1.0.0", "version": "1.0.0",
"from": "unpipe@1.0.0", "from": "unpipe@1.0.0",
@ -2230,11 +1803,6 @@
"from": "verror@1.10.0", "from": "verror@1.10.0",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz" "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"
}, },
"which": {
"version": "1.0.9",
"from": "which@>=1.0.5 <1.1.0",
"resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz"
},
"wide-align": { "wide-align": {
"version": "1.1.3", "version": "1.1.3",
"from": "wide-align@>=1.1.0 <2.0.0", "from": "wide-align@>=1.1.0 <2.0.0",

View file

@ -25,14 +25,14 @@
"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": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9", "logger-sharelatex": "^1.6.0",
"lru-cache": "^4.0.0", "lru-cache": "^4.0.0",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12", "metrics-sharelatex": "^2.1.1",
"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",
"request": "^2.53.0", "request": "^2.53.0",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0", "settings-sharelatex": "^1.1.0",
"underscore": "1.4.4", "underscore": "1.4.4",
"v8-profiler": "^5.2.4" "v8-profiler": "^5.2.4"
}, },