diff --git a/ghost/core/package.json b/ghost/core/package.json index 1daddb7ec7cc..9be6b40826d0 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -168,7 +168,7 @@ "amperize": "0.6.1", "body-parser": "1.20.3", "bookshelf": "1.2.0", - "bookshelf-relations": "2.7.0", + "bookshelf-relations": "2.8.0", "brute-knex": "4.0.1", "bson-objectid": "2.0.4", "chalk": "4.1.2", diff --git a/yarn.lock b/yarn.lock index 33a5a94011d6..e8fd219c5367 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7634,15 +7634,7 @@ "@tryghost/root-utils" "^0.3.30" debug "^4.3.1" -"@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.26", "@tryghost/debug@^0.1.32", "@tryghost/debug@^0.1.33": - version "0.1.33" - resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.33.tgz#d824ab20d2dffc6ee6c4ec090a79f3804b8acb79" - integrity sha512-aYmfmrXDI974G8ahyT4bPHMthpqiEDXgTXGJ685ZKNB5S2ak/6R0pvhOA6c/QhHihocJG40K2ylzlPqcQq/oWg== - dependencies: - "@tryghost/root-utils" "^0.3.31" - debug "^4.3.1" - -"@tryghost/debug@^0.1.34": +"@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.26", "@tryghost/debug@^0.1.33", "@tryghost/debug@^0.1.34": version "0.1.34" resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.34.tgz#cac7100b092b358e54637ed620dc9cd9ac76355c" integrity sha512-TuTI/BCktv3NY+QhJWrcDBRN6qxgy7zgKHj18MzCZEqPVRXdzYdsd8ldO/Q7jSNgHjf0UHuwDTc5VFuNzCUABA== @@ -7650,16 +7642,7 @@ "@tryghost/root-utils" "^0.3.32" debug "^4.3.1" -"@tryghost/elasticsearch@^3.0.21": - version "3.0.21" - resolved "https://registry.npmjs.org/@tryghost/elasticsearch/-/elasticsearch-3.0.21.tgz#a4acbfccf1577d1f7c9750018cbd30afefa87b3a" - integrity sha512-blSWDB1HCFwhmo5tcDWpOWeMJdFTxTrZpfxU1asKVhARVYuLx5Su5+a8C4x43wewyAhMn9dc9e7qSUHsnUq8XQ== - dependencies: - "@elastic/elasticsearch" "8.13.1" - "@tryghost/debug" "^0.1.32" - split2 "4.2.0" - -"@tryghost/elasticsearch@^3.0.23": +"@tryghost/elasticsearch@^3.0.21", "@tryghost/elasticsearch@^3.0.23": version "3.0.23" resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.23.tgz#45563fdaa8969cd153bacae7b8538b45681d467c" integrity sha512-6j5plnUmdPtOqX8FpwEf5jDWx2MeojvOXhCLViD5DxiOFtG0PSQENNBFpKywHuiabNFTc7rcHkX4PUhOYimBWg== @@ -8009,16 +7992,7 @@ chalk "^4.1.0" sywac "^1.3.0" -"@tryghost/pretty-stream@^0.1.26": - version "0.1.26" - resolved "https://registry.npmjs.org/@tryghost/pretty-stream/-/pretty-stream-0.1.26.tgz#1765f5080c37fa338ddd96003462a1da54e57061" - integrity sha512-Z56lak7dBiK5rgwFd1vYbSpsHi65gLLAZaCq81UMxo8fulvyTiWpdvoY+7Q5XApSi6kf2eivYmeN0zmZa+zdNg== - dependencies: - lodash "^4.17.21" - moment "^2.29.1" - prettyjson "^1.2.5" - -"@tryghost/pretty-stream@^0.1.28": +"@tryghost/pretty-stream@^0.1.26", "@tryghost/pretty-stream@^0.1.28": version "0.1.28" resolved "https://registry.yarnpkg.com/@tryghost/pretty-stream/-/pretty-stream-0.1.28.tgz#2cff88b3a6cb6f1c1b7dd08c27fb9f6351da487e" integrity sha512-iA3Jxw4ltiHKPBZMnvYN3TP26O2RdQBH051BNY+qrSJjx8DhLVverjXlwCC3fxfOTTiPDtx1aMMLlW4RkACtlQ== @@ -8069,15 +8043,7 @@ caller "^1.0.1" find-root "^1.1.0" -"@tryghost/root-utils@^0.3.24", "@tryghost/root-utils@^0.3.30", "@tryghost/root-utils@^0.3.31": - version "0.3.31" - resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.31.tgz#68d17b6813970b9c1b32e4fb5b142fea29dfe6cd" - integrity sha512-6TKu40lh7Gyxwm3jE3nrfT7mZyUb9rN6q8IgeXqhndRV4CSBZLlVgbTgHpdrWo3mSVuMPU+kzoYyMT6yDWrB/A== - dependencies: - caller "^1.0.1" - find-root "^1.1.0" - -"@tryghost/root-utils@^0.3.32": +"@tryghost/root-utils@^0.3.24", "@tryghost/root-utils@^0.3.30", "@tryghost/root-utils@^0.3.32": version "0.3.32" resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.32.tgz#686acf0aa4e1ab4b2578fc0acf9fe552d51f73f1" integrity sha512-fR//LmG+5iapR6sHsh727nD5xu0cLPtEhPpsI8cy/chaBADmJyWMr6ewzq/HenjKxyOH6LIT7Bdmv+kEUvu+Fg== @@ -8117,14 +8083,7 @@ dependencies: lodash.template "^4.5.0" -"@tryghost/tpl@^0.1.32", "@tryghost/tpl@^0.1.33": - version "0.1.33" - resolved "https://registry.yarnpkg.com/@tryghost/tpl/-/tpl-0.1.33.tgz#2512900ffe4635eafea0f41fe3ba2dd6b501b651" - integrity sha512-wkwLw0SvX3Ex+yQP/wl7w4m1PYOddP/jLEcW5xGUEGaYSuPgpHrHPmu9lvxWmK++q/SPiVHqVSV97FFaIb2oNQ== - dependencies: - lodash.template "^4.5.0" - -"@tryghost/tpl@^0.1.34": +"@tryghost/tpl@^0.1.32", "@tryghost/tpl@^0.1.33", "@tryghost/tpl@^0.1.34": version "0.1.34" resolved "https://registry.yarnpkg.com/@tryghost/tpl/-/tpl-0.1.34.tgz#f732577f4d34a44edf9705f4cf9b8d53c46c9239" integrity sha512-zL3vewM8Pai1SVJiGDPBIVj7+4moDKtcDO9qQl2JblQLXfdxKuDmkh/OoJTGny/wVSANaN57/ZtqFmUPslmqrg== @@ -8144,7 +8103,7 @@ remark-footnotes "^1.0.0" unist-util-visit "^2.0.0" -"@tryghost/validator@0.2.14", "@tryghost/validator@^0.2.14": +"@tryghost/validator@0.2.14": version "0.2.14" resolved "https://registry.yarnpkg.com/@tryghost/validator/-/validator-0.2.14.tgz#7aea2725e23125b23fd3d9203bede8f1559e7b54" integrity sha512-sSTzN8ngVyAQyqbMtNPSX+eGrK9XoGntVCk5m3V6/iRA3VB3NaI1tE4RB/8Tg5zNr0q899jEyrqWSKkx2sBCZw== @@ -8155,7 +8114,7 @@ moment-timezone "^0.5.23" validator "7.2.0" -"@tryghost/validator@^0.2.16": +"@tryghost/validator@^0.2.14", "@tryghost/validator@^0.2.16": version "0.2.16" resolved "https://registry.yarnpkg.com/@tryghost/validator/-/validator-0.2.16.tgz#d98fa6e6684fcb3c460646cbd9e18b15964441ee" integrity sha512-CO/sdVdgQh9vQiSenJ64flB2C5nVs/1vb/EnnJtjjPNZvSWt+JvdCihVXyIjmX8pRBEbwVcSK1VKaD4Jwiok4Q== @@ -8166,7 +8125,7 @@ moment-timezone "^0.5.23" validator "7.2.0" -"@tryghost/version@0.1.30", "@tryghost/version@^0.1.30": +"@tryghost/version@0.1.30": version "0.1.30" resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.30.tgz#0f6b0eb5e89edcaf829c9199727b6199977b609b" integrity sha512-WDCVAllBMScplxnyATDgQWHZIrIy/gurK12Tr4pDUtWMujWf/24U/nWZE9dWMrQe1meam5VC4QdqLQWA7eE8UQ== @@ -8174,7 +8133,7 @@ "@tryghost/root-utils" "^0.3.30" semver "^7.3.5" -"@tryghost/version@^0.1.32": +"@tryghost/version@^0.1.30", "@tryghost/version@^0.1.32": version "0.1.32" resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.32.tgz#0118381ab297119a10050ed124883a6ee9dd0c87" integrity sha512-rLYLvSQGDYsqsZ3a8bolZAMh6Hk/uWd9mdDYhyydZZ8hqibdojtRBgJEg68PpuKKEpY429/abZMpK4HId/wzHA== @@ -11310,10 +11269,10 @@ body@^5.1.0: raw-body "~1.1.0" safe-json-parse "~1.0.1" -bookshelf-relations@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/bookshelf-relations/-/bookshelf-relations-2.7.0.tgz#db501a08260059d738ccca9ed4443f486a67782f" - integrity sha512-Ia61t8DfqR7rrF9zZfnfsXj6+bAJsBUk5mAR6hPBcVNcQRIFHruHk6xobQK6AGUx7khCXniDVvNzd82vH6gGVw== +bookshelf-relations@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/bookshelf-relations/-/bookshelf-relations-2.8.0.tgz#f6acc8fd7f82e7cda79801e3a6c9e52fbf6364d5" + integrity sha512-cOywFvCSD5j45X5n8gJ7VHR1e36HXVnG88ppF03imCCkWkaWW0WJUD28FSdIzYs3DBYLv3eyGjqeYRnk0a4JHg== dependencies: "@tryghost/debug" "^0.1.13" "@tryghost/errors" "^1.2.3" @@ -24165,7 +24124,7 @@ moment-timezone@0.5.34, moment-timezone@0.5.45, moment-timezone@^0.5.23, moment- dependencies: moment "^2.29.4" -moment@2.24.0, moment@2.27.0, moment@2.29.1, moment@2.29.3, moment@2.29.4, moment@2.30.1, moment@^2.10.2, moment@^2.18.1, moment@^2.19.3, moment@^2.27.0, moment@^2.29.1, moment@^2.29.4: +moment@2.24.0, moment@2.27.0, moment@2.29.1, moment@2.29.3, moment@2.29.4, moment@2.30.1, moment@^2.10.2, moment@^2.18.1, moment@^2.19.3, moment@^2.27.0, moment@^2.29.4: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==