From 2d154c12c482145c1a6aeed2622a461e085475af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Sat, 2 May 2020 09:38:27 +0200 Subject: [PATCH] fix: support node 14 by upgrading pg to 8.0.3 --- package.json | 8 ++-- yarn.lock | 107 ++++++++++++++------------------------------------- 2 files changed, 33 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index 54d5b13671..b11afbd685 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "url": "https://github.com/unleash/unleash/issues" }, "engines": { - "node": ">=12 <14" + "node": ">=12" }, "license": "Apache-2.0", "main": "./lib/server-impl.js", @@ -67,8 +67,8 @@ "compression": "^1.7.3", "cookie-parser": "^1.4.4", "cookie-session": "^2.0.0-beta.3", - "db-migrate": "^0.11.6", - "db-migrate-pg": "^1.0.0", + "db-migrate": "^0.11.10", + "db-migrate-pg": "^1.2.1", "db-migrate-shared": "^1.2.0", "deep-diff": "^1.0.2", "deepmerge": "^4.2.2", @@ -82,7 +82,7 @@ "moment": "^2.24.0", "multer": "^1.4.1", "parse-database-url": "^0.3.0", - "pg": "^8.0.0", + "pg": "^8.0.3", "pkginfo": "^0.4.1", "prom-client": "^12.0.0", "response-time": "^2.3.2", diff --git a/yarn.lock b/yarn.lock index 78e9378566..e2027eaf27 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1297,18 +1297,20 @@ date-time@^2.1.0: dependencies: time-zone "^1.0.0" -db-migrate-base@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/db-migrate-base/-/db-migrate-base-2.0.0.tgz#409bf81d679a1974f39cfb87fe20f08bc1cdf4b0" +db-migrate-base@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/db-migrate-base/-/db-migrate-base-2.3.0.tgz#e1539c733caa6de59bb06db6b230a8fd451c081f" + integrity sha512-mxaCkSe7JC2uksvI/rKs+wOQGBSZ6B87xa4b3i+QhB+XRBpGdpMzldKE6INf+EnM6kwhbIPKjyJZgyxui9xBfQ== dependencies: bluebird "^3.1.1" -db-migrate-pg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/db-migrate-pg/-/db-migrate-pg-1.0.0.tgz#a644ed700b0905465e05b497dd321785e7ace183" +db-migrate-pg@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/db-migrate-pg/-/db-migrate-pg-1.2.1.tgz#be6136b93bc1223cb91d09cc16360fe0f0e171eb" + integrity sha512-W093cXrXDYQatVuLpJvuEYuua2mzbK4YH7y5MuvUPrKYhVrEvh2v5DwEmkM7xanXENAggOn9lfzcGaiCy8IosA== dependencies: bluebird "^3.1.1" - db-migrate-base "^2.0.0" + db-migrate-base "^2.3.0" pg "^7.8.0" semver "^5.0.3" @@ -1317,9 +1319,10 @@ db-migrate-shared@^1.2.0: resolved "https://registry.yarnpkg.com/db-migrate-shared/-/db-migrate-shared-1.2.0.tgz#6125be1b3a5e661229fc75d50c85f6c3ffadbede" integrity sha512-65k86bVeHaMxb2L0Gw3y5V+CgZSRwhVQMwDMydmw5MvIpHHwD6SmBciqIwHsZfzJ9yzV/yYhdRefRM6FV5/siw== -db-migrate@^0.11.6: - version "0.11.6" - resolved "https://registry.yarnpkg.com/db-migrate/-/db-migrate-0.11.6.tgz#06fce6bc7f93c4e06ae7b00de33378ac8fc991ee" +db-migrate@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/db-migrate/-/db-migrate-0.11.10.tgz#e0e68efdcd1939b83e4740d58385e3595447cc4f" + integrity sha512-r9+GshZcCXRJ/hBDF0TaSkALggWF92HXu83y5KX06PPuem7+xmUQKVQ3nhGa9jGCYUicxGwrIVuf2gbRQ6Odng== dependencies: balanced-match "^1.0.0" bluebird "^3.1.1" @@ -1329,14 +1332,13 @@ db-migrate@^0.11.6: final-fs "^1.6.0" inflection "^1.10.0" mkdirp "~0.5.0" - optimist "~0.6.1" parse-database-url "~0.3.0" - pkginfo "^0.4.0" prompt "^1.0.0" rc "^1.2.8" resolve "^1.1.6" semver "^5.3.0" tunnel-ssh "^4.0.0" + yargs "^15.3.1" debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" @@ -3585,11 +3587,6 @@ minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= - mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -3883,13 +3880,6 @@ opencollective-postinstall@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" -optimist@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - optionator@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -4016,10 +4006,6 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^5.6.0" -packet-reader@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" - packet-reader@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" @@ -4183,19 +4169,15 @@ pg-int8@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" -pg-packet-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914" - integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg== +pg-pool@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.1.1.tgz#83763aa042ca8e48b0723693b3de3ff076de4ca1" + integrity sha512-kYH6S0mcZF1TPg1F9boFee2JlCSm2oqnlR2Mz2Wgn1psQbEBNVeNTJCw2wCK48QsctwvGUzbxLMg/lYV6hL/3A== -pg-pool@^2.0.4: - version "2.0.6" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.6.tgz#7b561a482feb0a0e599b58b5137fd2db3ad8111c" - -pg-pool@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.0.0.tgz#2330d18888db1c444a67461122b44f83d2c9c231" - integrity sha512-AJWVHFre7CjOtu4D/PQjX+U9uhNKGRFSO9xQAzB7cn1Xu1vmhyo8s8eg9cw6kf2m2/+TYuvMH8i5jeFPSdllPw== +pg-protocol@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.2.2.tgz#e16ef28087aa725ce933af092bfe38d8f609faab" + integrity sha512-r8hGxHOk3ccMjjmhFJ/QOSVW5A+PP84TeRlEwB/cQ9Zu+bvtZg8Z59Cx3AMfVQc9S0Z+EG+HKhicF1W1GN5Eqg== pg-types@^2.1.0: version "2.2.0" @@ -4208,38 +4190,16 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg-types@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.0.0.tgz#038ddc302a0340efcdb46d0581cc7caa2303cbba" - dependencies: - pg-int8 "1.0.1" - postgres-array "~2.0.0" - postgres-bytea "~1.0.0" - postgres-date "~1.0.0" - postgres-interval "^1.1.0" - -pg@^7.8.0: - version "7.8.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.8.0.tgz#541c25b3323d85f67ce7d4501a77470976868ce9" - dependencies: - buffer-writer "2.0.0" - packet-reader "0.3.1" - pg-connection-string "0.1.3" - pg-pool "^2.0.4" - pg-types "~2.0.0" - pgpass "1.x" - semver "4.3.2" - -pg@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.0.0.tgz#6559c6f895b9e735b3079995acb5de3f39ade59f" - integrity sha512-jinx9Xcmkeh7Y7gatu2EJiXr37mcDeF0G5X14MjqPMwYjoZMk7PMMSTTXQQl03GRp2IICxo/zyybqfv2RNgXsg== +pg@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.0.3.tgz#b220ee468a1819e1c7e9ca9878f8ae50ba8e1952" + integrity sha512-fvcNXn4o/iq4jKq15Ix/e58q3jPSmzOp6/8C3CaHoSR/bsxdg+1FXfDRePdtE/zBb3++TytvOrS1hNef3WC/Kg== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "0.1.3" - pg-packet-stream "^1.1.0" - pg-pool "^3.0.0" + pg-pool "^3.1.1" + pg-protocol "^1.2.2" pg-types "^2.1.0" pgpass "1.x" semver "4.3.2" @@ -4292,7 +4252,7 @@ pkginfo@0.3.x: version "0.3.1" resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz#5b29f6a81f70717142e09e765bbeab97b4f81e21" -pkginfo@0.x.x, pkginfo@^0.4.0, pkginfo@^0.4.1: +pkginfo@0.x.x, pkginfo@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff" @@ -4322,10 +4282,6 @@ postgres-bytea@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" -postgres-date@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8" - postgres-date@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz#1c2728d62ef1bff49abdd35c1f86d4bdf118a728" @@ -5732,11 +5688,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= - wrap-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"