From 5d60b564af975b9d9f18fe825095219987fd044f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 18 Oct 2021 08:25:58 +0000 Subject: [PATCH 1/4] Fixed double logging library initialization - we have the `@tryghost/logging` library to manage logging across all our code - this package is intended to be a singleton, otherwise we have multiple versions of logging loaded - we sometimes have problems where dependencies also use `@tryghost/logging` but Ghost's yarn.lock is not regenerated to update this - this means we have multiple versions of `@tryghost/logging` running - this commit updates the dependency @tryghost/update-check-service to v0.2.4 to clean up the yarn.lock of multiple versions --- package.json | 2 +- yarn.lock | 31 +++++++------------------------ 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index a39f9f0d6b..2d3afbd0d2 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@tryghost/social-urls": "0.1.26", "@tryghost/string": "0.1.20", "@tryghost/tpl": "0.1.7", - "@tryghost/update-check-service": "0.2.3", + "@tryghost/update-check-service": "0.2.4", "@tryghost/url-utils": "2.0.2", "@tryghost/validator": "0.1.7", "@tryghost/version": "0.1.6", diff --git a/yarn.lock b/yarn.lock index afba731962..f83f375367 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1301,7 +1301,7 @@ resolved "https://registry.yarnpkg.com/@tryghost/domain-events/-/domain-events-0.1.2.tgz#95e88241c3a92675a8b18f9f61aa0a7847dae2ef" integrity sha512-em1SDyYLmkP6AoBnsemZ50muEMsET3WXPOC0fNPMmGWRPmAY22T0gh4dk0ueysHTrbzVO8jH3rqibXamo2g1WA== -"@tryghost/elasticsearch-bunyan@0.1.1", "@tryghost/elasticsearch-bunyan@^0.1.1": +"@tryghost/elasticsearch-bunyan@0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch-bunyan/-/elasticsearch-bunyan-0.1.1.tgz#5a36d81dd020825dd563b1357ae6c249580c46f5" integrity sha512-ILhumzdwJNoRG44S0FkgzZQlkCYioTKWEiY+FFFQpTFWwZ3Jd5a6us5k8tEsd+Wf2rZOvul/ehV45j2c2l1BMw== @@ -1454,7 +1454,7 @@ lodash "^4.17.21" luxon "^1.26.0" -"@tryghost/logging@0.2.2": +"@tryghost/logging@0.2.2", "@tryghost/logging@^0.2.0": version "0.2.2" resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-0.2.2.tgz#b77ff4a203073d5172520379754da7c098bc266d" integrity sha512-phZxz9dWQicLeOnMRxx0yXkhXO2rqey2o+BdIPerS06bnRQBrwHXUKyG1M/aRTojCx5ptbTKT3DmhY0ZPtDRCA== @@ -1472,23 +1472,6 @@ moment "^2.29.1" prettyjson "^1.2.1" -"@tryghost/logging@^0.1.7": - version "0.1.7" - resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-0.1.7.tgz#22fbff99bc880402691e8836f550348df1c797d8" - integrity sha512-8EM2lCT9E7zt6SlGwlAlQQ7Nwoq2vXgU9C5KFBV/2rbMgnsVsNOwdPGgixozxNNczxYFkTHF5mpQg/+3oV2GjQ== - dependencies: - "@tryghost/bunyan-rotating-filestream" "^0.0.7" - "@tryghost/elasticsearch-bunyan" "^0.1.1" - "@tryghost/root-utils" "^0.3.4" - bunyan "^1.8.15" - bunyan-loggly "^1.4.2" - fs-extra "^9.1.0" - gelf-stream "^1.1.1" - json-stringify-safe "^5.0.1" - lodash "^4.17.21" - moment "^2.29.1" - prettyjson "^1.2.1" - "@tryghost/magic-link@1.0.13", "@tryghost/magic-link@^1.0.13": version "1.0.13" resolved "https://registry.yarnpkg.com/@tryghost/magic-link/-/magic-link-1.0.13.tgz#6780e4a1951d2262ffbf48757a6e9d22b84873c4" @@ -1744,14 +1727,14 @@ dependencies: lodash.template "^4.5.0" -"@tryghost/update-check-service@0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@tryghost/update-check-service/-/update-check-service-0.2.3.tgz#1f47842c3e84ab40ac9b3bbae42eea592f632c29" - integrity sha512-Bwjz6tVBHZ44ZGkD6+xPZUGcrzWkLJFyix+G1yDbyw2M89BzHPz+CQ33po4f4E3MrHW8iLYyB41ryZrZs4hLbA== +"@tryghost/update-check-service@0.2.4": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@tryghost/update-check-service/-/update-check-service-0.2.4.tgz#d335cf6ef073df015c74dfca5a3fb39e1742b364" + integrity sha512-Gpr5Ah8vfn2cZBz25jBhNYD7VdsB/4WGff0SWPTgiCvw2kJigjbJyru2FrPavNb6iFYh3bwr0PpI/SjAzX/+GQ== dependencies: "@tryghost/debug" "^0.1.5" "@tryghost/errors" "^0.2.11" - "@tryghost/logging" "^0.1.7" + "@tryghost/logging" "^0.2.0" "@tryghost/tpl" "^0.1.3" bluebird "^3.7.2" lodash "^4.17.21" From 67b517e1fb0cd670bcf8c191edab6836ffcc68a4 Mon Sep 17 00:00:00 2001 From: Fabien O'Carroll Date: Mon, 18 Oct 2021 14:39:28 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20handling=20of=20"inc?= =?UTF-8?q?omplete"=20subscriptions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs https://github.com/TryGhost/Team/issues/1156 When a payment fails but Stripe Checkout succeeds, a subscription is created in the "incomplete" status. This would result in a Member not being linked to the Product. When the subscription was later updated to "active" or trialing - the Product would still not be added! This updates the members-api to always link the Product to the Member for active subscriptions - regardless of if they're new or not. --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2d3afbd0d2..f1c12ad44b 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@tryghost/limit-service": "0.6.4", "@tryghost/logging": "0.2.2", "@tryghost/magic-link": "1.0.13", - "@tryghost/members-api": "2.2.2", + "@tryghost/members-api": "2.2.3", "@tryghost/members-csv": "1.1.7", "@tryghost/members-importer": "0.3.3", "@tryghost/members-offers": "0.6.1", diff --git a/yarn.lock b/yarn.lock index f83f375367..f81e58b189 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1505,10 +1505,10 @@ "@tryghost/domain-events" "^0.1.2" "@tryghost/member-events" "^0.2.1" -"@tryghost/members-api@2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-2.2.2.tgz#5cbc2f748dc1f5f0ebecf11fecb1ded4f3768055" - integrity sha512-jzsgxRJXm229pE+U7CvjfZm/4U8h2EEUzblpEDYIQEWiUb3WOl7ZMUGmjVJG+M0gkhIaxs1PCnhg3w2urrCwIg== +"@tryghost/members-api@2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-2.2.3.tgz#9cc1734537ba327e1c94514efc4166e46d5bc4cc" + integrity sha512-cCKSVBy8L1nO0r8fGIKbBYDAM7C+XuVDfDb+pBZqyGftZXtI8980EOnOckkM9k/FJYnOMss/U7fmdNAp+uPZxQ== dependencies: "@tryghost/debug" "^0.1.2" "@tryghost/errors" "^0.2.9" From c78ebabb83fe9f62a9ad4e96add6224ae3efa2cc Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Mon, 18 Oct 2021 14:09:17 +0100 Subject: [PATCH 3/4] Updated Admin to v4.19.1 --- core/client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/client b/core/client index 07dc75c999..4f3fd61cb3 160000 --- a/core/client +++ b/core/client @@ -1 +1 @@ -Subproject commit 07dc75c999c9cbedd1ab894fc77764179813b729 +Subproject commit 4f3fd61cb350fe13523c036e7ed5e88fd2135557 From 5c5233afc04b4fe3c439c0e9e04f4a538bfbea36 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Mon, 18 Oct 2021 14:09:17 +0100 Subject: [PATCH 4/4] v4.19.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f1c12ad44b..412f27e6b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghost", - "version": "4.19.0", + "version": "4.19.1", "description": "The professional publishing platform", "author": "Ghost Foundation", "homepage": "https://ghost.org",