From a9030536c07f2afccb52626f89e620bd83cfba14 Mon Sep 17 00:00:00 2001 From: Naz Date: Mon, 11 Apr 2022 17:19:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20false=20positive=20f?= =?UTF-8?q?atal=20error=20for=20{{tiers}}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes https://github.com/TryGhost/Ghost/issues/14452 - When {{tiers}} helper was used with parameters in a Ghost theme, for example statement like this: `{{tiers prefix="Access with:"}}`, the theme did not pass the gscan check and threw a false positive fatal error. {{tiers}} is fully valid and documented helper that should work in current version of Ghost --- package.json | 2 +- yarn.lock | 90 ++++++---------------------------------------------- 2 files changed, 10 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index 5c901f02d1..484ce666eb 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "ghost-storage-base": "1.0.0", "glob": "7.2.0", "got": "9.6.0", - "gscan": "4.26.1", + "gscan": "4.27.0", "html-to-text": "5.1.1", "image-size": "1.0.1", "intl": "1.2.5", diff --git a/yarn.lock b/yarn.lock index a761b681b3..929fccaa2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1441,17 +1441,6 @@ component-type "^1.2.1" join-component "^1.1.0" -"@sentry/core@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.3.tgz#88268afc8c42716c455ad77bb4bed2bbf96abd83" - integrity sha512-RcGmYdkrE3VYBMl9Hgv4GKsC8FEVUdWYsfGIcT/btwP2YpBeUaTZl+1vV9r3Ncdl125LqzP5CKSj5otVxiEg6g== - dependencies: - "@sentry/hub" "6.19.3" - "@sentry/minimal" "6.19.3" - "@sentry/types" "6.19.3" - "@sentry/utils" "6.19.3" - tslib "^1.9.3" - "@sentry/core@6.19.6": version "6.19.6" resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.6.tgz#7d4649d0148b5d0be1358ab02e2f869bf7363e9a" @@ -1463,15 +1452,6 @@ "@sentry/utils" "6.19.6" tslib "^1.9.3" -"@sentry/hub@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.3.tgz#d555c83404f19ac9b68f336b051b8e7a9d75feb0" - integrity sha512-iYbkrxEZt6CrHP3U3r54MARVZSs3YHjAMUMOTlC16s/Amz1McwV95XtI3NJaqMhwzl7R5vbGrs3xOtLg1V1Uyw== - dependencies: - "@sentry/types" "6.19.3" - "@sentry/utils" "6.19.3" - tslib "^1.9.3" - "@sentry/hub@6.19.6": version "6.19.6" resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.6.tgz#ada83ceca0827c49534edfaba018221bc1eb75e1" @@ -1481,15 +1461,6 @@ "@sentry/utils" "6.19.6" tslib "^1.9.3" -"@sentry/minimal@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.3.tgz#b9b7f0d7f0cd2341b243318668ac01458f9d7889" - integrity sha512-xy/6ThHK8B2NJT98nWrx6V9eVgUbzq2N/8lv5/QqrKsICjxx22TRC8Q6zPg/o7BYcrY5vpugSEbIeErTnyxHDA== - dependencies: - "@sentry/hub" "6.19.3" - "@sentry/types" "6.19.3" - tslib "^1.9.3" - "@sentry/minimal@6.19.6": version "6.19.6" resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.6.tgz#b6cced3708e25d322039e68ebdf8fadfa445bf7d" @@ -1499,20 +1470,6 @@ "@sentry/types" "6.19.6" tslib "^1.9.3" -"@sentry/node@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.19.3.tgz#afcf106bf72acc0e4bbacbc54744de8a938cbd1c" - integrity sha512-eHreMMbaK4mMAQ45Ki2xJ6in02l66hL6xhltppy/h4m297JIvjaQAFpbQf5XLtO7W4KjdbSV5qnB45D1aOAzFA== - dependencies: - "@sentry/core" "6.19.3" - "@sentry/hub" "6.19.3" - "@sentry/types" "6.19.3" - "@sentry/utils" "6.19.3" - cookie "^0.4.1" - https-proxy-agent "^5.0.0" - lru_map "^0.3.3" - tslib "^1.9.3" - "@sentry/node@6.19.6": version "6.19.6" resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.19.6.tgz#d63c4ffcf0150b4175a2e4e5021b53af46e5946f" @@ -1527,24 +1484,11 @@ lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/types@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.3.tgz#94b19da68d4d23561efb1014f72968bcea85cd0c" - integrity sha512-jHhqxp8MIWSfOc3krorirTGKTEaSFO6XrAvi+2AZhr6gvOChwOgzgrN2ZqesJcZmgCsqWV21u3usSwYeRrjOJA== - "@sentry/types@6.19.6": version "6.19.6" resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.6.tgz#70513f9dca05d23d7ab9c2a6cb08d4db6763ca67" integrity sha512-QH34LMJidEUPZK78l+Frt3AaVFJhEmIi05Zf8WHd9/iTt+OqvCHBgq49DDr1FWFqyYWm/QgW/3bIoikFpfsXyQ== -"@sentry/utils@6.19.3": - version "6.19.3" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.3.tgz#0c3a3f0b86c12e3b079e56e37a44e62a1226043d" - integrity sha512-GdC9B/FK7qd0zItY43135bYbhuVSawE18bIrQDNuno8gTpDJ5OgShpTN9zR53AmMh16/lwKNnV3ZZjlpKcxuNw== - dependencies: - "@sentry/types" "6.19.3" - tslib "^1.9.3" - "@sentry/utils@6.19.6": version "6.19.6" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.6.tgz#2ddc9ef036c3847084c43d0e5a55e4646bdf9021" @@ -1873,15 +1817,6 @@ utils-copy-error "^1.0.1" uuid "^8.3.2" -"@tryghost/errors@1.2.7": - version "1.2.7" - resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.7.tgz#f2da9deadb6139167a9e967e1212a66064c5abce" - integrity sha512-VNqUKiiy4jSOQGBxcwNYMPzf76m1VZ1rnF2gvqwzGIyjrzIGfTs/iNC98n9F6JKROFuOhWS8Ehiuk69/ZAukWg== - dependencies: - lodash "^4.17.21" - utils-copy-error "^1.0.1" - uuid "^8.3.2" - "@tryghost/errors@^1.0.0", "@tryghost/errors@^1.1.0", "@tryghost/errors@^1.1.1", "@tryghost/errors@^1.2.1", "@tryghost/errors@^1.2.3", "@tryghost/errors@^1.2.5": version "1.2.8" resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.8.tgz#b4ba1c31831216222be332ee7a37d9c4a376ac2a" @@ -2033,7 +1968,7 @@ lodash "^4.17.21" luxon "^1.26.0" -"@tryghost/logging@2.1.2", "@tryghost/logging@2.1.3", "@tryghost/logging@2.1.5", "@tryghost/logging@^2.0.0", "@tryghost/logging@^2.0.1", "@tryghost/logging@^2.0.5": +"@tryghost/logging@2.1.3", "@tryghost/logging@2.1.5", "@tryghost/logging@^2.0.0", "@tryghost/logging@^2.0.1", "@tryghost/logging@^2.0.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.1.5.tgz#d945d219bea89b197b9631ec28834a687170a13f" integrity sha512-Pj0H2resXLVahzXcJBaQytWc7MRVxjTNUn89emCj8JfN8AsXi49tSorppXDcmIpsePLB1laggaUAHhaArXPWXw== @@ -6329,16 +6264,16 @@ grunt@1.4.1: nopt "~3.0.6" rimraf "~3.0.2" -gscan@4.26.1: - version "4.26.1" - resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.26.1.tgz#7dd45b8c2e7e9bfccb5f1e3d4293cabf779046ed" - integrity sha512-55KOr0g3EzdKhbRhw3sCIBALP1wKgdUJqwWhgwUx4mmDnMddmAqSttErqKiRfuL33Yfx1dFGVx/r6dRb7ZMKog== +gscan@4.27.0: + version "4.27.0" + resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.27.0.tgz#53599242cef15574363d7f07791f0dac63133512" + integrity sha512-SJSfKpFlzrTUBvcLYhTxZLEA+7Hke5MtVAqiwz+F0+XlAEY07ZSZq41+vjUQSZhh5nF9/86ex+JpCocbZ15OgQ== dependencies: - "@sentry/node" "6.19.3" + "@sentry/node" "6.19.6" "@tryghost/config" "0.2.2" "@tryghost/debug" "0.1.11" - "@tryghost/errors" "1.2.7" - "@tryghost/logging" "2.1.2" + "@tryghost/errors" "1.2.10" + "@tryghost/logging" "2.1.5" "@tryghost/pretty-cli" "1.2.24" "@tryghost/server" "0.1.4" "@tryghost/zip" "1.1.22" @@ -6353,7 +6288,7 @@ gscan@4.26.1: multer "1.4.4" pluralize "8.0.0" require-dir "1.2.0" - semver "7.3.5" + semver "7.3.6" uuid "8.3.2" validator "13.0.0" @@ -10869,13 +10804,6 @@ secure-keys@^1.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - semver@7.3.6, semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.6: version "7.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b" From 10248f71e6fe595327bc7ab4084733ea7a7ba495 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Mon, 11 Apr 2022 12:16:38 +0100 Subject: [PATCH 2/3] Updated Admin to v4.43.1 --- core/client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/client b/core/client index 7fda97a0d4..3a7049948f 160000 --- a/core/client +++ b/core/client @@ -1 +1 @@ -Subproject commit 7fda97a0d4b9233119d745a6a7e9d3fcb9c26f7c +Subproject commit 3a7049948ff007b1731131476d3322420786d582 From c082a9c333e2cd550399706ccf0da45da969668e Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Mon, 11 Apr 2022 12:16:38 +0100 Subject: [PATCH 3/3] v4.43.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 484ce666eb..84ea26900d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghost", - "version": "4.43.0", + "version": "4.43.1", "description": "The professional publishing platform", "author": "Ghost Foundation", "homepage": "https://ghost.org",