Merge branch 'master' into unstable

This commit is contained in:
Chris Troutner
2019-06-08 18:29:47 -07:00
2 changed files with 12 additions and 12 deletions
+9 -9
View File
@@ -4757,9 +4757,9 @@
}
},
"express-rate-limit": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-4.0.3.tgz",
"integrity": "sha512-9+v6DXQdLLd4EqdEkXXM1ctdVNgjw4w8V1WLvlpnIb2SZ5wJ3Kvu8FOMzBPIAX+iO1F24AG640eOOHCv/0GmKg=="
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.0.0.tgz",
"integrity": "sha512-dhT57wqxfqmkOi4HM7NuT4Gd7gbUgSK2ocG27Y6lwm8lbOAw9XQfeANawGq8wLDtlGPO1ZgDj0HmKsykTxfFAg=="
},
"extend": {
"version": "3.0.2",
@@ -13215,9 +13215,9 @@
"dev": true
},
"prettier": {
"version": "1.17.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.17.1.tgz",
"integrity": "sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==",
"version": "1.18.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
"integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==",
"dev": true
},
"prettier-linter-helpers": {
@@ -14737,9 +14737,9 @@
}
},
"slpjs": {
"version": "0.18.2",
"resolved": "https://registry.npmjs.org/slpjs/-/slpjs-0.18.2.tgz",
"integrity": "sha512-11NacOSuZEBL8ntybVFhWQOHPhGaLGdKwYEmBOhSrV8cxB3Z9awDUhPpCvn1wDxBOS3puwGo551GF6LHQGXRZQ==",
"version": "0.18.3",
"resolved": "https://registry.npmjs.org/slpjs/-/slpjs-0.18.3.tgz",
"integrity": "sha512-obQEhcW9rF+dOu+gFEZ7MeBNL5ez6yt54RewOI+2yDJe0Ey+s1T0NETs3ZwZowtiSgbNkXGaDR9oS3zOPqS7kA==",
"requires": {
"@types/lodash": "^4.14.120",
"axios": "^0.18.0",
+3 -3
View File
@@ -31,7 +31,7 @@
"dotenv": "^8.0.0",
"express": "^4.15.5",
"express-basic-auth": "^1.1.3",
"express-rate-limit": "^4.0.3",
"express-rate-limit": "^5.0.0",
"helmet": "^3.12.1",
"level": "^5.0.1",
"mkdirp": "^0.5.1",
@@ -44,7 +44,7 @@
"pg": "^7.11.0",
"pg-hstore": "^2.3.2",
"slp-sdk": "^4.4.0",
"slpjs": "0.18.2",
"slpjs": "0.18.3",
"socket.io": "^2.1.1",
"strftime": "^0.10.0",
"winston": "^3.2.1",
@@ -67,7 +67,7 @@
"node-mocks-http": "^1.7.0",
"nodemon": "^1.18.1",
"nyc": "^14.1.1",
"prettier": "^1.14.2",
"prettier": "^1.18.2",
"proxyquire": "^2.1.0",
"request": "^2.88.0",
"request-promise": "^4.2.2",