diff --git a/package.json b/package.json index 533d853682d8c8039f8e22b959ba4a17dc8b95ec..6a99975148702a1e4f7173a16bd3f1b0f95fdd8f 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,10 @@ "access": "public" }, "dependencies": { - "@pubsweet/base-model": "^4.0.3", - "@pubsweet/errors": "^2.0.39", - "@pubsweet/logger": "^0.2.49", - "@pubsweet/models": "^0.3.14", + "@pubsweet/base-model": "^4.0.8", + "@pubsweet/errors": "^2.0.44", + "@pubsweet/logger": "^0.2.54", + "@pubsweet/models": "^0.3.19", "apollo-server-express": "^2.11.0", "body-parser": "^1.19.0", "config": "^3.3.2", @@ -41,8 +41,8 @@ "morgan": "^1.10.0", "node-cron": "^2.0.3", "passport": "^0.4.1", - "pubsweet": "^5.1.18", - "pubsweet-server": "^13.12.2", + "pubsweet": "^5.1.23", + "pubsweet-server": "^13.12.3", "waait": "^1.0.5" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 12fcbcf1261477556685bcec700102fa6b7a7599..6ec3f4f6402f5040addd9dc71758072716c7821d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -403,41 +403,26 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= -"@pubsweet/base-model@^4.0.3": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@pubsweet/base-model/-/base-model-4.0.3.tgz#6ace26d3900eae8e87488c4adf1388a56967f083" - integrity sha512-g+Sqk6fGf2AqPNOFvEqU9uXgAGPEzaXi+DmDfMUEm52DXSdKYDjMmja+aoqDzJ7l28UdiIPIyYuqxNRF+2X3HQ== +"@pubsweet/base-model@^4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@pubsweet/base-model/-/base-model-4.0.8.tgz#22c35c8a95055ab37d89a2d64c56bacd1d89ec9f" + integrity sha512-2o07BnYibcu5YghVdGrLq3p9cECHbD2PPxD7wziZdGlbP2mcSwaAQ2yVe/3onvhYVBPgCpDuG+itBosPKGXUwQ== dependencies: - "@pubsweet/db-manager" "^3.1.14" - "@pubsweet/errors" "^2.0.39" - "@pubsweet/logger" "^0.2.49" + "@pubsweet/db-manager" "^3.1.19" + "@pubsweet/errors" "^2.0.44" + "@pubsweet/logger" "^0.2.54" knex "^0.21.1" lodash "^4.17.11" objection "^2.1.6" uuid "^7.0.3" -"@pubsweet/db-manager@^3.1.14": - version "3.1.14" - resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-3.1.14.tgz#a6c1cf53a606f2a08accb8882d2f887385533ff4" - integrity sha512-W9WBxkGkULRLSuOpUe06KeWFISpvVHacIVpCyxmB02Rd5IlT46B2DcdY5g0N/D0Gru+KHN/69XFjlWoPZ9YGYA== - dependencies: - "@hapi/joi" "^14.3.0" - "@pubsweet/logger" "^0.2.49" - fs-extra "^8.1.0" - knex "^0.21.1" - lodash "^4.17.11" - objection "^2.1.3" - pg "^7.8.0" - tmp-promise "^2.0.0" - umzug "^2.1.0" - -"@pubsweet/db-manager@^3.1.18": - version "3.1.18" - resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-3.1.18.tgz#8086a970c5f58452d5358b6c7f8b0f2b30cf339f" - integrity sha512-oYV2z++c9qdcKSp1Ye+w1yqVOOF2rg/kHJx9/LUESKqA0GvRF8dMbHT4rDW3w+8s+3UKlnxl1hE3w3n0kCf/9w== +"@pubsweet/db-manager@^3.1.19": + version "3.1.19" + resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-3.1.19.tgz#0f54eea9640d66e2467d5211b8841f1b91dc107c" + integrity sha512-TVAAGdt3Z+VbJ/TumolKW70+yIjgy6zHbw58QQMoNDhYhdHan2NqTksbs8/ARIWj26GG+KMwXlrx8pmkPs82pA== dependencies: "@hapi/joi" "^14.3.0" - "@pubsweet/logger" "^0.2.53" + "@pubsweet/logger" "^0.2.54" fs-extra "^8.1.0" knex "^0.21.1" lodash "^4.17.11" @@ -446,49 +431,27 @@ tmp-promise "^2.0.0" umzug "^2.1.0" -"@pubsweet/errors@^2.0.39": - version "2.0.39" - resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.39.tgz#e593880d15cd1fc985ea864a9ecb8c383ddb5240" - integrity sha512-CXpWAuAXCiJhc3Sp28j7iEsqrAVbgohXFV30MRCLeI3UMg2c2LDhBgKEhRDGIeR7M0hZFt/iFkhsxXybxcbHMQ== +"@pubsweet/errors@^2.0.44": + version "2.0.44" + resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.44.tgz#0270e4bc19702e79f5583f6161577a87536c57a1" + integrity sha512-GyiVLy2DZ7Sn6/47OjjtOgIhxWYqWWZdJAvB8TbHdtJejO0zqWouDPqLFb52Yyhb6Jq1FJLZUo9Sg+zb26oitA== dependencies: http-status-codes "^1.3.0" -"@pubsweet/errors@^2.0.43": - version "2.0.43" - resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.43.tgz#884f8bbb41e72eef78e53ab74c04fd9bb27c36d4" - integrity sha512-XSwM00c+0cjFQJQZAmgVJu+2yIKJbrXgTxojrXeX43TnmvlL4SoHvfgjg6UfsJb82R1akqpb9OrjimN23DOoTw== - dependencies: - http-status-codes "^1.3.0" - -"@pubsweet/logger@^0.2.49": - version "0.2.49" - resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.49.tgz#88f368683ef038e078b8a4bb7d76d63bf5f7e8ab" - integrity sha512-/V1PjZwBfOkhK/ZQYb8LvjZH6Q38wFGcsT3+A7I6DJP3MsCPN+WgOm3ebdQYumgWcatZrhRVATWQzhLYsAfS2Q== +"@pubsweet/logger@^0.2.54": + version "0.2.54" + resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.54.tgz#fff6da0fcb97f834d1d9220ff1df4e90fc5799c0" + integrity sha512-jVAgv0/6B0mmK1RSIpaMS+v/EwFcVUXifCKVZkNph8UjpGAyWeFrI0+GakssIT9fZ/yCKHoGoPdh1n7A5gVQqA== dependencies: "@hapi/joi" "^14.5.0" config "^3.0.1" -"@pubsweet/logger@^0.2.53": - version "0.2.53" - resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.53.tgz#b82961663d3ce79cbbcc052128952b4dcf337cb2" - integrity sha512-bSz8dsgK9QtcRf0hApwzs32bYlJQuD1NrDOZacrdpJ2pDu1WXcibuOVuhLCUw5rJJahrhlIxjHn/9S5YzpK5UA== - dependencies: - "@hapi/joi" "^14.5.0" - config "^3.0.1" - -"@pubsweet/models@^0.3.14": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@pubsweet/models/-/models-0.3.14.tgz#2dbd935893e55a800e2a757443390e245efc78e7" - integrity sha512-mZz4vGuo7LcdL7iyxVTyKnZDvx2pyr8dQFJ9rrIs4QcOJ3oE5GTCjrgGW+sfP0Px6lHrmYQEIpnBlhgneEj2Pw== - dependencies: - "@pubsweet/logger" "^0.2.49" - -"@pubsweet/models@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@pubsweet/models/-/models-0.3.18.tgz#084879f69becca0e8b49035b13492abaeadac521" - integrity sha512-1ea+LNZ+Lu5WeakEQpQeJnBM3R8GLhieIEhfAx+C+w8TS0k3ciycIFu8U0NKCn8RoOsFtiGZ+MRozDNEayoChw== +"@pubsweet/models@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@pubsweet/models/-/models-0.3.19.tgz#c3a1ca7ccc4676ad9583914502648367a0c9c612" + integrity sha512-I3PjWCoVAms36mqDCwyaO1dmhvTEZSZT54/Nuo7on4QJ1V800FX+Q73t/VduIhjACjmvt6op6lsFzoloIjp/mw== dependencies: - "@pubsweet/logger" "^0.2.53" + "@pubsweet/logger" "^0.2.54" "@types/accepts@*", "@types/accepts@^1.3.5": version "1.3.5" @@ -1501,7 +1464,7 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" -bluebird@^3.5.2, bluebird@^3.5.5, bluebird@^3.7.2: +bluebird@^3.5.5, bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -6653,15 +6616,6 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -pg-boss@^3.1.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/pg-boss/-/pg-boss-3.2.2.tgz#2aa18c3f1015c557737a124bcfcbcf4a8e346d7b" - integrity sha512-UL/F7coW1gtXNb/WzwqQ3Bv1wMsSH2oSpeAB9zCJ4RHZXZ0f6JNDMcUZPeXIyZdEIq3GjcqwYtJy4F/Z45pufQ== - dependencies: - bluebird "^3.5.2" - pg "^7.12.0" - uuid "^3.2.1" - pg-boss@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/pg-boss/-/pg-boss-5.2.0.tgz#b58bfe4be62076af66724a88ebb48bc5571e4fb6" @@ -6729,7 +6683,7 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@^7.12.0, pg@^7.4.1, pg@^7.8.0: +pg@^7.4.1, pg@^7.8.0: version "7.18.2" resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.2.tgz#4e219f05a00aff4db6aab1ba02f28ffa4513b0bb" integrity sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA== @@ -6957,52 +6911,15 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" -pubsweet-server@^13.11.5: - version "13.11.5" - resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-13.11.5.tgz#caa69f7f779dec78dae842fbd2008da723935f6d" - integrity sha512-9bBE3dJAyxJHLSAyBXSoV1a5uPnkH1ieGAqEM3AlXJJgSmxBaI4m/mp8p3SnbURkKno8RSIfYdH3RKpq6hyBqw== +pubsweet-server@^13.12.3: + version "13.12.3" + resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-13.12.3.tgz#f5fade9667000d2be8bc448f15b1df9a89fb58b2" + integrity sha512-tl3LemBnFBBo5x/UucwevGDBYb2Jg7mwcYaxQ4tkzVHCoFqC9BB5wx9qGVHM9EwcwhiNMK+vqmzvDClFZrrbvw== dependencies: - "@pubsweet/db-manager" "^3.1.14" - "@pubsweet/errors" "^2.0.39" - "@pubsweet/logger" "^0.2.49" - "@pubsweet/models" "^0.3.14" - apollo-server-express "^2.4.8" - authsome "^0.1.0" - body-parser "^1.15.2" - config "^3.0.1" - cookie-parser "^1.4.3" - dataloader "^1.4.0" - dotenv "^4.0.0" - express "^4.16.1" - fs-extra "^8.1.0" - graphql "^14.2.1" - graphql-postgres-subscriptions "^1.0.4" - helmet "^3.8.1" - http-status-codes "^1.0.6" - jsonwebtoken "^8.4.0" - lodash "^4.0.0" - morgan "^1.8.2" - multer "^1.1.0" - objection "^2.1.3" - passport "^0.4.0" - passport-anonymous "^1.0.1" - passport-http-bearer "^1.0.1" - passport-local "^1.0.0" - pg "^7.4.1" - pg-boss "^3.1.2" - pubsweet-sse "^1.0.43" - subscriptions-transport-ws "^0.9.12" - waait "^1.0.2" - -pubsweet-server@^13.12.2: - version "13.12.2" - resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-13.12.2.tgz#18a05eef8233fe9e33e1cd8c78bfbeeb29dd5ec6" - integrity sha512-vLureOI3IsOXj/pQlilxsArcrsePi73cQ+E/BzAKh3SfkSrn4N4YVYEmcjZK1DppvX5BxGp+c+2+/VjzWpXCew== - dependencies: - "@pubsweet/db-manager" "^3.1.18" - "@pubsweet/errors" "^2.0.43" - "@pubsweet/logger" "^0.2.53" - "@pubsweet/models" "^0.3.18" + "@pubsweet/db-manager" "^3.1.19" + "@pubsweet/errors" "^2.0.44" + "@pubsweet/logger" "^0.2.54" + "@pubsweet/models" "^0.3.19" apollo-server-express "^2.4.8" authsome "^0.1.0" body-parser "^1.15.2" @@ -7027,27 +6944,22 @@ pubsweet-server@^13.12.2: passport-local "^1.0.0" pg "^7.4.1" pg-boss "^5.2.0" - pubsweet-sse "^1.0.47" + pubsweet-sse "^1.0.48" subscriptions-transport-ws "^0.9.12" waait "^1.0.2" -pubsweet-sse@^1.0.43: - version "1.0.43" - resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.43.tgz#f1757171002659de37ce2ddf80cb4b46666795e9" - integrity sha512-G/6COvSf3KtBKX2Ypll3mEL8mbdpPYifqfZjHu5v6Jr+lUu1cJtWZOEIGX+z/Q6KMSY9aVmm4Xc64oGrJGh1ow== - -pubsweet-sse@^1.0.47: - version "1.0.47" - resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.47.tgz#7b44aa1a247f3e211958bd03f29f2fe28ce238e6" - integrity sha512-8NuhL3oF7LQOFUyJJMdpk2wLPVldF26u4JN/a9BCu8YgXjIQyb52hJ6JEAJAC4Uo/SA+7wyIZ0a7j5s+goMxwg== +pubsweet-sse@^1.0.48: + version "1.0.48" + resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.48.tgz#834b0c10f3f5d444691599cc1746877c275d3892" + integrity sha512-9Kut+qefYSU82PQRzdrMBXVS/XDl5lNrzJ1Z98ANVnqsDmNcreFlxZXR32tgo7NRd26Q9KgSibItBtOI11yELQ== -pubsweet@^5.1.18: - version "5.1.18" - resolved "https://registry.yarnpkg.com/pubsweet/-/pubsweet-5.1.18.tgz#04d1f9345fb43cafe8846ee445cb535001142f9c" - integrity sha512-BnaorY6uXiYaR6eSjwHEtYOTfbWT2UH8PNdAyGPCitzVaOUSgmUWj2tV8qAcTye+Y9MzokTevjPnMMlrvcuDlw== +pubsweet@^5.1.23: + version "5.1.23" + resolved "https://registry.yarnpkg.com/pubsweet/-/pubsweet-5.1.23.tgz#e45a4c100007df0d9c68fa337e179d92cce427ed" + integrity sha512-cNQDZnVVO6uSRyp0ng2FvGqlS8hGXQ+DkgIYOYyWNsj0EivoTnEUnQTYs81gC/VevPoabSjvCqN0scUxGbqQcA== dependencies: - "@pubsweet/db-manager" "^3.1.14" - "@pubsweet/logger" "^0.2.49" + "@pubsweet/db-manager" "^3.1.19" + "@pubsweet/logger" "^0.2.54" colors "^1.1.2" commander "^2.20.0" config "^3.0.1" @@ -7058,7 +6970,7 @@ pubsweet@^5.1.18: lodash "^4.17.11" node-dev "^4.0.0" prompt flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87 - pubsweet-server "^13.11.5" + pubsweet-server "^13.12.3" webpack "^4.29.5" webpack-dev-middleware "^3.6.0" webpack-dev-server "^3.9.0" @@ -8570,7 +8482,7 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2: +uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==