From c6720f0bf5ff3b28876d5f98eb09d1e83dbed39c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 25 Aug 2017 21:02:09 +0200 Subject: [PATCH] Upgrade sequelize --- package.json | 6 +- yarn.lock | 178 ++++++++++++++++++--------------------------------- 2 files changed, 66 insertions(+), 118 deletions(-) diff --git a/package.json b/package.json index 571d3e076..2a1b0bde3 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "cors": "^2.8.1", "create-torrent": "^3.24.5", "express": "^4.12.4", - "express-oauth-server": "2.0.0-b1", + "express-oauth-server": "^2.0.0", "express-validator": "^3.1.0", "fluent-ffmpeg": "^2.1.0", "js-yaml": "^3.5.4", @@ -70,14 +70,14 @@ "openssl-wrapper": "^0.3.4", "parse-torrent": "^5.8.0", "password-generator": "^2.0.2", - "pg": "^6.1.0", + "pg": "^6.4.2", "pg-hstore": "^2.3.2", "request": "^2.81.0", "request-replay": "^1.0.2", "rimraf": "^2.5.4", "safe-buffer": "^5.0.1", "scripty": "^1.5.0", - "sequelize": "4.0.0-2", + "sequelize": "^4.7.5", "ts-node": "^3.0.6", "typescript": "^2.4.1", "validator": "^8.1.0", diff --git a/yarn.lock b/yarn.lock index ca5f27392..c0f35b21d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -90,6 +90,10 @@ version "8.0.25" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.25.tgz#66ecaf4df93f5281b48427ee96fbcdfc4f0cdce1" +"@types/node@^6.0.48": + version "6.0.88" + resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66" + "@types/request@^2.0.3": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.3.tgz#bdf0fba9488c822f77e97de3dd8fe357b2fb8c06" @@ -98,8 +102,8 @@ "@types/node" "*" "@types/sequelize@^4.0.55": - version "4.0.71" - resolved "https://registry.yarnpkg.com/@types/sequelize/-/sequelize-4.0.71.tgz#61521e0fb167b1107ff21b8e207a6c90b8bbae71" + version "4.0.72" + resolved "https://registry.yarnpkg.com/@types/sequelize/-/sequelize-4.0.72.tgz#ba7f5b6588cf059f3eb7ebf2f1e0a2b6c6f04d3d" dependencies: "@types/bluebird" "*" "@types/lodash" "*" @@ -198,10 +202,6 @@ ansi-styles@^3.1.0: dependencies: color-convert "^1.9.0" -any-promise@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - anymatch@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" @@ -333,7 +333,7 @@ balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" -basic-auth@^1.0.0, basic-auth@~1.1.0: +basic-auth@1.1.0, basic-auth@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-1.1.0.tgz#45221ee429f7ee1e5035be3f51533f1cdfd29884" @@ -458,14 +458,14 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^2.10.0, bluebird@^2.9.13: - version "2.11.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" - -bluebird@^3.0.5, bluebird@^3.4.0, bluebird@^3.4.6, bluebird@^3.5.0: +bluebird@3.5.0, bluebird@^3.0.5, bluebird@^3.4.0, bluebird@^3.4.6, bluebird@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" +bluebird@^2.10.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" + bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -559,13 +559,6 @@ callsites@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" -camel-case@^1.1.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-1.2.2.tgz#1aca7c4d195359a2ce9955793433c6e5542511f2" - dependencies: - sentence-case "^1.1.1" - upper-case "^1.1.1" - caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -877,6 +870,12 @@ debug@2.6.8, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2. dependencies: ms "2.0.0" +debug@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64" + dependencies: + ms "2.0.0" + decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -983,9 +982,9 @@ doctrine@^2.0.0: esutils "^2.0.2" isarray "^1.0.0" -dottie@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/dottie/-/dottie-1.1.1.tgz#45c2a3f48bd6528eeed267a69a848eaaca6faa6a" +dottie@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.0.tgz#da191981c8b8d713ca0115d5898cf397c2f0ddd0" duplexer@~0.1.1: version "0.1.1" @@ -1045,8 +1044,8 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.29" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.29.tgz#768eb2dfc4957bcf35fa0568f193ab71ede53fd8" + version "0.10.30" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939" dependencies: es6-iterator "2" es6-symbol "~3.1" @@ -1302,14 +1301,13 @@ expand-template@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.0.tgz#e09efba977bf98f9ee0ed25abd0c692e02aec3fc" -express-oauth-server@2.0.0-b1: - version "2.0.0-b1" - resolved "https://registry.yarnpkg.com/express-oauth-server/-/express-oauth-server-2.0.0-b1.tgz#1a3dffa32f1bfce04a88a49320e2fe8b13f77192" +express-oauth-server@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/express-oauth-server/-/express-oauth-server-2.0.0.tgz#57b08665c1201532f52c4c02f19709238b99a48d" dependencies: bluebird "^3.0.5" express "^4.13.3" - oauth2-server next - thenify "^3.0.0" + oauth2-server "3.0.0" express-validator@^3.1.0: version "3.2.1" @@ -1578,14 +1576,14 @@ generate-object-property@^1.1.0: dependencies: is-property "^1.0.0" -generic-pool@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz#886bc5bf0beb7db96e81bcbba078818de5a62683" - generic-pool@2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff" +generic-pool@^3.1.6: + version "3.1.7" + resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.1.7.tgz#dac22b2c7a7a04e41732f7d8d2d25a303c88f662" + get-browser-rtc@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz#bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9" @@ -1780,9 +1778,9 @@ infinity-agent@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/infinity-agent/-/infinity-agent-2.0.3.tgz#45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216" -inflection@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.10.0.tgz#5bffcb1197ad3e81050f8e17e21668087ee9eb2f" +inflection@1.12.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" inflight@^1.0.4: version "1.0.6" @@ -2243,22 +2241,10 @@ lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" -lodash@4.15.0: - version "4.15.0" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.15.0.tgz#3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9" - -lodash@^3.3.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" - -lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.16.0, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.8.2: +lodash@4.17.4, lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.16.0, lodash@^4.17.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.8.2: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" -lower-case@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" - lowercase-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" @@ -2497,10 +2483,6 @@ node-pre-gyp@0.6.36, node-pre-gyp@^0.6.36: tar "^2.2.1" tar-pack "^3.4.0" -node-uuid@~1.4.4: - version "1.4.8" - resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" - nodemon@^1.11.0: version "1.11.0" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.11.0.tgz#226c562bd2a7b13d3d7518b49ad4828a3623d06c" @@ -2556,18 +2538,16 @@ oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -oauth2-server@next: - version "3.0.0-b3.1" - resolved "https://registry.yarnpkg.com/oauth2-server/-/oauth2-server-3.0.0-b3.1.tgz#0e60832bb04146bd3170e081e09e641b2ef4163e" +oauth2-server@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/oauth2-server/-/oauth2-server-3.0.0.tgz#c46276b74c3d28634d59ee981f76b58a6459cc28" dependencies: - basic-auth "^1.0.0" - bluebird "^2.9.13" - camel-case "^1.1.1" - lodash "^3.3.1" + basic-auth "1.1.0" + bluebird "3.5.0" + lodash "4.17.4" promisify-any "2.0.1" - standard-http-error "^1.1.0" - type-is "^1.6.0" - validator.js "^1.1.1" + statuses "1.3.1" + type-is "1.6.15" object-assign@4.1.0: version "4.1.0" @@ -2793,7 +2773,7 @@ pg-types@1.*: postgres-date "~1.0.0" postgres-interval "^1.1.0" -pg@^6.1.0: +pg@^6.4.2: version "6.4.2" resolved "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz#c364011060eac7a507a2ae063eb857ece910e27f" dependencies: @@ -3263,33 +3243,27 @@ send@0.15.4: range-parser "~1.2.0" statuses "~1.3.1" -sentence-case@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-1.1.3.tgz#8034aafc2145772d3abe1509aa42c9e1042dc139" - dependencies: - lower-case "^1.1.1" - -sequelize@4.0.0-2: - version "4.0.0-2" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.0.0-2.tgz#8143f50fa00ac62ba95394f4c81bd97e7c3600d5" +sequelize@^4.7.5: + version "4.7.5" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.7.5.tgz#a0b81b04206a46919db82cc5f2967c0ab379da62" dependencies: bluebird "^3.4.6" cls-bluebird "^2.0.1" - debug "^2.2.0" + debug "^3.0.0" depd "^1.1.0" - dottie "^1.0.0" - generic-pool "2.4.2" - inflection "1.10.0" - lodash "4.15.0" + dottie "^2.0.0" + generic-pool "^3.1.6" + inflection "1.12.0" + lodash "^4.17.1" moment "^2.13.0" moment-timezone "^0.5.4" - node-uuid "~1.4.4" retry-as-promised "^2.0.0" semver "^5.0.1" terraformer-wkt-parser "^1.1.2" toposort-class "^1.0.1" - validator "^5.6.0" - wkx "0.3.0" + uuid "^3.0.0" + validator "^8.0.0" + wkx "^0.4.1" serve-static@1.12.4: version "1.12.4" @@ -3450,16 +3424,6 @@ standard-engine@~7.0.0: minimist "^1.1.0" pkg-conf "^2.0.0" -"standard-error@>= 1.1.0 < 2": - version "1.1.0" - resolved "https://registry.yarnpkg.com/standard-error/-/standard-error-1.1.0.tgz#23e5168fa1c0820189e5812701a79058510d0d34" - -standard-http-error@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/standard-http-error/-/standard-http-error-1.2.0.tgz#10bbd31cd86f023d3013a58208be37e38519fda7" - dependencies: - standard-error ">= 1.1.0 < 2" - standard@^10.0.0: version "10.0.3" resolved "https://registry.yarnpkg.com/standard/-/standard-10.0.3.tgz#7869bcbf422bdeeaab689a1ffb1fea9677dd50ea" @@ -3474,7 +3438,7 @@ standard@^10.0.0: eslint-plugin-standard "~3.0.1" standard-engine "~7.0.0" -"statuses@>= 1.3.1 < 2", statuses@~1.3.1: +statuses@1.3.1, "statuses@>= 1.3.1 < 2", statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" @@ -3692,12 +3656,6 @@ text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" -thenify@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" - dependencies: - any-promise "^1.0.0" - thirty-two@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz#4ca2fffc02a51290d2744b9e3f557693ca6b627a" @@ -3846,7 +3804,7 @@ type-detect@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea" -type-is@^1.6.0, type-is@^1.6.4, type-is@~1.6.15: +type-is@1.6.15, type-is@^1.6.4, type-is@~1.6.15: version "1.6.15" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" dependencies: @@ -3915,10 +3873,6 @@ update-notifier@0.5.0: semver-diff "^2.0.0" string-length "^1.0.0" -upper-case@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" - user-home@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" @@ -3971,15 +3925,7 @@ v8flags@^3.0.0: dependencies: user-home "^1.1.1" -validator.js@^1.1.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/validator.js/-/validator.js-1.2.3.tgz#f8e623f60e53bada54880333649970996a3446e1" - -validator@^5.6.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-5.7.0.tgz#7a87a58146b695ac486071141c0c49d67da05e5c" - -validator@^8.1.0: +validator@^8.0.0, validator@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/validator/-/validator-8.1.0.tgz#89cf6b512ff71eba886afd8d10d47f8dc800eac0" @@ -4082,9 +4028,11 @@ winston@^2.1.1: isstream "0.1.x" stack-trace "0.0.x" -wkx@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.3.0.tgz#4f24948d879aca65e501674469855e04c2ad78dd" +wkx@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.1.tgz#2fc171b5e9cb55c6256fef4bde1f21be413befee" + dependencies: + "@types/node" "^6.0.48" wordwrap@~0.0.2: version "0.0.3" -- 2.25.1