From 5a4d98e90dad75c77fd01157faf36842bec36b02 Mon Sep 17 00:00:00 2001
From: Princi Vershwal <vershwal.princi@gmail.com>
Date: Wed, 6 Dec 2023 10:01:48 +0530
Subject: [PATCH 01/36] Show Add offer button on settings screen if no offer is
 present (#19215)

Ref
[PROD-3](https://linear.app/tryghost/issue/PROD-3/settings-group-navigation-handling)
---
 .../src/components/settings/growth/Offers.tsx |  8 +++++--
 .../test/acceptance/membership/offers.test.ts | 23 +++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/apps/admin-x-settings/src/components/settings/growth/Offers.tsx b/apps/admin-x-settings/src/components/settings/growth/Offers.tsx
index 10d1ebeaa0..25ac87063c 100644
--- a/apps/admin-x-settings/src/components/settings/growth/Offers.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/Offers.tsx
@@ -48,17 +48,21 @@ const Offers: React.FC<{ keywords: string[] }> = ({keywords}) => {
 
     const latestThree = activeOffers.slice(0, 3);
 
-    const openModal = () => {
+    const openOfferListModal = () => {
         updateRoute('offers/edit');
     };
 
+    const openAddModal = () => {
+        updateRoute('offers/new');
+    };
+
     const goToOfferEdit = (offerId: string) => {
         updateRoute(`offers/edit/${offerId}`);
     };
 
     return (
         <TopLevelGroup
-            customButtons={<Button color='green' disabled={!checkStripeEnabled(settings, config)} label='Manage offers' link linkWithPadding onClick={openModal}/>}
+            customButtons={<Button color='green' disabled={!checkStripeEnabled(settings, config)} label={allOffers.length > 0 ? 'Manage offers' : 'Add offers'} link linkWithPadding onClick={allOffers.length > 0 ? openOfferListModal : openAddModal}/>}
             description={<>Create discounts & coupons to boost new subscriptions. {allOffers.length === 0 && <a className='text-green' href="https://ghost.org/help/offers" rel="noopener noreferrer" target="_blank">Learn more</a>}</>}
             keywords={keywords}
             navid='offers'
diff --git a/apps/admin-x-settings/test/acceptance/membership/offers.test.ts b/apps/admin-x-settings/test/acceptance/membership/offers.test.ts
index 231b759564..888661ade3 100644
--- a/apps/admin-x-settings/test/acceptance/membership/offers.test.ts
+++ b/apps/admin-x-settings/test/acceptance/membership/offers.test.ts
@@ -14,16 +14,16 @@ test.describe('Offers Modal', () => {
         }});
         await page.goto('/');
         const section = page.getByTestId('offers');
-        await section.getByRole('button', {name: 'Manage offers'}).click();
-        const modal = page.getByTestId('offers-modal');
-        await expect(modal).toBeVisible();
+        await section.getByRole('button', {name: 'Add offers'}).click();
+        const addModal = page.getByTestId('add-offer-modal');
+        await expect(addModal).toBeVisible();
     });
 
     test('Offers Add Modal is available', async ({page}) => {
         await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
             ...globalDataRequests,
             browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
-            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
             browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
             addOffer: {method: 'POST', path: '/offers/', response: {
                 offers: [{
@@ -45,9 +45,9 @@ test.describe('Offers Modal', () => {
 
     test('Can add a new offer', async ({page}) => {
         const {lastApiRequests} = await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
             ...globalDataRequests,
             browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
-            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
             browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: responseFixtures.offers},
             browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
             addOffer: {method: 'POST', path: `/offers/`, response: {
@@ -85,9 +85,9 @@ test.describe('Offers Modal', () => {
 
     test('Errors if required fields are missing', async ({page}) => {
         await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
             ...globalDataRequests,
             browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
-            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
             browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: responseFixtures.offers},
             browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
             addOffer: {method: 'POST', path: `/offers/`, response: {
@@ -112,9 +112,9 @@ test.describe('Offers Modal', () => {
 
     test('Shows validation hints', async ({page}) => {
         await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
             ...globalDataRequests,
             browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
-            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
             browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: responseFixtures.offers},
             browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
             addOffer: {method: 'POST', path: `/offers/`, response: {
@@ -144,9 +144,10 @@ test.describe('Offers Modal', () => {
 
     test('Can view active offers', async ({page}) => {
         await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
             ...globalDataRequests,
             browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
-            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
+            browseAllOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
             browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers}
         }});
 
@@ -161,9 +162,10 @@ test.describe('Offers Modal', () => {
 
     test('Can view archived offers', async ({page}) => {
         await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
             ...globalDataRequests,
             browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
-            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
+            browseAllOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
             browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers}
         }});
 
@@ -178,9 +180,10 @@ test.describe('Offers Modal', () => {
 
     test('Supports updating an offer', async ({page}) => {
         const {lastApiRequests} = await mockApi({page, requests: {
+            browseOffers: {method: 'GET', path: '/offers/', response: responseFixtures.offers},
             ...globalDataRequests,
             browseSettings: {...globalDataRequests.browseSettings, response: settingsWithStripe},
-            browseOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
+            browseAllOffers: {method: 'GET', path: '/offers/?limit=all', response: responseFixtures.offers},
             browseOffersById: {method: 'GET', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: responseFixtures.offers},
             browseTiers: {method: 'GET', path: '/tiers/', response: responseFixtures.tiers},
             editOffer: {method: 'PUT', path: `/offers/${responseFixtures.offers.offers![0].id}/`, response: {

From 60d142202b9c854610f0a7335f3dce4677e4b003 Mon Sep 17 00:00:00 2001
From: Princi Vershwal <vershwal.princi@gmail.com>
Date: Wed, 6 Dec 2023 13:32:21 +0530
Subject: [PATCH 02/36] Remove validation error once user start typing (#19251)

Ref
[PROD-15](https://linear.app/tryghost/issue/PROD-15/validation-issues)
---
 .../components/settings/growth/offers/AddOfferModal.tsx  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
index 202aa9b356..bcddb5df8a 100644
--- a/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
@@ -129,6 +129,7 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
     handleAmountInput,
     handleCodeInput,
     validate,
+    clearError,
     errors,
     testId,
     handleTrialAmountInput,
@@ -174,6 +175,7 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                                 handleNameInput(e);
                                 setNameLength(e.target.value.length);
                             }}
+                            onKeyDown={() => clearError('name')}
                         />
                         <TextField
                             error={Boolean(errors.displayTitle)}
@@ -185,6 +187,7 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                             onChange={(e) => {
                                 handleDisplayTitleInput(e);
                             }}
+                            onKeyDown={() => clearError('displayTitle')}
                         />
                         <TextArea
                             placeholder='Take advantage of this limited-time offer.'
@@ -233,6 +236,7 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                                     onChange={(e) => {
                                         handleAmountInput(e);
                                     }}
+                                    onKeyDown={() => clearError('amount')}
                                 />
                                 <div className='absolute right-1.5 top-6 z-10'>
                                     <Select
@@ -271,7 +275,9 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                                 onBlur={validate}
                                 onChange={(e) => {
                                     handleTrialAmountInput(e);
-                                }} />
+                                }} 
+                                onKeyDown={() => clearError('amount')}/>
+                                
                         }
 
                         <TextField
@@ -284,6 +290,7 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                             onChange={(e) => {
                                 handleCodeInput(e);
                             }}
+                            onKeyDown={() => clearError('code')}
                         />
                     </div>
                 </section>

From 2830a0fba02fa01889b7de75af382f81887f2552 Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Wed, 6 Dec 2023 11:18:04 +0100
Subject: [PATCH 03/36] Released Portal v2.37.0

---
 apps/portal/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/portal/package.json b/apps/portal/package.json
index 6c640e10f1..fb4ff75b39 100644
--- a/apps/portal/package.json
+++ b/apps/portal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/portal",
-  "version": "2.36.5",
+  "version": "2.37.0",
   "license": "MIT",
   "repository": {
     "type": "git",

From 7c8a141264703cb45a1ca68f2c1c41408878e2fe Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Wed, 6 Dec 2023 11:19:29 +0100
Subject: [PATCH 04/36] Bumped Portal to 2.37.x

no issue
---
 ghost/core/core/shared/config/defaults.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghost/core/core/shared/config/defaults.json b/ghost/core/core/shared/config/defaults.json
index bb2f2ebc91..2c392bd25b 100644
--- a/ghost/core/core/shared/config/defaults.json
+++ b/ghost/core/core/shared/config/defaults.json
@@ -182,7 +182,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.36"
+        "version": "2.37"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",

From a38aef7522178c200d3ea3381299523f7001bb7a Mon Sep 17 00:00:00 2001
From: Princi Vershwal <vershwal.princi@gmail.com>
Date: Wed, 6 Dec 2023 16:08:05 +0530
Subject: [PATCH 05/36] Validation fix (#19256)

Fixes PROD-208
---
 .../settings/growth/offers/AddOfferModal.tsx  | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx b/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
index bcddb5df8a..e42ef0cbb5 100644
--- a/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
@@ -128,7 +128,6 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
     handleDurationInMonthsInput,
     handleAmountInput,
     handleCodeInput,
-    validate,
     clearError,
     errors,
     testId,
@@ -170,7 +169,11 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                             maxLength={40}
                             placeholder='Black Friday'
                             title='Offer name'
-                            onBlur={validate}
+                            onBlur={(e) => {
+                                if (!e.target.value && e.target.value.length === 0) {
+                                    errors.name = 'Name is required';
+                                }
+                            }}
                             onChange={(e) => {
                                 handleNameInput(e);
                                 setNameLength(e.target.value.length);
@@ -183,7 +186,11 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                             placeholder='Black Friday Special'
                             title='Display title'
                             value={overrides.displayTitle.value}
-                            onBlur={validate}
+                            onBlur={(e) => {
+                                if (!e.target.value && e.target.value.length === 0) {
+                                    errors.displayTitle = 'Display title is required';
+                                }
+                            }}
                             onChange={(e) => {
                                 handleDisplayTitleInput(e);
                             }}
@@ -232,7 +239,19 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                                             ? (overrides.fixedAmount === 0 ? '' : overrides.fixedAmount?.toString())
                                             : (overrides.percentAmount === 0 ? '' : overrides.percentAmount?.toString())
                                     }
-                                    onBlur={validate}
+                                    onBlur={() => {
+                                        if (overrides.type === 'percent' && overrides.percentAmount === 0) {
+                                            errors.amount = 'Enter an amount greater than 0.';
+                                        }
+
+                                        if (overrides.type === 'percent' && overrides.percentAmount && (overrides.percentAmount < 0 || overrides.percentAmount >= 100)) {
+                                            errors.amount = 'Amount must be between 0 and 100%.';
+                                        }
+
+                                        if (overrides.type === 'fixed' && overrides.fixedAmount && overrides.fixedAmount <= 0) {
+                                            errors.amount = 'Enter an amount greater than 0.';
+                                        }
+                                    }}
                                     onChange={(e) => {
                                         handleAmountInput(e);
                                     }}
@@ -272,7 +291,11 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                                 title='Trial duration'
                                 type='number'
                                 value={overrides.trialAmount?.toString()}
-                                onBlur={validate}
+                                onBlur={(e) => {
+                                    if (Number(e.target.value) < 1) {
+                                        errors.amount = 'Free trial must be at least 1 day.';
+                                    }
+                                }}
                                 onChange={(e) => {
                                     handleTrialAmountInput(e);
                                 }} 
@@ -286,7 +309,11 @@ const Sidebar: React.FC<SidebarProps> = ({tierOptions,
                             placeholder='black-friday'
                             title='Offer code'
                             value={overrides.code.value}
-                            onBlur={validate}
+                            onBlur={(e) => {
+                                if (!e.target.value && e.target.value.length === 0) {
+                                    errors.code = 'Code is required';
+                                }
+                            }}
                             onChange={(e) => {
                                 handleCodeInput(e);
                             }}
@@ -637,7 +664,7 @@ const AddOfferModal = () => {
         onCancel={cancelAddOffer}
         onOk={async () => {
             validate();
-            const isErrorsEmpty = Object.keys(errors).length === 0;
+            const isErrorsEmpty = Object.values(errors).every(error => !error);
             if (!isErrorsEmpty) {
                 showToast({
                     type: 'pageError',

From 3f6ea04c43b37b1f7346e58cbdbf6dcfd7d04a0e Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Wed, 6 Dec 2023 11:39:58 +0100
Subject: [PATCH 06/36] Added portal default plan setting (#19238)

fixes PROD-61

This adds a new default plan setting. It defaults to yearly, which is
the current default selected interval in Portal.

Behind the new portal improvements feature flag, the default plan can be
changed. It will also change automatically if the available intervals
are changed.

This PR also wires up passing the new setting to the Portal preview.
---
 .../src/test/responses/settings.json          |  4 ++
 .../membership/portal/SignupOptions.tsx       | 43 ++++++++++----
 .../src/utils/getPortalPreviewUrl.ts          |  7 ++-
 apps/portal/src/App.js                        |  6 ++
 .../src/components/common/ProductsSection.js  | 22 ++++---
 ghost/admin/mirage/fixtures/settings.js       |  1 +
 .../utils/serializers/input/settings.js       |  1 +
 ...5-11-00-add-portal-default-plan-setting.js |  8 +++
 .../default-settings/default-settings.json    |  8 +++
 .../core/core/shared/settings-cache/public.js |  1 +
 .../admin/__snapshots__/settings.test.js.snap | 58 ++++++++++++++++++-
 .../core/test/e2e-api/admin/settings.test.js  |  8 ++-
 .../__snapshots__/settings.test.js.snap       |  1 +
 .../shared/__snapshots__/version.test.js.snap |  2 +
 .../regression/models/model_settings.test.js  |  2 +-
 .../unit/server/data/exporter/index.test.js   |  2 +-
 .../unit/server/data/schema/integrity.test.js |  2 +-
 .../fixtures/default-settings-browser.json    |  8 +++
 .../test/utils/fixtures/default-settings.json |  8 +++
 19 files changed, 164 insertions(+), 28 deletions(-)
 create mode 100644 ghost/core/core/server/data/migrations/versions/5.76/2023-12-05-11-00-add-portal-default-plan-setting.js

diff --git a/apps/admin-x-framework/src/test/responses/settings.json b/apps/admin-x-framework/src/test/responses/settings.json
index ea3e443bc5..758c3dc546 100644
--- a/apps/admin-x-framework/src/test/responses/settings.json
+++ b/apps/admin-x-framework/src/test/responses/settings.json
@@ -176,6 +176,10 @@
             "key": "portal_plans",
             "value": "[\"monthly\",\"yearly\",\"free\"]"
         },
+        {
+            "key": "portal_default_plan",
+            "value": "yearly"
+        },
         {
             "key": "portal_products",
             "value": "[]"
diff --git a/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx b/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
index 2f7614467e..171ac7c558 100644
--- a/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/portal/SignupOptions.tsx
@@ -14,9 +14,9 @@ const SignupOptions: React.FC<{
     setError: (key: string, error: string | undefined) => void
 }> = ({localSettings, updateSetting, localTiers, updateTier, errors, setError}) => {
     const {config} = useGlobalData();
-
-    const [membersSignupAccess, portalName, portalSignupTermsHtml, portalSignupCheckboxRequired, portalPlansJson] = getSettingValues(
-        localSettings, ['members_signup_access', 'portal_name', 'portal_signup_terms_html', 'portal_signup_checkbox_required', 'portal_plans']
+    const hasPortalImprovements = useFeatureFlag('portalImprovements');
+    const [membersSignupAccess, portalName, portalSignupTermsHtml, portalSignupCheckboxRequired, portalPlansJson, portalDefaultPlan] = getSettingValues(
+        localSettings, ['members_signup_access', 'portal_name', 'portal_signup_terms_html', 'portal_signup_checkbox_required', 'portal_plans', 'portal_default_plan']
     );
     const portalPlans = JSON.parse(portalPlansJson?.toString() || '[]') as string[];
 
@@ -50,6 +50,20 @@ const SignupOptions: React.FC<{
         }
 
         updateSetting('portal_plans', JSON.stringify(portalPlans));
+
+        // Check default plan is included
+        if (hasPortalImprovements) {
+            if (portalDefaultPlan === 'yearly') {
+                if (!portalPlans.includes('yearly') && portalPlans.includes('monthly')) {
+                    updateSetting('portal_default_plan', 'monthly');
+                }
+            } else if (portalDefaultPlan === 'monthly') {
+                if (!portalPlans.includes('monthly')) {
+                    // If both yearly and monthly are missing from plans, still set it to yearly
+                    updateSetting('portal_default_plan', 'yearly');
+                }
+            }
+        }
     };
 
     // This is a bit unclear in current admin, maybe we should add a message if the settings are disabled?
@@ -86,13 +100,10 @@ const SignupOptions: React.FC<{
     }
 
     const paidActiveTiersResult = getPaidActiveTiers(localTiers) || [];
-    const hasPortalImprovements = useFeatureFlag('portalImprovements');
-
-    // TODO: Hook up with actual values and then delete this
-    const selectOptions: SelectOption[] = [
-        {value: 'default-yearly', label: 'Yearly'},
-        {value: 'default-monthly', label: 'Monthly'}
 
+    const defaultPlanOptions: SelectOption[] = [
+        {value: 'yearly', label: 'Yearly'},
+        {value: 'monthly', label: 'Monthly'}
     ];
 
     if (paidActiveTiersResult.length > 0 && isStripeEnabled) {
@@ -145,9 +156,17 @@ const SignupOptions: React.FC<{
                     ]}
                     title='Prices available at signup'
                 />
-                {hasPortalImprovements && <Select disabled={(portalPlans.includes('yearly') && portalPlans.includes('monthly')) ? false : true} options={selectOptions} selectedOption={selectOptions.find(option => option.value === (portalPlans.includes('yearly') ? 'default-yearly' : 'default-monthly'))} title='Price shown by default' onSelect={(value) => {
-                    alert(value);
-                }} />}
+                {hasPortalImprovements &&
+                    <Select
+                        disabled={(portalPlans.includes('yearly') && portalPlans.includes('monthly')) ? false : true}
+                        options={defaultPlanOptions}
+                        selectedOption={defaultPlanOptions.find(option => option.value === portalDefaultPlan)}
+                        title='Price shown by default'
+                        onSelect={(option) => {
+                            updateSetting('portal_default_plan', option?.value ?? 'yearly');
+                        }}
+                    />
+                }
             </>
         )}
 
diff --git a/apps/admin-x-settings/src/utils/getPortalPreviewUrl.ts b/apps/admin-x-settings/src/utils/getPortalPreviewUrl.ts
index 7be4576717..87d61431bf 100644
--- a/apps/admin-x-settings/src/utils/getPortalPreviewUrl.ts
+++ b/apps/admin-x-settings/src/utils/getPortalPreviewUrl.ts
@@ -39,7 +39,12 @@ export const getPortalPreviewUrl = ({settings, config, tiers, siteData, selected
     settingsParam.append('allowSelfSignup', allowSelfSignup ? 'true' : 'false');
     settingsParam.append('signupTermsHtml', getSettingValue(settings, 'portal_signup_terms_html') || '');
     settingsParam.append('signupCheckboxRequired', getSettingValue(settings, 'portal_signup_checkbox_required') ? 'true' : 'false');
-    settingsParam.append('portalProducts', encodeURIComponent(portalTiers.join(','))); // assuming that it might be more than 1
+    settingsParam.append('portalProducts', portalTiers.join(',')); // assuming that it might be more than 1
+
+    const portalDefaultPlan = getSettingValue<string>(settings, 'portal_default_plan');
+    if (portalDefaultPlan) {
+        settingsParam.append('portalDefaultPlan', portalDefaultPlan);
+    }
 
     if (portalPlans && portalPlans.length) {
         settingsParam.append('portalPrices', encodeURIComponent(portalPlans.join(',')));
diff --git a/apps/portal/src/App.js b/apps/portal/src/App.js
index 8d8557ce70..66b920872d 100644
--- a/apps/portal/src/App.js
+++ b/apps/portal/src/App.js
@@ -311,7 +311,10 @@ export default class App extends React.Component {
         // Handle the query params key/value pairs
         for (let pair of qsParams.entries()) {
             const key = pair[0];
+
+            // Note: this needs to be cleaned up, there is no reason why we need to double encode/decode
             const value = decodeURIComponent(pair[1]);
+
             if (key === 'button') {
                 data.site.portal_button = JSON.parse(value);
             } else if (key === 'name') {
@@ -357,6 +360,8 @@ export default class App extends React.Component {
                 data.site.allow_self_signup = JSON.parse(value);
             } else if (key === 'membersSignupAccess' && value) {
                 data.site.members_signup_access = value;
+            } else if (key === 'portalDefaultPlan' && value) {
+                data.site.portal_default_plan = value;
             }
         }
         data.site.portal_plans = allowedPlans;
@@ -389,6 +394,7 @@ export default class App extends React.Component {
                 }
             ];
         }
+
         return data;
     }
 
diff --git a/apps/portal/src/components/common/ProductsSection.js b/apps/portal/src/components/common/ProductsSection.js
index 11c72827fb..7af7e8a636 100644
--- a/apps/portal/src/components/common/ProductsSection.js
+++ b/apps/portal/src/components/common/ProductsSection.js
@@ -894,7 +894,7 @@ function getSelectedPrice({products, selectedProduct, selectedInterval}) {
     return selectedPrice;
 }
 
-function getActiveInterval({portalPlans, selectedInterval = 'year'}) {
+function getActiveInterval({portalPlans, portalDefaultPlan, selectedInterval}) {
     if (selectedInterval === 'month' && portalPlans.includes('monthly')) {
         return 'month';
     }
@@ -903,26 +903,32 @@ function getActiveInterval({portalPlans, selectedInterval = 'year'}) {
         return 'year';
     }
 
-    if (portalPlans.includes('monthly')) {
-        return 'month';
+    if (portalDefaultPlan) {
+        if (portalDefaultPlan === 'monthly' && portalPlans.includes('monthly')) {
+            return 'month';
+        }
     }
 
     if (portalPlans.includes('yearly')) {
         return 'year';
     }
+
+    if (portalPlans.includes('monthly')) {
+        return 'month';
+    }
 }
 
 function ProductsSection({onPlanSelect, products, type = null, handleChooseSignup, errors}) {
     const {site, member, t} = useContext(AppContext);
-    const {portal_plans: portalPlans} = site;
-    const defaultInterval = getActiveInterval({portalPlans});
-
+    const {portal_plans: portalPlans, portal_default_plan: portalDefaultPlan} = site;
     const defaultProductId = products.length > 0 ? products[0].id : 'free';
-    const [selectedInterval, setSelectedInterval] = useState(defaultInterval);
+
+    // Note: by default we set it to null, so that it changes reactively in the preview version of Portal
+    const [selectedInterval, setSelectedInterval] = useState(null);
     const [selectedProduct, setSelectedProduct] = useState(defaultProductId);
 
     const selectedPrice = getSelectedPrice({products, selectedInterval, selectedProduct});
-    const activeInterval = getActiveInterval({portalPlans, selectedInterval});
+    const activeInterval = getActiveInterval({portalPlans, portalDefaultPlan, selectedInterval});
 
     const isComplimentary = isComplimentaryMember({member});
 
diff --git a/ghost/admin/mirage/fixtures/settings.js b/ghost/admin/mirage/fixtures/settings.js
index ae2994231c..0f8aa086b8 100644
--- a/ghost/admin/mirage/fixtures/settings.js
+++ b/ghost/admin/mirage/fixtures/settings.js
@@ -77,6 +77,7 @@ export default [
     setting('portal', 'portal_name', true),
     setting('portal', 'portal_button', true),
     setting('portal', 'portal_plans', JSON.stringify(['free'])),
+    setting('portal', 'portal_default_plan', 'yearly'),
     setting('portal', 'portal_products', JSON.stringify([])),
     setting('portal', 'portal_button_style', 'icon-and-text'),
     setting('portal', 'portal_button_icon', null),
diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/settings.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/settings.js
index c1de8ce2eb..2de0321a0f 100644
--- a/ghost/core/core/server/api/endpoints/utils/serializers/input/settings.js
+++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/settings.js
@@ -38,6 +38,7 @@ const EDITABLE_SETTINGS = [
     'portal_name',
     'portal_button',
     'portal_plans',
+    'portal_default_plan',
     'portal_button_style',
     'firstpromoter',
     'firstpromoter_id',
diff --git a/ghost/core/core/server/data/migrations/versions/5.76/2023-12-05-11-00-add-portal-default-plan-setting.js b/ghost/core/core/server/data/migrations/versions/5.76/2023-12-05-11-00-add-portal-default-plan-setting.js
new file mode 100644
index 0000000000..ed76650180
--- /dev/null
+++ b/ghost/core/core/server/data/migrations/versions/5.76/2023-12-05-11-00-add-portal-default-plan-setting.js
@@ -0,0 +1,8 @@
+const {addSetting} = require('../../utils');
+
+module.exports = addSetting({
+    key: 'portal_default_plan',
+    value: 'yearly',
+    type: 'string',
+    group: 'portal'
+});
diff --git a/ghost/core/core/server/data/schema/default-settings/default-settings.json b/ghost/core/core/server/data/schema/default-settings/default-settings.json
index b321087fab..a652ec1544 100644
--- a/ghost/core/core/server/data/schema/default-settings/default-settings.json
+++ b/ghost/core/core/server/data/schema/default-settings/default-settings.json
@@ -330,6 +330,14 @@
             "defaultValue": "[\"free\"]",
             "type": "array"
         },
+        "portal_default_plan": {
+            "defaultValue": "yearly",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["yearly", "monthly"]]
+            },
+            "type": "string"
+        },
         "portal_products": {
             "defaultValue": "[]",
             "type": "array"
diff --git a/ghost/core/core/shared/settings-cache/public.js b/ghost/core/core/shared/settings-cache/public.js
index d06d00db30..fde8a8667e 100644
--- a/ghost/core/core/shared/settings-cache/public.js
+++ b/ghost/core/core/shared/settings-cache/public.js
@@ -38,6 +38,7 @@ module.exports = {
     portal_signup_terms_html: 'portal_signup_terms_html',
     portal_signup_checkbox_required: 'portal_signup_checkbox_required',
     portal_plans: 'portal_plans',
+    portal_default_plan: 'portal_default_plan',
     portal_name: 'portal_name',
     portal_button: 'portal_button',
     comments_enabled: 'comments_enabled',
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
index ee03512ffa..83cbd6d906 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
@@ -180,6 +180,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -602,6 +606,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -967,6 +975,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -1143,7 +1155,7 @@ exports[`Settings API Edit Can edit a setting 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "4487",
+  "content-length": "4534",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1333,6 +1345,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -1698,6 +1714,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -2526,6 +2546,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -2892,6 +2916,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -3258,6 +3286,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -3628,6 +3660,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -3993,6 +4029,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -4363,6 +4403,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -5097,6 +5141,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -5463,6 +5511,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
@@ -5893,6 +5945,10 @@ Object {
       "key": "portal_plans",
       "value": "[\\"free\\"]",
     },
+    Object {
+      "key": "portal_default_plan",
+      "value": "yearly",
+    },
     Object {
       "key": "portal_products",
       "value": "[]",
diff --git a/ghost/core/test/e2e-api/admin/settings.test.js b/ghost/core/test/e2e-api/admin/settings.test.js
index f28ba4be6c..21df9cde1c 100644
--- a/ghost/core/test/e2e-api/admin/settings.test.js
+++ b/ghost/core/test/e2e-api/admin/settings.test.js
@@ -9,15 +9,17 @@ const models = require('../../../core/server/models');
 const {mockLabsDisabled, mockLabsEnabled} = require('../../utils/e2e-framework-mock-manager');
 const {anyErrorId} = matchers;
 
-const CURRENT_SETTINGS_COUNT = 86;
+const CURRENT_SETTINGS_COUNT = 87;
 
 const settingsMatcher = {};
 
 const publicHashSettingMatcher = {
+    key: 'public_hash',
     value: stringMatching(/[a-z0-9]{30}/)
 };
 
 const labsSettingMatcher = {
+    key: 'labs',
     value: stringMatching(/\{[^\s]+\}/)
 };
 
@@ -30,10 +32,10 @@ const matchSettingsArray = (length) => {
         settingsArray[26] = publicHashSettingMatcher;
     }
 
-    if (length > 60) {
+    if (length > 61) {
         // Added a setting that is alphabetically before 'labs'? then you need to increment this counter.
         // Item at index x is the lab settings, which changes as we add and remove features
-        settingsArray[60] = labsSettingMatcher;
+        settingsArray[61] = labsSettingMatcher;
     }
 
     return settingsArray;
diff --git a/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap
index e3cfe4c8e2..a103edbdab 100644
--- a/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap
+++ b/ghost/core/test/e2e-api/content/__snapshots__/settings.test.js.snap
@@ -54,6 +54,7 @@ Object {
     "portal_button_icon": null,
     "portal_button_signup_text": "Subscribe",
     "portal_button_style": "icon-and-text",
+    "portal_default_plan": "yearly",
     "portal_name": true,
     "portal_plans": Array [
       "free",
diff --git a/ghost/core/test/e2e-api/shared/__snapshots__/version.test.js.snap b/ghost/core/test/e2e-api/shared/__snapshots__/version.test.js.snap
index 57a434fd89..2e9ea09beb 100644
--- a/ghost/core/test/e2e-api/shared/__snapshots__/version.test.js.snap
+++ b/ghost/core/test/e2e-api/shared/__snapshots__/version.test.js.snap
@@ -1406,6 +1406,7 @@ Object {
     "portal_button_icon": null,
     "portal_button_signup_text": "Subscribe",
     "portal_button_style": "icon-and-text",
+    "portal_default_plan": "yearly",
     "portal_name": true,
     "portal_plans": Array [
       "free",
@@ -1507,6 +1508,7 @@ Object {
     "portal_button_icon": null,
     "portal_button_signup_text": "Subscribe",
     "portal_button_style": "icon-and-text",
+    "portal_default_plan": "yearly",
     "portal_name": true,
     "portal_plans": Array [
       "free",
diff --git a/ghost/core/test/regression/models/model_settings.test.js b/ghost/core/test/regression/models/model_settings.test.js
index 737f3d5d31..e69b1d9891 100644
--- a/ghost/core/test/regression/models/model_settings.test.js
+++ b/ghost/core/test/regression/models/model_settings.test.js
@@ -5,7 +5,7 @@ const db = require('../../../core/server/data/db');
 // Stuff we are testing
 const models = require('../../../core/server/models');
 
-const SETTINGS_LENGTH = 93;
+const SETTINGS_LENGTH = 94;
 
 describe('Settings Model', function () {
     before(models.init);
diff --git a/ghost/core/test/unit/server/data/exporter/index.test.js b/ghost/core/test/unit/server/data/exporter/index.test.js
index f90001c994..080940e567 100644
--- a/ghost/core/test/unit/server/data/exporter/index.test.js
+++ b/ghost/core/test/unit/server/data/exporter/index.test.js
@@ -236,7 +236,7 @@ describe('Exporter', function () {
 
             // NOTE: if default settings changed either modify the settings keys blocklist or increase allowedKeysLength
             //       This is a reminder to think about the importer/exporter scenarios ;)
-            const allowedKeysLength = 85;
+            const allowedKeysLength = 86;
             totalKeysLength.should.eql(SETTING_KEYS_BLOCKLIST.length + allowedKeysLength);
         });
     });
diff --git a/ghost/core/test/unit/server/data/schema/integrity.test.js b/ghost/core/test/unit/server/data/schema/integrity.test.js
index a778347255..fea8db9b1e 100644
--- a/ghost/core/test/unit/server/data/schema/integrity.test.js
+++ b/ghost/core/test/unit/server/data/schema/integrity.test.js
@@ -37,7 +37,7 @@ describe('DB version integrity', function () {
     // Only these variables should need updating
     const currentSchemaHash = '34a9fa4dc1223ef6c45f8ed991d25de5';
     const currentFixturesHash = '4db87173699ad9c9d8a67ccab96dfd2d';
-    const currentSettingsHash = '3128d4ec667a50049486b0c21f04be07';
+    const currentSettingsHash = '5c957ceb48c4878767d7d3db484c592d';
     const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';
 
     // If this test is failing, then it is likely a change has been made that requires a DB version bump,
diff --git a/ghost/core/test/utils/fixtures/default-settings-browser.json b/ghost/core/test/utils/fixtures/default-settings-browser.json
index 592fdcd166..c4cf81ae26 100644
--- a/ghost/core/test/utils/fixtures/default-settings-browser.json
+++ b/ghost/core/test/utils/fixtures/default-settings-browser.json
@@ -326,6 +326,14 @@
             "defaultValue": "[\"free\"]",
             "type": "array"
         },
+        "portal_default_plan": {
+            "defaultValue": "yearly",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["yearly", "monthly"]]
+            },
+            "type": "string"
+        },
         "portal_products": {
             "defaultValue": "[]",
             "type": "array"
diff --git a/ghost/core/test/utils/fixtures/default-settings.json b/ghost/core/test/utils/fixtures/default-settings.json
index c039fbe451..8183d55ff5 100644
--- a/ghost/core/test/utils/fixtures/default-settings.json
+++ b/ghost/core/test/utils/fixtures/default-settings.json
@@ -338,6 +338,14 @@
             "defaultValue": "[\"free\"]",
             "type": "array"
         },
+        "portal_default_plan": {
+            "defaultValue": "yearly",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["yearly", "monthly"]]
+            },
+            "type": "string"
+        },
         "portal_products": {
             "defaultValue": "[]",
             "type": "array"

From d696e8b2e23a5a8205ed905060400f02a0749bea Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 6 Dec 2023 05:32:36 -0600
Subject: [PATCH 07/36] Added support for TK tracking inside cards (#19247)

refs https://github.com/TryGhost/Product/issues/4209

- bumped Koenig packages
  - `koenig-lexical` added nested editor TK support
  - all packages dropped Node 16 support
- switched to using `isTKEnabled` prop and `<TKCountPlugin>`

Co-authored-by: Kevin Ansfield <kevin@lookingsideways.co.uk>
---
 .../app/components/koenig-lexical-editor.js   |   9 +-
 ghost/admin/package.json                      |   6 +-
 ghost/core/package.json                       |  14 +-
 ghost/email-service/package.json              |   2 +-
 ghost/importer-revue/package.json             |   2 +-
 yarn.lock                                     | 482 +++++++++++-------
 6 files changed, 314 insertions(+), 201 deletions(-)

diff --git a/ghost/admin/app/components/koenig-lexical-editor.js b/ghost/admin/app/components/koenig-lexical-editor.js
index 3935a8d99b..de54ccc3f7 100644
--- a/ghost/admin/app/components/koenig-lexical-editor.js
+++ b/ghost/admin/app/components/koenig-lexical-editor.js
@@ -75,9 +75,9 @@ const WordCountPlugin = ({editorResource, ...props}) => {
     return <_WordCountPlugin {...props} />;
 };
 
-const TKPlugin = ({editorResource, ...props}) => {
-    const {TKPlugin: _TKPlugin} = editorResource.read();
-    return <_TKPlugin {...props} />;
+const TKCountPlugin = ({editorResource, ...props}) => {
+    const {TKCountPlugin: _TKCountPlugin} = editorResource.read();
+    return <_TKCountPlugin {...props} />;
 };
 
 export default class KoenigLexicalEditor extends Component {
@@ -526,6 +526,7 @@ export default class KoenigLexicalEditor extends Component {
                             multiplayerEndpoint={multiplayerEndpoint}
                             onError={this.onError}
                             darkMode={this.feature.nightShift}
+                            isTKEnabled={this.feature.tkReminders}
                         >
                             <KoenigEditor
                                 editorResource={this.editorResource}
@@ -536,7 +537,7 @@ export default class KoenigLexicalEditor extends Component {
                                 registerAPI={this.args.registerAPI}
                             />
                             <WordCountPlugin editorResource={this.editorResource} onChange={this.args.updateWordCount} />
-                            {this.feature.tkReminders && <TKPlugin editorResource={this.editorResource} onCountChange={this.args.updatePostTkCount} />}
+                            {this.feature.tkReminders && <TKCountPlugin editorResource={this.editorResource} onChange={this.args.updatePostTkCount} />}
                         </KoenigComposer>
                     </Suspense>
                 </ErrorHandler>
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 2392c73f7c..45f6ca5c25 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -44,9 +44,9 @@
     "@tryghost/color-utils": "0.2.0",
     "@tryghost/ember-promise-modals": "2.0.1",
     "@tryghost/helpers": "1.1.88",
-    "@tryghost/kg-clean-basic-html": "3.0.41",
+    "@tryghost/kg-clean-basic-html": "4.0.0",
     "@tryghost/kg-converters": "0.0.22",
-    "@tryghost/koenig-lexical": "0.5.27",
+    "@tryghost/koenig-lexical": "1.0.1",
     "@tryghost/limit-service": "1.2.12",
     "@tryghost/members-csv": "0.0.0",
     "@tryghost/nql": "0.12.0",
@@ -201,4 +201,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ghost/core/package.json b/ghost/core/package.json
index 84c5f0afe9..a3094baf74 100644
--- a/ghost/core/package.json
+++ b/ghost/core/package.json
@@ -98,14 +98,14 @@
     "@tryghost/importer-handler-content-files": "0.0.0",
     "@tryghost/importer-revue": "0.0.0",
     "@tryghost/job-manager": "0.0.0",
-    "@tryghost/kg-card-factory": "4.0.15",
+    "@tryghost/kg-card-factory": "5.0.0",
     "@tryghost/kg-converters": "0.0.22",
-    "@tryghost/kg-default-atoms": "4.0.3",
-    "@tryghost/kg-default-cards": "9.1.9",
-    "@tryghost/kg-default-nodes": "0.2.12",
-    "@tryghost/kg-html-to-lexical": "0.1.14",
-    "@tryghost/kg-lexical-html-renderer": "0.3.51",
-    "@tryghost/kg-mobiledoc-html-renderer": "6.0.15",
+    "@tryghost/kg-default-atoms": "5.0.0",
+    "@tryghost/kg-default-cards": "10.0.0",
+    "@tryghost/kg-default-nodes": "1.0.0",
+    "@tryghost/kg-html-to-lexical": "1.0.0",
+    "@tryghost/kg-lexical-html-renderer": "1.0.0",
+    "@tryghost/kg-mobiledoc-html-renderer": "7.0.0",
     "@tryghost/limit-service": "1.2.12",
     "@tryghost/link-redirects": "0.0.0",
     "@tryghost/link-replacer": "0.0.0",
diff --git a/ghost/email-service/package.json b/ghost/email-service/package.json
index f257347e53..ad2feac8a1 100644
--- a/ghost/email-service/package.json
+++ b/ghost/email-service/package.json
@@ -29,7 +29,7 @@
     "@tryghost/email-events": "0.0.0",
     "@tryghost/errors": "1.2.26",
     "@tryghost/html-to-plaintext": "0.0.0",
-    "@tryghost/kg-default-cards": "9.1.9",
+    "@tryghost/kg-default-cards": "10.0.0",
     "@tryghost/logging": "2.4.8",
     "@tryghost/tpl": "0.1.26",
     "@tryghost/validator": "0.2.6",
diff --git a/ghost/importer-revue/package.json b/ghost/importer-revue/package.json
index a81b18a99f..d230f4cf3b 100644
--- a/ghost/importer-revue/package.json
+++ b/ghost/importer-revue/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@tryghost/debug": "0.1.26",
-    "@tryghost/kg-default-cards": "9.1.9",
+    "@tryghost/kg-default-cards": "10.0.0",
     "@tryghost/string": "0.2.10",
     "lodash": "4.17.21",
     "papaparse": "5.3.2",
diff --git a/yarn.lock b/yarn.lock
index e3e6e69e8b..d49fe1569b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2668,17 +2668,17 @@
   resolved "https://registry.yarnpkg.com/@ebay/nice-modal-react/-/nice-modal-react-1.2.13.tgz#7e8229fe3a48a11f27cd7f5e21190d82d6f609ce"
   integrity sha512-jx8xIWe/Up4tpNuM02M+rbnLoxdngTGk3Y8LjJsLGXXcSoKd/+eZStZcAlIO/jwxyz/bhPZnpqPJZWAmhOofuA==
 
-"@elastic/elasticsearch@8.10.0", "@elastic/elasticsearch@8.5.0":
-  version "8.5.0"
-  resolved "https://registry.npmjs.org/@elastic/elasticsearch/-/elasticsearch-8.5.0.tgz#407aee0950a082ee76735a567f2571cf4301d4ea"
-  integrity sha512-iOgr/3zQi84WmPhAplnK2W13R89VXD2oc6WhlQmH3bARQwmI+De23ZJKBEn7bvuG/AHMAqasPXX7uJIiJa2MqQ==
+"@elastic/elasticsearch@8.10.0":
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.10.0.tgz#48842b3358b8ea4d37d75cff29fdd37fdf0b2996"
+  integrity sha512-RIEyqz0D18bz/dK+wJltaak+7wKaxDELxuiwOJhuMrvbrBsYDFnEoTdP/TZ0YszHBgnRPGqBDBgH/FHNgHObiQ==
   dependencies:
-    "@elastic/transport" "^8.2.0"
+    "@elastic/transport" "^8.3.4"
     tslib "^2.4.0"
 
-"@elastic/transport@^8.2.0":
+"@elastic/transport@^8.3.4":
   version "8.3.4"
-  resolved "https://registry.npmjs.org/@elastic/transport/-/transport-8.3.4.tgz#43c852e848dc8502bbd7f23f2d61bd5665cded99"
+  resolved "https://registry.yarnpkg.com/@elastic/transport/-/transport-8.3.4.tgz#43c852e848dc8502bbd7f23f2d61bd5665cded99"
   integrity sha512-+0o8o74sbzu3BO7oOZiP9ycjzzdOt4QwmMEjFc1zfO7M0Fh7QX1xrpKqZbSd8vBwihXNlSq/EnMPfgD2uFEmFg==
   dependencies:
     debug "^4.3.4"
@@ -2872,7 +2872,7 @@
     ember-cli-babel "^7.22.1"
     ember-compatibility-helpers "^1.1.1"
 
-"@ember/render-modifiers@2.1.0", "@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.0", "@ember/render-modifiers@^2.0.4":
+"@ember/render-modifiers@2.1.0", "@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.4":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.1.0.tgz#f4fff95a8b5cfbe947ec46644732d511711c5bf9"
   integrity sha512-LruhfoDv2itpk0fA0IC76Sxjcnq/7BC6txpQo40hOko8Dn6OxwQfxkPIbZGV0Cz7df+iX+VJrcYzNIvlc3w2EQ==
@@ -3010,19 +3010,6 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
-"@embroider/macros@0.47.2", "@embroider/macros@^0.47.2":
-  version "0.47.2"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0"
-  integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg==
-  dependencies:
-    "@embroider/shared-internals" "0.47.2"
-    assert-never "^1.2.1"
-    ember-cli-babel "^7.26.6"
-    find-up "^5.0.0"
-    lodash "^4.17.21"
-    resolve "^1.20.0"
-    semver "^7.3.2"
-
 "@embroider/macros@1.13.3", "@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.12.2", "@embroider/macros@^1.2.0", "@embroider/macros@^1.8.0", "@embroider/macros@^1.8.3", "@embroider/macros@^1.9.0":
   version "1.13.3"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.3.tgz#e1ff584e01bcdebb9fa9f6982ecc2ea89886867f"
@@ -3050,19 +3037,6 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
-"@embroider/shared-internals@0.47.2":
-  version "0.47.2"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.47.2.tgz#24e9fa0dd9c529d5c996ee1325729ea08d1fa19f"
-  integrity sha512-SxdZYjAE0fiM5zGDz+12euWIsQZ1tsfR1k+NKmiWMyLhA5T3pNgbR2/Djvx/cVIxOtEavGGSllYbzRKBtV4xMg==
-  dependencies:
-    babel-import-util "^0.2.0"
-    ember-rfc176-data "^0.3.17"
-    fs-extra "^9.1.0"
-    lodash "^4.17.21"
-    resolve-package-path "^4.0.1"
-    semver "^7.3.5"
-    typescript-memoize "^1.0.1"
-
 "@embroider/shared-internals@2.5.1", "@embroider/shared-internals@^2.0.0":
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.1.tgz#a4d8c057cbff293ef6eb29ee6537f263d206b444"
@@ -3123,15 +3097,6 @@
     broccoli-funnel "^3.0.5"
     ember-cli-babel "^7.23.1"
 
-"@embroider/util@^0.47.2":
-  version "0.47.2"
-  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.47.2.tgz#d06497b4b84c07ed9c7b628293bb019c533f4556"
-  integrity sha512-g9OqnFJPktGu9NS0Ug3Pxz1JE3jeDceeVE4IrlxDrVmBXMA/GrBvpwjolWgl6jh97cMJyExdz62jIvPHV4256Q==
-  dependencies:
-    "@embroider/macros" "0.47.2"
-    broccoli-funnel "^3.0.5"
-    ember-cli-babel "^7.23.1"
-
 "@emotion/babel-plugin@^11.11.0":
   version "11.11.0"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c"
@@ -4033,7 +3998,7 @@
     "@keyvhq/core" "^2.0.0"
     mimic-fn "~3.0.0"
 
-"@lexical/clipboard@^0.12.2":
+"@lexical/clipboard@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@lexical/clipboard/-/clipboard-0.12.2.tgz#cfa74da178673624ecd835eb9449545885cbefc7"
   integrity sha512-RldmfZquuJJJCJ5WquCyoJ1/eZ+AnNgdksqvd+G+Yn/GyJl/+O3dnHM0QVaDSPvh/PynLFcCtz/57ySLo2kQxQ==
@@ -4043,7 +4008,7 @@
     "@lexical/selection" "0.12.2"
     "@lexical/utils" "0.12.2"
 
-"@lexical/code@^0.12.2":
+"@lexical/code@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@lexical/code/-/code-0.12.2.tgz#2484511cb9c3688bb85f477d448444250939986d"
   integrity sha512-w2JeJdnMUtYnC/Fx78sL3iJBt9Ug8pFSDOcI9ay/BkMQFQV8oqq1iyuLLBBJSG4FAM8b2DXrVdGklRQ+jTfTVw==
@@ -4051,33 +4016,33 @@
     "@lexical/utils" "0.12.2"
     prismjs "^1.27.0"
 
-"@lexical/headless@^0.12.2":
+"@lexical/headless@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@lexical/headless/-/headless-0.12.2.tgz#300d5399d5d45e6f0bdc677c9ccaaf287d372572"
   integrity sha512-fgAPcNG8z/uL++eplR5u5RZQU62n/aOf/znEnMn0toM73yzZQm3+V9Jx/Q5U/QfFuWVwQddVLZ32DGqMCW1/8w==
 
-"@lexical/html@0.12.2", "@lexical/html@^0.12.2":
+"@lexical/html@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@lexical/html/-/html-0.12.2.tgz#6df09c362688b666da0f474d132d889415dbae8a"
   integrity sha512-LWUO6OKhDtDZa9X1spHAqzsp+4EF01exis4cz5H9y2sHi7EofogXnRCadZ+fa07NVwPVTZWsStkk5qdSe/NEzg==
   dependencies:
     "@lexical/selection" "0.12.2"
 
-"@lexical/link@^0.12.2":
+"@lexical/link@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@lexical/link/-/link-0.12.2.tgz#33bf3ecdd98c2b27b2bdd67a8885649e1f528fc2"
   integrity sha512-etOIONa7uyRDmwg8GN52kDlf8thD2Zk1LOFLeocHWz1V8fe3i2unGUek5s/rNPkc6ynpPpNsHdN1VEghOLCCmw==
   dependencies:
     "@lexical/utils" "0.12.2"
 
-"@lexical/list@0.12.2", "@lexical/list@^0.12.2":
+"@lexical/list@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@lexical/list/-/list-0.12.2.tgz#7afdd13026f936144ff93d40382f21924e8e6908"
   integrity sha512-3CyWtYQC+IlK4cK/oiD8Uz1gSXD8UcKGOF2vVsDXkMU06O6zvHNmHZOnVJqA0JVNgZAoR9dMR1fi2xd4iuCAiw==
   dependencies:
     "@lexical/utils" "0.12.2"
 
-"@lexical/rich-text@^0.12.2":
+"@lexical/rich-text@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@lexical/rich-text/-/rich-text-0.12.2.tgz#9ef44e54777fc222ac8df344adb0d7428c784b25"
   integrity sha512-igsEuv7CwBOAj5c8jeE41cnx6zkhI/Bkbu4W7shT6S6lNA/3cnyZpAMlgixwyK5RoqjGRCT+IJK5l6yBxQfNkw==
@@ -4094,7 +4059,7 @@
   dependencies:
     "@lexical/utils" "0.12.2"
 
-"@lexical/utils@0.12.2", "@lexical/utils@^0.12.2":
+"@lexical/utils@0.12.2":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@lexical/utils/-/utils-0.12.2.tgz#b8325f1a1a0d043fd2b40d59cd00c4d7c038474b"
   integrity sha512-xW4y4l2Yd37+qLwkBvBGyzsKCA9wnh1ljphBJeR2vreT193i2gaIwuku2ZKlER14VHw4192qNJF7vUoAEmwurQ==
@@ -7640,6 +7605,15 @@
     "@tryghost/debug" "^0.1.26"
     split2 "4.2.0"
 
+"@tryghost/elasticsearch@^3.0.16":
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.16.tgz#73df153a5a3e699fe3e60cbbaea129adee6309b4"
+  integrity sha512-MaoOAwt8TMRYTVV9ozUi4/2tGzJ/spigFWnG+8LyPbdWSxrah7HPnUWNEp8lUjiwH8Zr1eoLkgKZ8xUFIFSwEg==
+  dependencies:
+    "@elastic/elasticsearch" "8.10.0"
+    "@tryghost/debug" "^0.1.27"
+    split2 "4.2.0"
+
 "@tryghost/email-mock-receiver@0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@tryghost/email-mock-receiver/-/email-mock-receiver-0.3.2.tgz#abd8086935a95a996b6c5c803478a9f81dcae19a"
@@ -7661,7 +7635,7 @@
     focus-trap "^6.7.2"
     postcss-preset-env "^7.3.1"
 
-"@tryghost/errors@1.2.26", "@tryghost/errors@1.2.27", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.27", "@tryghost/errors@^1.2.3":
+"@tryghost/errors@1.2.26", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.3":
   version "1.2.26"
   resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.26.tgz#0d0503a51e681998421548fbddbdd7376384c457"
   integrity sha512-s/eynvVUiAhHP0HB7CPQs7qH7Pm1quJ2iUMTCuH7HV8LqiGoQFNc21/5R4lRv+2Jt3yf69UPCs/6G+kAgZipNw==
@@ -7670,6 +7644,15 @@
     lodash "^4.17.21"
     uuid "^9.0.0"
 
+"@tryghost/errors@1.2.27", "@tryghost/errors@^1.2.27":
+  version "1.2.27"
+  resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.27.tgz#3d552c007b5b7ce3e72cbb727c42076446a24638"
+  integrity sha512-5m4IH7S5bCIFX+qwTgaMsnPK7ZnPu1mw8kiIFiBQEGs/996GkKGo/876mbrjmkh8ScWNynL6O179753bmMRmCQ==
+  dependencies:
+    "@stdlib/utils-copy" "^0.0.7"
+    lodash "^4.17.21"
+    uuid "^9.0.0"
+
 "@tryghost/express-test@0.13.7":
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/@tryghost/express-test/-/express-test-0.13.7.tgz#fee867065282298095a194c5e70386e393d21d57"
@@ -7708,6 +7691,14 @@
     "@tryghost/errors" "^1.2.26"
     "@tryghost/request" "^1.0.0"
 
+"@tryghost/http-stream@^0.1.26":
+  version "0.1.26"
+  resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.26.tgz#b48da359e8b2ec27a6a302d2d0e0126922242f2e"
+  integrity sha512-Y8XLy1iksUKWnVnXTqsexH/H9sE6HnHTgM5WvDwppZIDcar0Wv/07AX83mLLY00uQ0MvXHzHSeBWdhUH9mnbjQ==
+  dependencies:
+    "@tryghost/errors" "^1.2.27"
+    "@tryghost/request" "^1.0.1"
+
 "@tryghost/image-transform@1.2.11":
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/@tryghost/image-transform/-/image-transform-1.2.11.tgz#82463d97f8747db6db70165a04e824eed6791fee"
@@ -7728,12 +7719,17 @@
     "@tryghost/errors" "^1.2.26"
     jest-snapshot "^29.0.0"
 
-"@tryghost/kg-card-factory@4.0.15":
-  version "4.0.15"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-4.0.15.tgz#9f5cd81add5a35b05b7502846eb6369aadfaf4af"
-  integrity sha512-E4lLTAbuT/qAwa08nNLe/6l+G5zFCq4/RLjO3nIoX8aivEAJ2sGFzpXlr3txY3tTowoaXI5q+GsifboY4R5QhQ==
+"@tryghost/kg-card-factory@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-5.0.0.tgz#502abc0d3f7956770a6334070772d7f71f21c528"
+  integrity sha512-z2aADkNYj/9BnNuKBdjUYbtIyPPnrbn2U4C+YrzJ2FCGAxPIrvUjkbAVfr16OiMY1IKH7lRQ9tPf/Uxowg5rWA==
 
-"@tryghost/kg-clean-basic-html@3.0.41", "@tryghost/kg-clean-basic-html@^3.0.41":
+"@tryghost/kg-clean-basic-html@4.0.0", "@tryghost/kg-clean-basic-html@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-4.0.0.tgz#87b5aded2811316e3226f44ce2131d896c2bbfcd"
+  integrity sha512-/D037hnw3r6q+PYYrLUa+2vNN56EScqQvfdLG4hi4vD3A7pOs3jtdd72KHXo9KgGF23daphyY71hVX2k5cvnPw==
+
+"@tryghost/kg-clean-basic-html@^3.0.41":
   version "3.0.41"
   resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-3.0.41.tgz#e680adab4b6b880ced1963fd3cf900bb47656602"
   integrity sha512-J7OD6be0daRSZXQyD85cZ810WHNzP85U5qCDOhk50JsTIv2cQfCS0u3ej1hQBcVX3YVBMgmxDkQBhXAb7GpHxw==
@@ -7745,17 +7741,17 @@
   dependencies:
     lodash "^4.17.21"
 
-"@tryghost/kg-default-atoms@4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-atoms/-/kg-default-atoms-4.0.3.tgz#a565a08ee55736065154f435d51b392f9a15455d"
-  integrity sha512-EZ43abMvUr7cV5aAD4w7OVUOtaGdfj4HpvQRkZkAqB7/S4prRl7dWIlatxiYX379AXQ+hjI+cSrw5UV0yHaRhA==
+"@tryghost/kg-default-atoms@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-atoms/-/kg-default-atoms-5.0.0.tgz#bd72631e70ca8822fe3cd4f093d901f253610c15"
+  integrity sha512-k53/XoYRgiyFOclCdCRCwp/spHw8PWzMvxbH89lasLiLjiO8sqgbudcnMdjwJXqfYixkId24+8WwYt8UOJt4yQ==
 
-"@tryghost/kg-default-cards@9.1.9":
-  version "9.1.9"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-cards/-/kg-default-cards-9.1.9.tgz#46388d46ea9b05e001958116c93bf0e7720f65e6"
-  integrity sha512-VhhgwOKSfeBep0LlzIIqh2k7LIuaHkiD/4t75WKp7hG4tNhWj+NYMb0vQDnJtoVnNfeNVjor1zEAnDoHzf4rFQ==
+"@tryghost/kg-default-cards@10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-cards/-/kg-default-cards-10.0.0.tgz#57becdc4e8703e60679693f154f97c9387479029"
+  integrity sha512-DG0vc6fHpa1B1O8nJBwLtrdhKKJgDL85xlDBnEhSHo5u5EXtWAMBLglsdWQK+Z199BBHGEjy8vnx/GEMEOL3Jg==
   dependencies:
-    "@tryghost/kg-markdown-html-renderer" "^6.0.15"
+    "@tryghost/kg-markdown-html-renderer" "^7.0.0"
     "@tryghost/string" "^0.2.0"
     "@tryghost/url-utils" "^4.0.0"
     handlebars "^4.7.6"
@@ -7763,67 +7759,70 @@
     lodash "^4.17.21"
     luxon "^3.0.0"
 
-"@tryghost/kg-default-nodes@0.2.12", "@tryghost/kg-default-nodes@^0.2.12":
-  version "0.2.12"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-0.2.12.tgz#60ba99dfdfdc719379351696c2e2e1bb9d3c93fa"
-  integrity sha512-O69l89BSa2pqrz6bgSELB3YS3CUbrzqLxkfN1XCK5X28iqWD5oBlrcfV2tyU22KrNswvoGA/r9/G7JK5nF1fqQ==
+"@tryghost/kg-default-nodes@1.0.0", "@tryghost/kg-default-nodes@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-1.0.0.tgz#39be6eabb1ddb00b73f403fff69de3a2e63aac5b"
+  integrity sha512-ufiQNwWy2zG9SfAsfYWWrKpc4oXe+Hriy3NIUfS1ZhoY0F9uThV8smH0QW1WS86NEi+Bhy3DxXtD4LrTCo649Q==
   dependencies:
-    "@lexical/rich-text" "^0.12.2"
-    "@tryghost/kg-clean-basic-html" "^3.0.41"
-    "@tryghost/kg-markdown-html-renderer" "^6.0.15"
+    "@lexical/clipboard" "0.12.2"
+    "@lexical/rich-text" "0.12.2"
+    "@lexical/selection" "0.12.2"
+    "@lexical/utils" "0.12.2"
+    "@tryghost/kg-clean-basic-html" "^4.0.0"
+    "@tryghost/kg-markdown-html-renderer" "^7.0.0"
     html-minifier "^4.0.0"
-    jsdom "^22.0.0"
-    lexical "^0.12.2"
+    jsdom "^23.0.0"
+    lexical "0.12.2"
     lodash "^4.17.21"
     luxon "^3.3.0"
 
-"@tryghost/kg-default-transforms@^0.0.9":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-0.0.9.tgz#a2b67d9a0e3aebd673d7961287353855929d9e8f"
-  integrity sha512-qFTPBEMiOTNU14h2rCkLy0HBRPEI5EWOCYuiJnZZnV7vswe++3bDfJoDUhvjlz3cMoPQiXNl2HIN8YrbNgActw==
+"@tryghost/kg-default-transforms@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-1.0.0.tgz#16fea09da772e4c9961a65a12a0b7d9da5f1308f"
+  integrity sha512-qLK8QB2chdr7IZVcE5AfujtmEnqbYcOK2OnY0BNI3zWBN2HbQqL1tvzM4ysFZuStAtbJRqJJusmrbEoQ4fAL3Q==
   dependencies:
-    "@lexical/list" "^0.12.2"
-    "@lexical/rich-text" "^0.12.2"
-    "@lexical/utils" "^0.12.2"
-    "@tryghost/kg-default-nodes" "^0.2.12"
-    lexical "^0.12.2"
+    "@lexical/list" "0.12.2"
+    "@lexical/rich-text" "0.12.2"
+    "@lexical/utils" "0.12.2"
+    "@tryghost/kg-default-nodes" "^1.0.0"
+    lexical "0.12.2"
 
-"@tryghost/kg-html-to-lexical@0.1.14":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-0.1.14.tgz#64f4ff84028193aaf3754f5febd2d0b8d9535ecd"
-  integrity sha512-g6gMBXJQ5fb1XyZFmF/2hPJ0TxoH67MUA6s4GYPSGJ9FAQbANUzPGkH5u/5Hr2goSGMNvB6kGK/6/lEHme0HeA==
+"@tryghost/kg-html-to-lexical@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-1.0.0.tgz#943cbdaa1b719116833ab800268559eed6f9ba58"
+  integrity sha512-9er/i2m1qmplRNv4rReeqfjCZZyv7Diaeuewz+cuZoHLQ5jK5k8j7bJpASd43LcLi0+OEpbWsXtge9Z3CT3Ocw==
   dependencies:
-    "@lexical/clipboard" "^0.12.2"
-    "@lexical/headless" "^0.12.2"
-    "@lexical/html" "^0.12.2"
-    "@lexical/link" "^0.12.2"
-    "@lexical/list" "^0.12.2"
-    "@lexical/rich-text" "^0.12.2"
-    "@tryghost/kg-default-nodes" "^0.2.12"
-    "@tryghost/kg-default-transforms" "^0.0.9"
-    jsdom "^22.1.0"
-    lexical "^0.12.2"
+    "@lexical/clipboard" "0.12.2"
+    "@lexical/headless" "0.12.2"
+    "@lexical/html" "0.12.2"
+    "@lexical/link" "0.12.2"
+    "@lexical/list" "0.12.2"
+    "@lexical/rich-text" "0.12.2"
+    "@tryghost/kg-default-nodes" "^1.0.0"
+    "@tryghost/kg-default-transforms" "^1.0.0"
+    jsdom "^23.0.0"
+    lexical "0.12.2"
 
-"@tryghost/kg-lexical-html-renderer@0.3.51":
-  version "0.3.51"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-0.3.51.tgz#c08c2d59f4ee4ba8794ae4023328e2336b1c82b4"
-  integrity sha512-9H21dvb/eTv/sdEHOSW+XQ25owgf7M1sfhNpbz5n8NoUmOW7uGBd/gXiTw9OWALYo7k+Kw+4sjBZSSegUi8Mxg==
+"@tryghost/kg-lexical-html-renderer@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-1.0.0.tgz#52aeb6360174faf6f236b74d0e90c0a22e657645"
+  integrity sha512-rXnJ45vGDRZTZ7tgCn3G6aJBa+Y+Fr+RJ/NORHjAsowk+6D18eTr5XyBVC2wvh5r2Zc98B7Nr7Cz6RP9EqoGyA==
   dependencies:
-    "@lexical/clipboard" "^0.12.2"
-    "@lexical/code" "^0.12.2"
-    "@lexical/headless" "^0.12.2"
-    "@lexical/link" "^0.12.2"
-    "@lexical/list" "^0.12.2"
-    "@lexical/rich-text" "^0.12.2"
-    "@tryghost/kg-default-nodes" "^0.2.12"
-    jsdom "^22.1.0"
-    lexical "^0.12.2"
+    "@lexical/clipboard" "0.12.2"
+    "@lexical/code" "0.12.2"
+    "@lexical/headless" "0.12.2"
+    "@lexical/link" "0.12.2"
+    "@lexical/list" "0.12.2"
+    "@lexical/rich-text" "0.12.2"
+    "@tryghost/kg-default-nodes" "^1.0.0"
+    jsdom "^23.0.0"
+    lexical "0.12.2"
     prettier "^3.0.0"
 
-"@tryghost/kg-markdown-html-renderer@^6.0.15":
-  version "6.0.15"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-6.0.15.tgz#ff314cad10d17ef87c201471066e158986c524d1"
-  integrity sha512-kK18d/Ert9QDU5aXUrv3C36RzwX3JHz8MlXYiVR4tpmiPgTa8r6bBMuUFkXQQjvP6P8+tJXDLaSMgFiF0Su8yg==
+"@tryghost/kg-markdown-html-renderer@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-7.0.0.tgz#d7bb999612253a44c3c59848ea411567ea207cdb"
+  integrity sha512-vqse8WtwjIZh18kjvszDnNzk6GDkNRaNk6FD5Ik/+t2XzTQkaC72HDUMiswROxy+WMiV7yck+piCp3SLVVM8/Q==
   dependencies:
     "@tryghost/kg-utils" "^1.0.23"
     markdown-it "^13.0.0"
@@ -7835,10 +7834,10 @@
     markdown-it-sup "^1.0.0"
     semver "^7.3.5"
 
-"@tryghost/kg-mobiledoc-html-renderer@6.0.15":
-  version "6.0.15"
-  resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-6.0.15.tgz#17fe6bb92393e0f559b9f45dd51320147ed032a3"
-  integrity sha512-CbbnkWyxmM0T4gyKKBvPWrhG+HV3CY/KhOKnzbIGmzOWOaFJw96MiJL0V8Sfnq0nu0bwKoD/2LGKn0RcAHOdFQ==
+"@tryghost/kg-mobiledoc-html-renderer@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-7.0.0.tgz#f0099836e910bf71b8b80379ea9b4e05de19413f"
+  integrity sha512-DSFzBX9oaOKFXONyFq8+1pjNUpLe9aQ2Z1ofYUZdc+q/IFecJgjXlI8ZqE9q+nTKj7bHzhAGKN9QQWgQUWfhCw==
   dependencies:
     "@tryghost/kg-utils" "^1.0.23"
     mobiledoc-dom-renderer "^0.7.0"
@@ -7858,10 +7857,10 @@
   dependencies:
     semver "^7.3.5"
 
-"@tryghost/koenig-lexical@0.5.27":
-  version "0.5.27"
-  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-0.5.27.tgz#3f63f2adef46a706dfcca24e5c1fd4fc576fe05b"
-  integrity sha512-Lg6mcj/Psn5KSbKNccWqtgk+ivAn8NV2H0BZ+xTc57VOm2jo+OFElTAbJmBjk2IoFZZfNxlDYx2M20rfW/PhKg==
+"@tryghost/koenig-lexical@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.0.1.tgz#00e24934f670c46b146fca28187a60c5e292b2e8"
+  integrity sha512-AMYSPlm9OGaYOWY9AhGvsHPgXdD/T2WSxIOPm8p01VXGTKPO/Md23URV1ReWxU2T1mvrVqdEdjPK9Pthh+yToA==
 
 "@tryghost/limit-service@1.2.12", "@tryghost/limit-service@^1.2.10":
   version "1.2.12"
@@ -7872,7 +7871,7 @@
     lodash "^4.17.21"
     luxon "^1.26.0"
 
-"@tryghost/logging@2.4.8", "@tryghost/logging@2.4.9", "@tryghost/logging@^2.4.7":
+"@tryghost/logging@2.4.8", "@tryghost/logging@^2.4.7":
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.8.tgz#a9e9abdbec823f0c6a009aa2f6847ce454b35475"
   integrity sha512-/pIeTcw9jpqWJ5/VyUn5sa3rsUxUHortykB4oYd5vKr16KgnrVOuGPCg4JqmdGfz2zrkgKaGd9cAsTNE++0Deg==
@@ -7889,6 +7888,23 @@
     json-stringify-safe "^5.0.1"
     lodash "^4.17.21"
 
+"@tryghost/logging@2.4.9":
+  version "2.4.9"
+  resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.9.tgz#b44de65796c486726e0a359676025058a91491c8"
+  integrity sha512-W6ePQueYnbZuamPXC1sp1iXpADc99Nsu/ImI6WKnhftbr+HLPy4cY966+mtiPBwH0KM4xyk7I3rlton9jn+JBg==
+  dependencies:
+    "@tryghost/bunyan-rotating-filestream" "^0.0.7"
+    "@tryghost/elasticsearch" "^3.0.16"
+    "@tryghost/http-stream" "^0.1.26"
+    "@tryghost/pretty-stream" "^0.1.21"
+    "@tryghost/root-utils" "^0.3.25"
+    bunyan "^1.8.15"
+    bunyan-loggly "^1.4.2"
+    fs-extra "^11.0.0"
+    gelf-stream "^1.1.1"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.17.21"
+
 "@tryghost/metrics@1.0.27":
   version "1.0.27"
   resolved "https://registry.yarnpkg.com/@tryghost/metrics/-/metrics-1.0.27.tgz#00713047bf4592a26a83e4b9bb05eb41f103ab91"
@@ -7970,6 +7986,15 @@
     moment "^2.29.1"
     prettyjson "^1.2.5"
 
+"@tryghost/pretty-stream@^0.1.21":
+  version "0.1.21"
+  resolved "https://registry.yarnpkg.com/@tryghost/pretty-stream/-/pretty-stream-0.1.21.tgz#93eb20c0bf1c4dab6c4f982defe381fb2f657ec9"
+  integrity sha512-xkN9TQ3NRwuiKuClg2CHxbZqK/mhNfziHv/iRdJ1UwAv8Q6s5cyKR64lP1v9BeIdIPzsczIpW7Xes3q+GeqTWw==
+  dependencies:
+    lodash "^4.17.21"
+    moment "^2.29.1"
+    prettyjson "^1.2.5"
+
 "@tryghost/promise@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@tryghost/promise/-/promise-0.3.4.tgz#b5437eb14a3d06e7d32f277e10975ff77061e16e"
@@ -7992,6 +8017,18 @@
     got "13.0.0"
     lodash "^4.17.21"
 
+"@tryghost/request@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/request/-/request-1.0.1.tgz#bab09018e03271fd31c30d3a0727893167806163"
+  integrity sha512-qB/RLGMOKq0bzSVf1+dWFlLE7kAxPxbfYIExIHibrSROU+7lUbbOZ078yrH1OzOK4qNQuCm2h/hpVLxpLTMWOA==
+  dependencies:
+    "@tryghost/errors" "^1.2.27"
+    "@tryghost/validator" "^0.2.7"
+    "@tryghost/version" "^0.1.25"
+    cacheable-lookup "7.0.0"
+    got "13.0.0"
+    lodash "^4.17.21"
+
 "@tryghost/root-utils@0.3.24":
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.24.tgz#91653fbadc882fb8510844f163a2231c87f30fab"
@@ -8071,6 +8108,17 @@
     moment-timezone "^0.5.23"
     validator "7.2.0"
 
+"@tryghost/validator@^0.2.7":
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/@tryghost/validator/-/validator-0.2.7.tgz#b7ff113532854bd0512aed7dd8f702fe677f977e"
+  integrity sha512-CqYy9g9SH8Eh4jUA80Pcw3xORL7F+MnWLg4Vp+JbpRkjM8llrkOcKaq80a1qJOSo/rl133tRnAQSM3yi7yTleA==
+  dependencies:
+    "@tryghost/errors" "^1.2.27"
+    "@tryghost/tpl" "^0.1.27"
+    lodash "^4.17.21"
+    moment-timezone "^0.5.23"
+    validator "7.2.0"
+
 "@tryghost/version@0.1.24", "@tryghost/version@^0.1.24":
   version "0.1.24"
   resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.24.tgz#eb8bc345929ba8f67c3f36757bd91c12f701a5f5"
@@ -8079,6 +8127,14 @@
     "@tryghost/root-utils" "^0.3.24"
     semver "^7.3.5"
 
+"@tryghost/version@^0.1.25":
+  version "0.1.25"
+  resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.25.tgz#91af697887e5a2a4cb27acfb2a72ee011af35c5e"
+  integrity sha512-1YUZR/5ea+wRrwJ9gfr8oTepXmMHnWhcUAbAAbDNOqVOX5GpsbTBEFIwJJsKTTCRWclaVds5V6eUv84qNoE7MQ==
+  dependencies:
+    "@tryghost/root-utils" "^0.3.25"
+    semver "^7.3.5"
+
 "@tryghost/webhook-mock-receiver@0.2.8":
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/@tryghost/webhook-mock-receiver/-/webhook-mock-receiver-0.2.8.tgz#1cb3bb5de667f597f2eaa25aff3e9e572212cafa"
@@ -9412,7 +9468,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agent-base@^7.0.2:
+agent-base@^7.0.2, agent-base@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
   integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
@@ -14052,6 +14108,14 @@ data-urls@^4.0.0:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^12.0.0"
 
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
+  dependencies:
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+
 date-fns@2.30.0, date-fns@^2.28.0, date-fns@^2.30.0:
   version "2.30.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
@@ -14891,7 +14955,7 @@ ember-auto-import@2.7.0, "ember-auto-import@^1.12.1 || ^2.4.3", ember-auto-impor
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^3.0.0"
 
-ember-auto-import@^1.11.2, ember-auto-import@^1.11.3, ember-auto-import@^1.12.0:
+ember-auto-import@^1.11.3, ember-auto-import@^1.12.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.2.tgz#cc7298ee5c0654b0249267de68fb27a2861c3579"
   integrity sha512-gLqML2k77AuUiXxWNon1FSzuG1DV7PEPpCLCU5aJvf6fdL6rmFfElsZRh+8ELEB/qP9dT+LHjNEunVzd2dYc8A==
@@ -14926,25 +14990,7 @@ ember-auto-import@^1.11.2, ember-auto-import@^1.11.3, ember-auto-import@^1.12.0:
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-basic-dropdown@^3.0.11:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-3.1.0.tgz#47c292de890d1958057736c00b8eb2b8017d530b"
-  integrity sha512-UISvgJHfiJ8FeXqH8ZN+NmoImN8p6Sb+85qlEv853hLuEfEYnFUqLNhea8nNl9CpFqcD3yU4dKbhYtc6nB39aQ==
-  dependencies:
-    "@ember/render-modifiers" "^2.0.0"
-    "@embroider/macros" "^0.47.2"
-    "@embroider/util" "^0.47.2"
-    "@glimmer/component" "^1.0.4"
-    "@glimmer/tracking" "^1.0.4"
-    ember-cli-babel "^7.26.6"
-    ember-cli-htmlbars "^6.0.0"
-    ember-cli-typescript "^4.2.1"
-    ember-element-helper "^0.5.5"
-    ember-maybe-in-element "^2.0.3"
-    ember-style-modifier "^0.7.0"
-    ember-truth-helpers "^2.1.0 || ^3.0.0"
-
-ember-basic-dropdown@^6.0.0:
+ember-basic-dropdown@6.0.2, ember-basic-dropdown@^3.0.11, ember-basic-dropdown@^6.0.0:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-6.0.2.tgz#af47dbd544c605cf9cbc62225185616356aeef52"
   integrity sha512-JgI/cy7eS/Y2WoQl7B2Mko/1aFTAlxr5d+KpQeH7rBKOFml7IQtLvhiDQrpU/FLkrQ9aLNEJtzwtDZV1xQxAKA==
@@ -15574,7 +15620,7 @@ ember-cli@3.24.0:
     workerpool "^6.0.3"
     yam "^1.0.0"
 
-ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.4, ember-compatibility-helpers@^1.2.5:
+ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.7.tgz#b4f138bba844f8f38f0b8f4d7e928841cd5e6591"
   integrity sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==
@@ -15699,7 +15745,7 @@ ember-drag-drop@0.4.8:
   dependencies:
     ember-cli-babel "^6.6.0"
 
-ember-element-helper@^0.5.0, ember-element-helper@^0.5.5:
+ember-element-helper@^0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.5.5.tgz#4a9ecb4dce57ee7f5ceb868a53c7b498c729f056"
   integrity sha512-Tu3hsI+/mjHBUvw62Qi+YDZtKkn59V66CjwbgfNTZZ7aHf4gFm1ow4zJ4WLnpnie8p9FvOmIUxwl5HvgPJIcFA==
@@ -15810,7 +15856,7 @@ ember-in-element-polyfill@^1.0.1:
     ember-cli-htmlbars "^5.3.1"
     ember-cli-version-checker "^5.1.2"
 
-ember-in-viewport@4.1.0:
+ember-in-viewport@4.1.0, ember-in-viewport@~3.10.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-4.1.0.tgz#a9359a1e4a99d9d6ab32e926749dc131084ed896"
   integrity sha512-3y6qWXuJPPc6vX2GfxWgtr+sDjb+bdZF9babstr0lTd8t8c1b42gJ13GaJqlylZIyZz2dEXFCimX9WAeudPv9g==
@@ -15824,18 +15870,6 @@ ember-in-viewport@4.1.0:
     intersection-observer-admin "~0.3.2"
     raf-pool "~0.1.4"
 
-ember-in-viewport@~3.10.2:
-  version "3.10.3"
-  resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.10.3.tgz#317472bb82bed11f7895821b799349c6a7406e81"
-  integrity sha512-hSX7p+G6hJjZaY2BAqzyuiMP7QIHzQ4g0+ZBnEwAa8GMbILFAtzPx5A4XEX8wY6dSzhHB9n9jkcWZdmaML6q8A==
-  dependencies:
-    ember-auto-import "^1.11.2"
-    ember-cli-babel "^7.26.3"
-    ember-modifier "^2.1.0"
-    fast-deep-equal "^2.0.1"
-    intersection-observer-admin "~0.3.2"
-    raf-pool "~0.1.4"
-
 ember-infinity@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-2.3.0.tgz#73fe13883c212147bfba4f0b2fe8c8d2a96887d9"
@@ -15938,20 +15972,7 @@ ember-modifier@4.1.0, "ember-modifier@^2.1.2 || ^3.0.0 || ^4.0.0", "ember-modifi
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-string-utils "^1.1.0"
 
-ember-modifier@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-2.1.2.tgz#62d18faedf972dcd9d34f90d5321fbc943d139b1"
-  integrity sha512-3Lsu1fV1sIGa66HOW07RZc6EHISwKt5VA5AUnFss2HX6OTfpxTJ2qvPctt2Yt0XPQXJ4G6BQasr/F35CX7UGJA==
-  dependencies:
-    ember-cli-babel "^7.22.1"
-    ember-cli-normalize-entity-name "^1.0.0"
-    ember-cli-string-utils "^1.1.0"
-    ember-cli-typescript "^3.1.3"
-    ember-compatibility-helpers "^1.2.4"
-    ember-destroyable-polyfill "^2.0.2"
-    ember-modifier-manager-polyfill "^1.2.0"
-
-ember-modifier@^3.0.0, ember-modifier@^3.2.7:
+ember-modifier@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.2.7.tgz#f2d35b7c867cbfc549e1acd8d8903c5ecd02ea4b"
   integrity sha512-ezcPQhH8jUfcJQbbHji4/ZG/h0yyj1jRDknfYue/ypQS8fM8LrGcCMo0rjDZLzL1Vd11InjNs3BD7BdxFlzGoA==
@@ -16109,14 +16130,6 @@ ember-source@3.24.0:
     semver "^6.1.1"
     silent-error "^1.1.1"
 
-ember-style-modifier@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.7.0.tgz#85b3dfd7e4bc2bd546df595f2dab4fb141cf7d87"
-  integrity sha512-iDzffiwJcb9j6gu3g8CxzZOTvRZ0BmLMEFl+uyqjiaj72VVND9+HbLyQRw1/ewPAtinhSktxxTTdwU/JO+stLw==
-  dependencies:
-    ember-cli-babel "^7.26.6"
-    ember-modifier "^3.0.0"
-
 "ember-style-modifier@^0.8.0 || ^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-1.0.0.tgz#96e5d342a255d8c1cba1637779dbb1949322e139"
@@ -19241,6 +19254,13 @@ html-encoding-sniffer@^3.0.0:
   dependencies:
     whatwg-encoding "^2.0.0"
 
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
+  dependencies:
+    whatwg-encoding "^3.1.1"
+
 html-entities@^2.3.6:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
@@ -19427,6 +19447,14 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673"
+  integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
 http-proxy@^1.13.1, http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
@@ -19510,6 +19538,14 @@ https-proxy-agent@^7.0.1:
     agent-base "^7.0.2"
     debug "4"
 
+https-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
+  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
 https@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
@@ -21069,7 +21105,7 @@ jscodeshift@^0.15.1:
     temp "^0.8.4"
     write-file-atomic "^2.3.0"
 
-jsdom@22.1.0, jsdom@^22.0.0, jsdom@^22.1.0, jsdom@~22.1.0:
+jsdom@22.1.0, jsdom@^22.0.0, jsdom@~22.1.0:
   version "22.1.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8"
   integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==
@@ -21131,6 +21167,33 @@ jsdom@^16.4.0:
     ws "^7.4.6"
     xml-name-validator "^3.0.0"
 
+jsdom@^23.0.0:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-23.0.1.tgz#ede7ff76e89ca035b11178d200710d8982ebfee0"
+  integrity sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==
+  dependencies:
+    cssstyle "^3.0.0"
+    data-urls "^5.0.0"
+    decimal.js "^10.4.3"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.2"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.7"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.6.0"
+    saxes "^6.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.1.3"
+    w3c-xmlserializer "^5.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+    ws "^8.14.2"
+    xml-name-validator "^5.0.0"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -21678,7 +21741,7 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lexical@^0.12.2:
+lexical@0.12.2:
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/lexical/-/lexical-0.12.2.tgz#68535e145715d5788374495c9ee0420e417d792b"
   integrity sha512-Kxavd+ETjxtVwG/hvPd6WZfXD44sLOKe9Vlkwxy7lBQ1qZArS+rZfs+u5iXwXe6tX9f2PIM0u3RHsrCEDDE0fw==
@@ -24197,6 +24260,11 @@ nwsapi@^2.2.0, nwsapi@^2.2.4:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5"
   integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==
 
+nwsapi@^2.2.7:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
+  integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
+
 nx@16.8.1:
   version "16.8.1"
   resolved "https://registry.yarnpkg.com/nx/-/nx-16.8.1.tgz#b3b084da5f880c638debbefbf33eeccb96633595"
@@ -26573,6 +26641,11 @@ punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
+punycode@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
 puppeteer-core@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-2.1.1.tgz#e9b3fbc1237b4f66e25999832229e9db3e0b90ed"
@@ -30102,7 +30175,7 @@ totalist@^3.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.0.tgz#4ef9c58c5f095255cdc3ff2a0a55091c57a3a1bd"
   integrity sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==
 
-tough-cookie@4.1.3, tough-cookie@^4.0.0, tough-cookie@^4.1.2:
+tough-cookie@4.1.3, tough-cookie@^4.0.0, tough-cookie@^4.1.2, tough-cookie@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
   integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
@@ -30134,6 +30207,13 @@ tr46@^4.1.1:
   dependencies:
     punycode "^2.3.0"
 
+tr46@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec"
+  integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==
+  dependencies:
+    punycode "^2.3.1"
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -31197,6 +31277,13 @@ w3c-xmlserializer@^4.0.0:
   dependencies:
     xml-name-validator "^4.0.0"
 
+w3c-xmlserializer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
+  dependencies:
+    xml-name-validator "^5.0.0"
+
 walk-sync@3.0.0, walk-sync@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-3.0.0.tgz#67f882925021e20569a1edd560b8da31da8d171c"
@@ -31420,6 +31507,13 @@ whatwg-encoding@^2.0.0:
   dependencies:
     iconv-lite "0.6.3"
 
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
+  dependencies:
+    iconv-lite "0.6.3"
+
 whatwg-fetch@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
@@ -31435,6 +31529,11 @@ whatwg-mimetype@^3.0.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
   integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
+
 whatwg-url@^12.0.0, whatwg-url@^12.0.1:
   version "12.0.1"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
@@ -31443,6 +31542,14 @@ whatwg-url@^12.0.0, whatwg-url@^12.0.1:
     tr46 "^4.1.1"
     webidl-conversions "^7.0.0"
 
+whatwg-url@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.0.0.tgz#00baaa7fd198744910c4b1ef68378f2200e4ceb6"
+  integrity sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==
+  dependencies:
+    tr46 "^5.0.0"
+    webidl-conversions "^7.0.0"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -31706,6 +31813,11 @@ xml-name-validator@^4.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
+
 xml@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"

From 8f43cc9ad2cc37130d9258e6a2e2b69d6335f1f9 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@ghost.org>
Date: Wed, 6 Dec 2023 12:12:37 +0000
Subject: [PATCH 08/36] Fixed horizontal positioning of TK indicators on wider
 cards (#19257)

no issue

- bumped `@tryghost/koenig-lexical` for improved positioning behaviour
---
 ghost/admin/package.json | 2 +-
 yarn.lock                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 45f6ca5c25..0b18d48fdf 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -46,7 +46,7 @@
     "@tryghost/helpers": "1.1.88",
     "@tryghost/kg-clean-basic-html": "4.0.0",
     "@tryghost/kg-converters": "0.0.22",
-    "@tryghost/koenig-lexical": "1.0.1",
+    "@tryghost/koenig-lexical": "1.0.2",
     "@tryghost/limit-service": "1.2.12",
     "@tryghost/members-csv": "0.0.0",
     "@tryghost/nql": "0.12.0",
diff --git a/yarn.lock b/yarn.lock
index d49fe1569b..0f1ca1e100 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7857,10 +7857,10 @@
   dependencies:
     semver "^7.3.5"
 
-"@tryghost/koenig-lexical@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.0.1.tgz#00e24934f670c46b146fca28187a60c5e292b2e8"
-  integrity sha512-AMYSPlm9OGaYOWY9AhGvsHPgXdD/T2WSxIOPm8p01VXGTKPO/Md23URV1ReWxU2T1mvrVqdEdjPK9Pthh+yToA==
+"@tryghost/koenig-lexical@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.0.2.tgz#2aeb07165a8ddab79f4765dc299a8c046c7238c1"
+  integrity sha512-vDLdy66Pp1yhLGWG80WaZSQJ+SYLDoY41RqYhUKPq+x2PX+H+qdGgB97OVTK/w4kXPXFNZvhpbgWRTdom2Vnzg==
 
 "@tryghost/limit-service@1.2.12", "@tryghost/limit-service@^1.2.10":
   version "1.2.12"

From 57205b4c967e2cdcded559ce24bed433ea68cb35 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Wed, 6 Dec 2023 13:08:57 +0100
Subject: [PATCH 09/36] Updated lockfile

---
 yarn.lock | 201 +++++++++++++++++++++++++++---------------------------
 1 file changed, 102 insertions(+), 99 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0f1ca1e100..271f71c1d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2668,17 +2668,17 @@
   resolved "https://registry.yarnpkg.com/@ebay/nice-modal-react/-/nice-modal-react-1.2.13.tgz#7e8229fe3a48a11f27cd7f5e21190d82d6f609ce"
   integrity sha512-jx8xIWe/Up4tpNuM02M+rbnLoxdngTGk3Y8LjJsLGXXcSoKd/+eZStZcAlIO/jwxyz/bhPZnpqPJZWAmhOofuA==
 
-"@elastic/elasticsearch@8.10.0":
-  version "8.10.0"
-  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.10.0.tgz#48842b3358b8ea4d37d75cff29fdd37fdf0b2996"
-  integrity sha512-RIEyqz0D18bz/dK+wJltaak+7wKaxDELxuiwOJhuMrvbrBsYDFnEoTdP/TZ0YszHBgnRPGqBDBgH/FHNgHObiQ==
+"@elastic/elasticsearch@8.10.0", "@elastic/elasticsearch@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.npmjs.org/@elastic/elasticsearch/-/elasticsearch-8.5.0.tgz#407aee0950a082ee76735a567f2571cf4301d4ea"
+  integrity sha512-iOgr/3zQi84WmPhAplnK2W13R89VXD2oc6WhlQmH3bARQwmI+De23ZJKBEn7bvuG/AHMAqasPXX7uJIiJa2MqQ==
   dependencies:
-    "@elastic/transport" "^8.3.4"
+    "@elastic/transport" "^8.2.0"
     tslib "^2.4.0"
 
-"@elastic/transport@^8.3.4":
+"@elastic/transport@^8.2.0":
   version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@elastic/transport/-/transport-8.3.4.tgz#43c852e848dc8502bbd7f23f2d61bd5665cded99"
+  resolved "https://registry.npmjs.org/@elastic/transport/-/transport-8.3.4.tgz#43c852e848dc8502bbd7f23f2d61bd5665cded99"
   integrity sha512-+0o8o74sbzu3BO7oOZiP9ycjzzdOt4QwmMEjFc1zfO7M0Fh7QX1xrpKqZbSd8vBwihXNlSq/EnMPfgD2uFEmFg==
   dependencies:
     debug "^4.3.4"
@@ -2872,7 +2872,7 @@
     ember-cli-babel "^7.22.1"
     ember-compatibility-helpers "^1.1.1"
 
-"@ember/render-modifiers@2.1.0", "@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.4":
+"@ember/render-modifiers@2.1.0", "@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.0", "@ember/render-modifiers@^2.0.4":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.1.0.tgz#f4fff95a8b5cfbe947ec46644732d511711c5bf9"
   integrity sha512-LruhfoDv2itpk0fA0IC76Sxjcnq/7BC6txpQo40hOko8Dn6OxwQfxkPIbZGV0Cz7df+iX+VJrcYzNIvlc3w2EQ==
@@ -3010,6 +3010,19 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
+"@embroider/macros@0.47.2", "@embroider/macros@^0.47.2":
+  version "0.47.2"
+  resolved "https://registry.npmjs.org/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0"
+  integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg==
+  dependencies:
+    "@embroider/shared-internals" "0.47.2"
+    assert-never "^1.2.1"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
 "@embroider/macros@1.13.3", "@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.12.2", "@embroider/macros@^1.2.0", "@embroider/macros@^1.8.0", "@embroider/macros@^1.8.3", "@embroider/macros@^1.9.0":
   version "1.13.3"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.3.tgz#e1ff584e01bcdebb9fa9f6982ecc2ea89886867f"
@@ -3037,6 +3050,19 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
+"@embroider/shared-internals@0.47.2":
+  version "0.47.2"
+  resolved "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-0.47.2.tgz#24e9fa0dd9c529d5c996ee1325729ea08d1fa19f"
+  integrity sha512-SxdZYjAE0fiM5zGDz+12euWIsQZ1tsfR1k+NKmiWMyLhA5T3pNgbR2/Djvx/cVIxOtEavGGSllYbzRKBtV4xMg==
+  dependencies:
+    babel-import-util "^0.2.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
 "@embroider/shared-internals@2.5.1", "@embroider/shared-internals@^2.0.0":
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.1.tgz#a4d8c057cbff293ef6eb29ee6537f263d206b444"
@@ -3097,6 +3123,15 @@
     broccoli-funnel "^3.0.5"
     ember-cli-babel "^7.23.1"
 
+"@embroider/util@^0.47.2":
+  version "0.47.2"
+  resolved "https://registry.npmjs.org/@embroider/util/-/util-0.47.2.tgz#d06497b4b84c07ed9c7b628293bb019c533f4556"
+  integrity sha512-g9OqnFJPktGu9NS0Ug3Pxz1JE3jeDceeVE4IrlxDrVmBXMA/GrBvpwjolWgl6jh97cMJyExdz62jIvPHV4256Q==
+  dependencies:
+    "@embroider/macros" "0.47.2"
+    broccoli-funnel "^3.0.5"
+    ember-cli-babel "^7.23.1"
+
 "@emotion/babel-plugin@^11.11.0":
   version "11.11.0"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c"
@@ -7605,15 +7640,6 @@
     "@tryghost/debug" "^0.1.26"
     split2 "4.2.0"
 
-"@tryghost/elasticsearch@^3.0.16":
-  version "3.0.16"
-  resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.16.tgz#73df153a5a3e699fe3e60cbbaea129adee6309b4"
-  integrity sha512-MaoOAwt8TMRYTVV9ozUi4/2tGzJ/spigFWnG+8LyPbdWSxrah7HPnUWNEp8lUjiwH8Zr1eoLkgKZ8xUFIFSwEg==
-  dependencies:
-    "@elastic/elasticsearch" "8.10.0"
-    "@tryghost/debug" "^0.1.27"
-    split2 "4.2.0"
-
 "@tryghost/email-mock-receiver@0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@tryghost/email-mock-receiver/-/email-mock-receiver-0.3.2.tgz#abd8086935a95a996b6c5c803478a9f81dcae19a"
@@ -7635,7 +7661,7 @@
     focus-trap "^6.7.2"
     postcss-preset-env "^7.3.1"
 
-"@tryghost/errors@1.2.26", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.3":
+"@tryghost/errors@1.2.26", "@tryghost/errors@1.2.27", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.27", "@tryghost/errors@^1.2.3":
   version "1.2.26"
   resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.26.tgz#0d0503a51e681998421548fbddbdd7376384c457"
   integrity sha512-s/eynvVUiAhHP0HB7CPQs7qH7Pm1quJ2iUMTCuH7HV8LqiGoQFNc21/5R4lRv+2Jt3yf69UPCs/6G+kAgZipNw==
@@ -7644,15 +7670,6 @@
     lodash "^4.17.21"
     uuid "^9.0.0"
 
-"@tryghost/errors@1.2.27", "@tryghost/errors@^1.2.27":
-  version "1.2.27"
-  resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.27.tgz#3d552c007b5b7ce3e72cbb727c42076446a24638"
-  integrity sha512-5m4IH7S5bCIFX+qwTgaMsnPK7ZnPu1mw8kiIFiBQEGs/996GkKGo/876mbrjmkh8ScWNynL6O179753bmMRmCQ==
-  dependencies:
-    "@stdlib/utils-copy" "^0.0.7"
-    lodash "^4.17.21"
-    uuid "^9.0.0"
-
 "@tryghost/express-test@0.13.7":
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/@tryghost/express-test/-/express-test-0.13.7.tgz#fee867065282298095a194c5e70386e393d21d57"
@@ -7691,14 +7708,6 @@
     "@tryghost/errors" "^1.2.26"
     "@tryghost/request" "^1.0.0"
 
-"@tryghost/http-stream@^0.1.26":
-  version "0.1.26"
-  resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.26.tgz#b48da359e8b2ec27a6a302d2d0e0126922242f2e"
-  integrity sha512-Y8XLy1iksUKWnVnXTqsexH/H9sE6HnHTgM5WvDwppZIDcar0Wv/07AX83mLLY00uQ0MvXHzHSeBWdhUH9mnbjQ==
-  dependencies:
-    "@tryghost/errors" "^1.2.27"
-    "@tryghost/request" "^1.0.1"
-
 "@tryghost/image-transform@1.2.11":
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/@tryghost/image-transform/-/image-transform-1.2.11.tgz#82463d97f8747db6db70165a04e824eed6791fee"
@@ -7871,7 +7880,7 @@
     lodash "^4.17.21"
     luxon "^1.26.0"
 
-"@tryghost/logging@2.4.8", "@tryghost/logging@^2.4.7":
+"@tryghost/logging@2.4.8", "@tryghost/logging@2.4.9", "@tryghost/logging@^2.4.7":
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.8.tgz#a9e9abdbec823f0c6a009aa2f6847ce454b35475"
   integrity sha512-/pIeTcw9jpqWJ5/VyUn5sa3rsUxUHortykB4oYd5vKr16KgnrVOuGPCg4JqmdGfz2zrkgKaGd9cAsTNE++0Deg==
@@ -7888,23 +7897,6 @@
     json-stringify-safe "^5.0.1"
     lodash "^4.17.21"
 
-"@tryghost/logging@2.4.9":
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.9.tgz#b44de65796c486726e0a359676025058a91491c8"
-  integrity sha512-W6ePQueYnbZuamPXC1sp1iXpADc99Nsu/ImI6WKnhftbr+HLPy4cY966+mtiPBwH0KM4xyk7I3rlton9jn+JBg==
-  dependencies:
-    "@tryghost/bunyan-rotating-filestream" "^0.0.7"
-    "@tryghost/elasticsearch" "^3.0.16"
-    "@tryghost/http-stream" "^0.1.26"
-    "@tryghost/pretty-stream" "^0.1.21"
-    "@tryghost/root-utils" "^0.3.25"
-    bunyan "^1.8.15"
-    bunyan-loggly "^1.4.2"
-    fs-extra "^11.0.0"
-    gelf-stream "^1.1.1"
-    json-stringify-safe "^5.0.1"
-    lodash "^4.17.21"
-
 "@tryghost/metrics@1.0.27":
   version "1.0.27"
   resolved "https://registry.yarnpkg.com/@tryghost/metrics/-/metrics-1.0.27.tgz#00713047bf4592a26a83e4b9bb05eb41f103ab91"
@@ -7986,15 +7978,6 @@
     moment "^2.29.1"
     prettyjson "^1.2.5"
 
-"@tryghost/pretty-stream@^0.1.21":
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/@tryghost/pretty-stream/-/pretty-stream-0.1.21.tgz#93eb20c0bf1c4dab6c4f982defe381fb2f657ec9"
-  integrity sha512-xkN9TQ3NRwuiKuClg2CHxbZqK/mhNfziHv/iRdJ1UwAv8Q6s5cyKR64lP1v9BeIdIPzsczIpW7Xes3q+GeqTWw==
-  dependencies:
-    lodash "^4.17.21"
-    moment "^2.29.1"
-    prettyjson "^1.2.5"
-
 "@tryghost/promise@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@tryghost/promise/-/promise-0.3.4.tgz#b5437eb14a3d06e7d32f277e10975ff77061e16e"
@@ -8017,18 +8000,6 @@
     got "13.0.0"
     lodash "^4.17.21"
 
-"@tryghost/request@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@tryghost/request/-/request-1.0.1.tgz#bab09018e03271fd31c30d3a0727893167806163"
-  integrity sha512-qB/RLGMOKq0bzSVf1+dWFlLE7kAxPxbfYIExIHibrSROU+7lUbbOZ078yrH1OzOK4qNQuCm2h/hpVLxpLTMWOA==
-  dependencies:
-    "@tryghost/errors" "^1.2.27"
-    "@tryghost/validator" "^0.2.7"
-    "@tryghost/version" "^0.1.25"
-    cacheable-lookup "7.0.0"
-    got "13.0.0"
-    lodash "^4.17.21"
-
 "@tryghost/root-utils@0.3.24":
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.24.tgz#91653fbadc882fb8510844f163a2231c87f30fab"
@@ -8108,17 +8079,6 @@
     moment-timezone "^0.5.23"
     validator "7.2.0"
 
-"@tryghost/validator@^0.2.7":
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/@tryghost/validator/-/validator-0.2.7.tgz#b7ff113532854bd0512aed7dd8f702fe677f977e"
-  integrity sha512-CqYy9g9SH8Eh4jUA80Pcw3xORL7F+MnWLg4Vp+JbpRkjM8llrkOcKaq80a1qJOSo/rl133tRnAQSM3yi7yTleA==
-  dependencies:
-    "@tryghost/errors" "^1.2.27"
-    "@tryghost/tpl" "^0.1.27"
-    lodash "^4.17.21"
-    moment-timezone "^0.5.23"
-    validator "7.2.0"
-
 "@tryghost/version@0.1.24", "@tryghost/version@^0.1.24":
   version "0.1.24"
   resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.24.tgz#eb8bc345929ba8f67c3f36757bd91c12f701a5f5"
@@ -8127,14 +8087,6 @@
     "@tryghost/root-utils" "^0.3.24"
     semver "^7.3.5"
 
-"@tryghost/version@^0.1.25":
-  version "0.1.25"
-  resolved "https://registry.yarnpkg.com/@tryghost/version/-/version-0.1.25.tgz#91af697887e5a2a4cb27acfb2a72ee011af35c5e"
-  integrity sha512-1YUZR/5ea+wRrwJ9gfr8oTepXmMHnWhcUAbAAbDNOqVOX5GpsbTBEFIwJJsKTTCRWclaVds5V6eUv84qNoE7MQ==
-  dependencies:
-    "@tryghost/root-utils" "^0.3.25"
-    semver "^7.3.5"
-
 "@tryghost/webhook-mock-receiver@0.2.8":
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/@tryghost/webhook-mock-receiver/-/webhook-mock-receiver-0.2.8.tgz#1cb3bb5de667f597f2eaa25aff3e9e572212cafa"
@@ -14955,7 +14907,7 @@ ember-auto-import@2.7.0, "ember-auto-import@^1.12.1 || ^2.4.3", ember-auto-impor
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^3.0.0"
 
-ember-auto-import@^1.11.3, ember-auto-import@^1.12.0:
+ember-auto-import@^1.11.2, ember-auto-import@^1.11.3, ember-auto-import@^1.12.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.2.tgz#cc7298ee5c0654b0249267de68fb27a2861c3579"
   integrity sha512-gLqML2k77AuUiXxWNon1FSzuG1DV7PEPpCLCU5aJvf6fdL6rmFfElsZRh+8ELEB/qP9dT+LHjNEunVzd2dYc8A==
@@ -14990,7 +14942,25 @@ ember-auto-import@^1.11.3, ember-auto-import@^1.12.0:
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-basic-dropdown@6.0.2, ember-basic-dropdown@^3.0.11, ember-basic-dropdown@^6.0.0:
+ember-basic-dropdown@^3.0.11:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/ember-basic-dropdown/-/ember-basic-dropdown-3.1.0.tgz#47c292de890d1958057736c00b8eb2b8017d530b"
+  integrity sha512-UISvgJHfiJ8FeXqH8ZN+NmoImN8p6Sb+85qlEv853hLuEfEYnFUqLNhea8nNl9CpFqcD3yU4dKbhYtc6nB39aQ==
+  dependencies:
+    "@ember/render-modifiers" "^2.0.0"
+    "@embroider/macros" "^0.47.2"
+    "@embroider/util" "^0.47.2"
+    "@glimmer/component" "^1.0.4"
+    "@glimmer/tracking" "^1.0.4"
+    ember-cli-babel "^7.26.6"
+    ember-cli-htmlbars "^6.0.0"
+    ember-cli-typescript "^4.2.1"
+    ember-element-helper "^0.5.5"
+    ember-maybe-in-element "^2.0.3"
+    ember-style-modifier "^0.7.0"
+    ember-truth-helpers "^2.1.0 || ^3.0.0"
+
+ember-basic-dropdown@^6.0.0:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-6.0.2.tgz#af47dbd544c605cf9cbc62225185616356aeef52"
   integrity sha512-JgI/cy7eS/Y2WoQl7B2Mko/1aFTAlxr5d+KpQeH7rBKOFml7IQtLvhiDQrpU/FLkrQ9aLNEJtzwtDZV1xQxAKA==
@@ -15620,7 +15590,7 @@ ember-cli@3.24.0:
     workerpool "^6.0.3"
     yam "^1.0.0"
 
-ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.5:
+ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.4, ember-compatibility-helpers@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.7.tgz#b4f138bba844f8f38f0b8f4d7e928841cd5e6591"
   integrity sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==
@@ -15745,7 +15715,7 @@ ember-drag-drop@0.4.8:
   dependencies:
     ember-cli-babel "^6.6.0"
 
-ember-element-helper@^0.5.0:
+ember-element-helper@^0.5.0, ember-element-helper@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.5.5.tgz#4a9ecb4dce57ee7f5ceb868a53c7b498c729f056"
   integrity sha512-Tu3hsI+/mjHBUvw62Qi+YDZtKkn59V66CjwbgfNTZZ7aHf4gFm1ow4zJ4WLnpnie8p9FvOmIUxwl5HvgPJIcFA==
@@ -15856,7 +15826,7 @@ ember-in-element-polyfill@^1.0.1:
     ember-cli-htmlbars "^5.3.1"
     ember-cli-version-checker "^5.1.2"
 
-ember-in-viewport@4.1.0, ember-in-viewport@~3.10.2:
+ember-in-viewport@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-4.1.0.tgz#a9359a1e4a99d9d6ab32e926749dc131084ed896"
   integrity sha512-3y6qWXuJPPc6vX2GfxWgtr+sDjb+bdZF9babstr0lTd8t8c1b42gJ13GaJqlylZIyZz2dEXFCimX9WAeudPv9g==
@@ -15870,6 +15840,18 @@ ember-in-viewport@4.1.0, ember-in-viewport@~3.10.2:
     intersection-observer-admin "~0.3.2"
     raf-pool "~0.1.4"
 
+ember-in-viewport@~3.10.2:
+  version "3.10.3"
+  resolved "https://registry.npmjs.org/ember-in-viewport/-/ember-in-viewport-3.10.3.tgz#317472bb82bed11f7895821b799349c6a7406e81"
+  integrity sha512-hSX7p+G6hJjZaY2BAqzyuiMP7QIHzQ4g0+ZBnEwAa8GMbILFAtzPx5A4XEX8wY6dSzhHB9n9jkcWZdmaML6q8A==
+  dependencies:
+    ember-auto-import "^1.11.2"
+    ember-cli-babel "^7.26.3"
+    ember-modifier "^2.1.0"
+    fast-deep-equal "^2.0.1"
+    intersection-observer-admin "~0.3.2"
+    raf-pool "~0.1.4"
+
 ember-infinity@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-2.3.0.tgz#73fe13883c212147bfba4f0b2fe8c8d2a96887d9"
@@ -15972,7 +15954,20 @@ ember-modifier@4.1.0, "ember-modifier@^2.1.2 || ^3.0.0 || ^4.0.0", "ember-modifi
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-string-utils "^1.1.0"
 
-ember-modifier@^3.2.7:
+ember-modifier@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ember-modifier/-/ember-modifier-2.1.2.tgz#62d18faedf972dcd9d34f90d5321fbc943d139b1"
+  integrity sha512-3Lsu1fV1sIGa66HOW07RZc6EHISwKt5VA5AUnFss2HX6OTfpxTJ2qvPctt2Yt0XPQXJ4G6BQasr/F35CX7UGJA==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "^3.1.3"
+    ember-compatibility-helpers "^1.2.4"
+    ember-destroyable-polyfill "^2.0.2"
+    ember-modifier-manager-polyfill "^1.2.0"
+
+ember-modifier@^3.0.0, ember-modifier@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.2.7.tgz#f2d35b7c867cbfc549e1acd8d8903c5ecd02ea4b"
   integrity sha512-ezcPQhH8jUfcJQbbHji4/ZG/h0yyj1jRDknfYue/ypQS8fM8LrGcCMo0rjDZLzL1Vd11InjNs3BD7BdxFlzGoA==
@@ -16130,6 +16125,14 @@ ember-source@3.24.0:
     semver "^6.1.1"
     silent-error "^1.1.1"
 
+ember-style-modifier@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.npmjs.org/ember-style-modifier/-/ember-style-modifier-0.7.0.tgz#85b3dfd7e4bc2bd546df595f2dab4fb141cf7d87"
+  integrity sha512-iDzffiwJcb9j6gu3g8CxzZOTvRZ0BmLMEFl+uyqjiaj72VVND9+HbLyQRw1/ewPAtinhSktxxTTdwU/JO+stLw==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+    ember-modifier "^3.0.0"
+
 "ember-style-modifier@^0.8.0 || ^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-1.0.0.tgz#96e5d342a255d8c1cba1637779dbb1949322e139"

From 3bc068123cede7efd5e6ae4d0088636a71e47f96 Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Wed, 6 Dec 2023 17:36:18 +0100
Subject: [PATCH 10/36] Wired up checkbox to toggle tier visibility (#19260)

fixes PROD-200
---
 .../membership/tiers/TierDetailModal.tsx      | 46 +++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
index 9abc1ea4db..7ce5f5ef14 100644
--- a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx
@@ -8,7 +8,7 @@ import {ErrorMessages, useForm, useHandleError} from '@tryghost/admin-x-framewor
 import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing';
 import {Tier, useAddTier, useBrowseTiers, useEditTier} from '@tryghost/admin-x-framework/api/tiers';
 import {currencies, currencySelectGroups, validateCurrencyAmount} from '../../../../utils/currency';
-import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {getSettingValues, useEditSettings} from '@tryghost/admin-x-framework/api/settings';
 import {toast} from 'react-hot-toast';
 
 export type TierFormState = Partial<Omit<Tier, 'trial_days'>> & {
@@ -22,12 +22,14 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
     const {updateRoute} = useRouting();
     const {mutateAsync: updateTier} = useEditTier();
     const {mutateAsync: createTier} = useAddTier();
+    const {mutateAsync: editSettings} = useEditSettings();
     const [hasFreeTrial, setHasFreeTrial] = React.useState(!!tier?.trial_days);
     const handleError = useHandleError();
     const {localSettings, siteData} = useSettingGroup();
-    const siteTitle = getSettingValues(localSettings, ['title']) as string[];
+    const [siteTitle, portalPlansJson] = getSettingValues(localSettings, ['title', 'portal_plans']) as string[];
     const hasPortalImprovements = useFeatureFlag('portalImprovements');
     const allowNameChange = !isFreeTier || hasPortalImprovements;
+    const portalPlans = JSON.parse(portalPlansJson?.toString() || '[]') as string[];
 
     const validators: {[key in keyof Tier]?: () => string | undefined} = {
         name: () => (formState.name ? undefined : 'You must specify a name'),
@@ -70,6 +72,31 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
             } else {
                 await createTier(values);
             }
+            if (isFreeTier && hasPortalImprovements) {
+                // If we changed the visibility, we also need to update Portal settings in some situations
+                // Like the free tier is a special case, and should also be present/absent in portal_plans
+                const visible = formState.visibility === 'public';
+                let save = false;
+
+                if (portalPlans.includes('free') && !visible) {
+                    portalPlans.splice(portalPlans.indexOf('free'), 1);
+                    save = true;
+                }
+
+                if (!portalPlans.includes('free') && visible) {
+                    portalPlans.push('free');
+                    save = true;
+                }
+
+                if (save) {
+                    await editSettings([
+                        {
+                            key: 'portal_plans',
+                            value: JSON.stringify(portalPlans)
+                        }
+                    ]);
+                }
+            }
         },
         onSavedStateReset: () => {
             modal.remove();
@@ -335,8 +362,19 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => {
             </div>
             <div className='sticky top-[96px] hidden shrink-0 basis-[380px] min-[920px]:!visible min-[920px]:!block'>
                 <TierDetailPreview isFreeTier={isFreeTier} tier={formState} />
-                
-                {!tier && hasPortalImprovements && <Form className=' mt-3' gap='none'><Checkbox checked={false} hint='You can always change this in portal settings' label='Show tier in portal for new signups' value='fakeShow' onChange={() => {}}></Checkbox></Form>}
+
+                {hasPortalImprovements &&
+                    <Form className=' mt-3' gap='none'>
+                        <Checkbox
+                            checked={formState.visibility === 'public'}
+                            hint='You can always change this in portal settings' label='Show tier in portal for new signups'
+                            value='fakeShow'
+                            onChange={(checked) => {
+                                updateForm(state => ({...state, visibility: checked ? 'public' : 'none'}));
+                            }}
+                        ></Checkbox>
+                    </Form>
+                }
             </div>
         </div>
     </Modal>;

From 813abb06e27d1c6aa7cd11d1565dfaa520212249 Mon Sep 17 00:00:00 2001
From: Djordje Vlaisavljevic <dzvlais@gmail.com>
Date: Wed, 6 Dec 2023 17:06:21 +0000
Subject: [PATCH 11/36] Moved hint content to placeholders for consistency
 PROD-204, PROD-203 (#19261)

refs PROD-204, PROD-203

- Moved fallback value information from hints to placeholders for
consistency and cleaner layout
- Changed setting section label
---
 .../email/newsletters/NewsletterDetailModal.tsx | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
index 467d267026..d340fa72d2 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
@@ -73,18 +73,12 @@ const ReplyToEmailField: React.FC<{
         setSenderReplyTo(rendered);
     };
 
-    const hint = (
-        <>
-            If left empty, replies go to {newsletterAddress}
-        </>
-    );
-
     // Pro users without custom sending domains
     return (
         <TextField
             error={Boolean(errors.sender_reply_to)}
-            hint={errors.sender_reply_to || hint}
-            placeholder={''}
+            hint={errors.sender_reply_to}
+            placeholder={newsletterAddress || ''}
             title="Reply-to email"
             value={senderReplyTo}
             onBlur={onBlur}
@@ -219,8 +213,9 @@ const Sidebar: React.FC<{
             return (
                 <TextField
                     error={Boolean(errors.sender_email)}
-                    hint={errors.sender_email || `If left empty, ${defaultEmailAddress} will be used`}
-                    rightPlaceholder={`@${sendingDomain(config)}`}
+                    hint={errors.sender_email}
+                    placeholder={defaultEmailAddress}
+                    rightPlaceholder={sendingEmailUsername ? `@${sendingDomain(config)}` : `` }
                     title="Sender email address"
                     value={sendingEmailUsername || ''}
                     onBlur={validate}
@@ -257,7 +252,7 @@ const Sidebar: React.FC<{
                     />
                     <TextArea rows={2} title="Description" value={newsletter.description || ''} onChange={e => updateNewsletter({description: e.target.value})} />
                 </Form>
-                <Form className='mt-6' gap='sm' margins='lg' title='Email addresses'>
+                <Form className='mt-6' gap='sm' margins='lg' title='Email info'>
                     <TextField placeholder={siteTitle} title="Sender name" value={newsletter.sender_name || ''} onChange={e => updateNewsletter({sender_name: e.target.value})} />
                     {renderSenderEmailField()}
                     <ReplyToEmailField clearError={clearError} errors={errors} newsletter={newsletter} updateNewsletter={updateNewsletter} validate={validate} />

From 549aaa4c5ad4e3c4e241e5782b661c607ffbd1c9 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Wed, 6 Dec 2023 11:29:27 -0600
Subject: [PATCH 12/36] Added tests for TK indicators within editor (#19262)

closes TryGhost/Product#4225
- added basic tests for TK detection in title
- added coverage for TK reminder modal popping up
---
 ghost/admin/tests/acceptance/editor-test.js   | 34 +++++++++++++++++++
 .../tests/unit/controllers/editor-test.js     | 18 ++++++++++
 2 files changed, 52 insertions(+)

diff --git a/ghost/admin/tests/acceptance/editor-test.js b/ghost/admin/tests/acceptance/editor-test.js
index 7cdd12a5df..90baaedf87 100644
--- a/ghost/admin/tests/acceptance/editor-test.js
+++ b/ghost/admin/tests/acceptance/editor-test.js
@@ -5,6 +5,7 @@ import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-sup
 import {beforeEach, describe, it} from 'mocha';
 import {blur, click, currentRouteName, currentURL, fillIn, find, findAll, triggerEvent, typeIn} from '@ember/test-helpers';
 import {datepickerSelect} from 'ember-power-datepicker/test-support';
+import {enableLabsFlag} from '../helpers/labs-flag';
 import {expect} from 'chai';
 import {selectChoose} from 'ember-power-select/test-support';
 import {setupApplicationTest} from 'ember-mocha';
@@ -570,5 +571,38 @@ describe('Acceptance: Editor', function () {
                 'breadcrumb link'
             ).to.equal(`/ghost/posts/analytics/${post.id}`);
         });
+
+        it('handles TKs in title', async function () {
+            enableLabsFlag(this.server, 'tkReminders');
+            let post = this.server.create('post', {authors: [author]});
+
+            await visit(`/editor/post/${post.id}`);
+
+            expect(
+                find('[data-test-editor-title-input]').value,
+                'initial title'
+            ).to.equal('Post 0');
+
+            await fillIn('[data-test-editor-title-input]', 'Test TK Title');
+
+            expect(
+                find('[data-test-editor-title-input]').value,
+                'title after typing'
+            ).to.equal('Test TK Title');
+
+            // check for TK indicator
+            expect(
+                find('[data-testid="tk-indicator"]'),
+                'TK indicator text'
+            ).to.exist;
+
+            // click publish to see if confirmation comes up
+            await click('[data-test-button="publish-flow"]');
+
+            expect(
+                find('[data-test-modal="tk-reminder"]'),
+                'TK reminder modal'
+            ).to.exist;
+        });
     });
 });
diff --git a/ghost/admin/tests/unit/controllers/editor-test.js b/ghost/admin/tests/unit/controllers/editor-test.js
index 60c7134851..ce086550f4 100644
--- a/ghost/admin/tests/unit/controllers/editor-test.js
+++ b/ghost/admin/tests/unit/controllers/editor-test.js
@@ -162,4 +162,22 @@ describe('Unit: Controller: lexical-editor', function () {
             expect(controller.get('post.slug')).to.not.be.ok;
         });
     });
+
+    describe('TK count in title', function () {
+        it('should have count 0 for no TK', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+
+            controller.set('post', EmberObject.create({titleScratch: 'this is a title'}));
+
+            expect(controller.get('tkCount')).to.equal(0);
+        });
+
+        it('should count TK reminders in the title', async function () {
+            let controller = this.owner.lookup('controller:lexical-editor');
+
+            controller.set('post', EmberObject.create({titleScratch: 'this is a TK'}));
+
+            expect(controller.get('tkCount')).to.equal(1);
+        });
+    });
 });

From 1071317780d7243876e90aa3db94a312d3499f2f Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@ghost.org>
Date: Wed, 6 Dec 2023 17:38:33 +0000
Subject: [PATCH 13/36] Fixed TK indicators not being correct when opening post
 with TKs (#19263)

no issue

- bumps `@tryghost/koenig-lexical` which includes fix and performance improvement for TKs
---
 ghost/admin/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 0b18d48fdf..4669a5589f 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -46,7 +46,7 @@
     "@tryghost/helpers": "1.1.88",
     "@tryghost/kg-clean-basic-html": "4.0.0",
     "@tryghost/kg-converters": "0.0.22",
-    "@tryghost/koenig-lexical": "1.0.2",
+    "@tryghost/koenig-lexical": "1.0.3",
     "@tryghost/limit-service": "1.2.12",
     "@tryghost/members-csv": "0.0.0",
     "@tryghost/nql": "0.12.0",

From 7bb56cc4d92ec0fa4b138824ca8fa0f2ff4594d7 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@ghost.org>
Date: Wed, 6 Dec 2023 18:15:11 +0000
Subject: [PATCH 14/36] Updated yarn.lock (#19264)

refs https://github.com/TryGhost/Koenig/pull/1119

- missed yarn.lock bump with the package.json bump
---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 271f71c1d6..aaf20753c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7866,10 +7866,10 @@
   dependencies:
     semver "^7.3.5"
 
-"@tryghost/koenig-lexical@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.0.2.tgz#2aeb07165a8ddab79f4765dc299a8c046c7238c1"
-  integrity sha512-vDLdy66Pp1yhLGWG80WaZSQJ+SYLDoY41RqYhUKPq+x2PX+H+qdGgB97OVTK/w4kXPXFNZvhpbgWRTdom2Vnzg==
+"@tryghost/koenig-lexical@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.0.3.tgz#509e5769c59b50fd290340fcb8734bae59a512ec"
+  integrity sha512-ifeuC2ZtujPmOy14y/Dh7HIzOcd+9zPb8930KCpMGtsjTaiegazagSQ8k1gSlWY1xGzXjG8bFac2FlX26OuHTQ==
 
 "@tryghost/limit-service@1.2.12", "@tryghost/limit-service@^1.2.10":
   version "1.2.12"

From a5dcae80e7699a66ba7c71b75ac3559008f13960 Mon Sep 17 00:00:00 2001
From: Sag <guptazy@gmail.com>
Date: Wed, 6 Dec 2023 16:56:25 -0300
Subject: [PATCH 15/36] Updated copy during email verification in newsletter
 settings (#19265)

fixes PROD-202
---
 .../newsletters/NewsletterDetailModal.tsx     |  7 +++--
 .../test/acceptance/email/newsletters.test.ts | 28 ++++---------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
index d340fa72d2..23341e7b8a 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
@@ -533,17 +533,18 @@ const NewsletterDetailModalContent: React.FC<{newsletter: Newsletter; onlyOne: b
         savingDelay: 500,
         onSave: async () => {
             const {newsletters: [updatedNewsletter], meta: {sent_email_verification: [emailToVerify] = []} = {}} = await editNewsletter(formState); ``;
+            const previousFrom = renderSenderEmail(updatedNewsletter, config, defaultEmailAddress);
+            const previousReplyTo = renderReplyToEmail(updatedNewsletter, config, supportEmailAddress, defaultEmailAddress) || previousFrom;
+
             let title;
             let prompt;
 
             if (emailToVerify && emailToVerify === 'sender_email') {
-                const previousFrom = renderSenderEmail(updatedNewsletter, config, defaultEmailAddress);
                 title = 'Confirm newsletter email address';
                 prompt = <>We&lsquo;ve sent a confirmation email to <strong>{formState.sender_email}</strong>. Until the address has been verified, newsletters will be sent from the {updatedNewsletter.sender_email ? ' previous' : ' default'} email address{previousFrom ? ` (${previousFrom})` : ''}.</>;
             } else if (emailToVerify && emailToVerify === 'sender_reply_to') {
-                const previousReplyTo = renderReplyToEmail(updatedNewsletter, config, supportEmailAddress, defaultEmailAddress);
                 title = 'Confirm reply-to address';
-                prompt = <>We&lsquo;ve sent a confirmation email to <strong>{formState.sender_reply_to}</strong>. Until the address has been verified, newsletters will use the previous reply-to address{previousReplyTo ? ` (${previousReplyTo})` : ''}.</>;
+                prompt = <>We&lsquo;ve sent a confirmation email to <strong>{formState.sender_reply_to}</strong>. Until the address has been verified, replies will continue to go to {previousReplyTo}.</>;
             }
 
             if (title && prompt) {
diff --git a/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts b/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts
index 7a4e8ba9d4..7f8e18cdc5 100644
--- a/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts
+++ b/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts
@@ -247,12 +247,12 @@ test.describe('Newsletter settings', async () => {
                 await expect(page.getByTestId('confirmation-modal')).toHaveCount(1);
                 await expect(page.getByTestId('confirmation-modal')).toHaveText(/Confirm reply-to address/);
                 await expect(page.getByTestId('confirmation-modal')).toHaveText(/sent a confirmation email to test@test.com/);
-                await expect(page.getByTestId('confirmation-modal')).toHaveText(/previous reply-to address \(support@example.com\)/);
+                await expect(page.getByTestId('confirmation-modal')).toHaveText(/replies will continue to go to support@example.com/);
             });
         });
 
-        test.describe('For Ghost (Pro) users with custom domain', () => {
-            test('Allow sender and reply-to addresses to be changed without verification, but not their domain name', async ({page}) => {
+        test.describe('For Ghost (Pro) users with custom sending domain', () => {
+            test('Allow sender address to be changed partially (username but not domain name)', async ({page}) => {
                 await mockApi({page, requests: {
                     ...globalDataRequests,
                     browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response: responseFixtures.newsletters},
@@ -283,25 +283,17 @@ test.describe('Newsletter settings', async () => {
                 await section.getByText('Awesome newsletter').click();
                 const modal = page.getByTestId('newsletter-modal');
                 const senderEmail = modal.getByLabel('Sender email');
-                const replyToEmail = modal.getByLabel('Reply-to email');
-
-                // The sending domain is rendered as placeholder text
-                expect(modal).toHaveText(/@customdomain\.com/);
 
                 // The sender email field should keep the username part of the email address
                 await senderEmail.fill('harry@potter.com');
                 expect(await senderEmail.inputValue()).toBe('harry');
 
-                // Full flexibility for the reply-to address
-                await replyToEmail.fill('hermione@customdomain.com');
-                expect(await replyToEmail.inputValue()).toBe('hermione@customdomain.com');
-
                 // The new username is saved without a confirmation popup
                 await modal.getByRole('button', {name: 'Save'}).click();
                 await expect(page.getByTestId('confirmation-modal')).toHaveCount(0);
             });
 
-            test('Reply-To addresses without a matching domain require verification', async ({page}) => {
+            test('Allow full customisation of the reply-to address, with verification', async ({page}) => {
                 await mockApi({page, requests: {
                     ...globalDataRequests,
                     browseNewsletters: {method: 'GET', path: '/newsletters/?include=count.active_members%2Ccount.posts&limit=50', response: responseFixtures.newsletters},
@@ -331,26 +323,18 @@ test.describe('Newsletter settings', async () => {
                 const section = page.getByTestId('newsletters');
                 await section.getByText('Awesome newsletter').click();
                 const modal = page.getByTestId('newsletter-modal');
-                const senderEmail = modal.getByLabel('Sender email');
                 const replyToEmail = modal.getByLabel('Reply-to email');
 
-                // The sending domain is rendered as placeholder text
-                expect(modal).toHaveText(/@customdomain\.com/);
-
-                // The sender email field should keep the username part of the email address
-                await senderEmail.fill('harry@potter.com');
-                expect(await senderEmail.inputValue()).toBe('harry');
-
                 // Full flexibility for the reply-to address
                 await replyToEmail.fill('hermione@granger.com');
                 expect(await replyToEmail.inputValue()).toBe('hermione@granger.com');
 
-                // The new username is saved without a confirmation popup
+                // There is a verification popup for the new reply-to address
                 await modal.getByRole('button', {name: 'Save'}).click();
                 await expect(page.getByTestId('confirmation-modal')).toHaveCount(1);
                 await expect(page.getByTestId('confirmation-modal')).toHaveText(/Confirm reply-to address/);
                 await expect(page.getByTestId('confirmation-modal')).toHaveText(/sent a confirmation email to hermione@granger.com/);
-                await expect(page.getByTestId('confirmation-modal')).toHaveText(/previous reply-to address \(support@example.com\)/);
+                await expect(page.getByTestId('confirmation-modal')).toHaveText(/replies will continue to go to support@example.com/);
             });
         });
     });

From 24f73321ce014c466b2d5da8c00adbbc3b3d2130 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:57:46 +0000
Subject: [PATCH 16/36] Update metascraper to v5.40.0

---
 ghost/oembed-service/package.json |  18 ++---
 yarn.lock                         | 122 +++++++++++++-----------------
 2 files changed, 61 insertions(+), 79 deletions(-)

diff --git a/ghost/oembed-service/package.json b/ghost/oembed-service/package.json
index 6b245494ed..4ff6111b13 100644
--- a/ghost/oembed-service/package.json
+++ b/ghost/oembed-service/package.json
@@ -30,15 +30,15 @@
     "cheerio": "0.22.0",
     "iconv-lite": "0.6.3",
     "lodash": "4.17.21",
-    "metascraper": "5.39.0",
-    "metascraper-author": "5.39.0",
-    "metascraper-description": "5.39.0",
-    "metascraper-image": "5.39.0",
-    "metascraper-logo": "5.39.0",
-    "metascraper-logo-favicon": "5.39.0",
-    "metascraper-publisher": "5.39.0",
-    "metascraper-title": "5.39.0",
-    "metascraper-url": "5.39.0",
+    "metascraper": "5.40.0",
+    "metascraper-author": "5.40.0",
+    "metascraper-description": "5.40.0",
+    "metascraper-image": "5.40.0",
+    "metascraper-logo": "5.40.0",
+    "metascraper-logo-favicon": "5.40.0",
+    "metascraper-publisher": "5.40.0",
+    "metascraper-title": "5.40.0",
+    "metascraper-url": "5.40.0",
     "tough-cookie": "4.1.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index aaf20753c8..3344defe2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4224,10 +4224,10 @@
     "@types/mdx" "^2.0.0"
     "@types/react" ">=16"
 
-"@metascraper/helpers@^5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.39.0.tgz#68e460e7e5b2b3eb5c07934214e7dd965aabba3c"
-  integrity sha512-snQEtKIVbmE2RF5rSdzdOXT4Flvao0N3AHXvThHCALblaQeLjxhRS/NWTKLGmsbsMYljAlcFwxxDRtU3uh6QiA==
+"@metascraper/helpers@^5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.40.0.tgz#0350fbb7d960033542a3cc962e99d0202abdeb0e"
+  integrity sha512-1hSmIWr+wHqZQYUnWBnPEY9aRoXsR0YZT/j4+CazmZs4k/1gO1ZnOQXcfG5Rtae43MbIQWv4LsbqpcFT7WX1wQ==
   dependencies:
     audio-extensions "0.0.0"
     chrono-node "~2.6.4"
@@ -19533,15 +19533,7 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz#0277e28f13a07d45c663633841e20a40aaafe0ab"
-  integrity sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "4"
-
-https-proxy-agent@^7.0.2:
+https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
   integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
@@ -22966,72 +22958,72 @@ merge@^1.2.0:
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
   integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
-metascraper-author@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.39.0.tgz#290f0031c1e48344533e568b90a1673d0ca9c0a8"
-  integrity sha512-1rbmGCsQPOjjKuIWTHj0Wzi1p5DXFrPG+ggNIPILmZSsVkOYwVrVwYB2z3XN52o2kuRE9fv7Ve1oDqaanJi6Xw==
+metascraper-author@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-5.40.0.tgz#34b0fa8c93d9a37034153b807e112f24a990bb12"
+  integrity sha512-Ho8VgBEJy/9x3uifu8gRjQO6qqu7LaadYHgH2fTeY4YVwvphAEgRcIR1SbQQcDeX0/LRBYpI9Jw+UICsr7hMBQ==
   dependencies:
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
 
-metascraper-description@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.39.0.tgz#74ff09f58ea76d2048502b4000574f55fb65c45e"
-  integrity sha512-Wif3Duhjo5VRr/Kh6j1cZQC2z7yJ50Sw+pK6po4lq6+3Sfiv1gOzTekNsxeNfOt1QYMA1Z8nv4H8VX7ahM2bXg==
+metascraper-description@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.40.0.tgz#540a354ad2a84d438d807489c70a74b85d263b41"
+  integrity sha512-mBsAQXpQHb/jmreOv72mBHSJPPiniETsLnteJf7BV6PwyR3D24AmePlzCalWl200FhD/TM4ih5Wv7qYwJsmV7Q==
   dependencies:
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
 
-metascraper-image@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.39.0.tgz#4a36d1f7108a08ef5f8a31e52113b3b7c78e7b25"
-  integrity sha512-OapHcOfNagZfBhYJRpTrgEbq6s3BMz3W2hjJBvlxTNgiIYRfM2bOOzaFZ8/kACSRG91M0utGwCdtnfliJrN4XA==
+metascraper-image@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-5.40.0.tgz#a04b26ac0d7818b638451f8e604e5d12ebcf9453"
+  integrity sha512-xdjdyAOINyAmvvwgKqpS6ZsTdEnsFuVZgYgcs9p5SS7K848asL1nBOPLXqe9+Ex6fh6xVUuPZHAa5trDMQ9h/w==
   dependencies:
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
 
-metascraper-logo-favicon@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper-logo-favicon/-/metascraper-logo-favicon-5.39.0.tgz#3a63ca20af081f3c374c268bf38942e507cc3e7d"
-  integrity sha512-NLi76/yXb8kOPd4Mwu52G6yZ9Jzi2Zxcmq/JgqWRhxWP5M5NWtZDLKwejkf+1sgLr9pvD1y1R9TiCfYyGheb3w==
+metascraper-logo-favicon@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper-logo-favicon/-/metascraper-logo-favicon-5.40.0.tgz#635ef02ac4c0b6fdbe43e58e29216a829aa0c6e0"
+  integrity sha512-eNhMoOsNrrmZhodv9c3c5LVF9ZYmNDNYWnuc5PUSXyZBvK+PDI9rKx6sbUgrH0CWdtPEcywd+g3pU+6cMYFitg==
   dependencies:
     "@keyvhq/memoize" "~2.0.3"
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
     lodash "~4.17.21"
     reachable-url "~1.7.1"
 
-metascraper-logo@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.39.0.tgz#a4c5527926606e34bf0d2c4709eaf5bb951ec5ee"
-  integrity sha512-F2IckMRYnXCqb6ZBTeE0I59C9WvVBv3l5wCxg0qW4f8/B9IBMQXZgE5S069+dUJST6v6MEBDmYxpuwghsr6nQQ==
+metascraper-logo@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-5.40.0.tgz#368b30acb51e2ccd67eac83f6eb807a2b6064c40"
+  integrity sha512-MOqqT+Q//tV5sQ9icdjet/ybGTyTv38r/JCVCmBWQH3HLBpSECG5qWlFNW0ksUzXd+wT3UBv6qcJ6hsXeBJhaA==
   dependencies:
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
     lodash "~4.17.21"
 
-metascraper-publisher@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.39.0.tgz#126e80f3f3af7e56006dbbdd14e8630d3153853f"
-  integrity sha512-NzRT0v0EYEnVA0vyTTFMMfKojvSgyJVoWBeFU5EY7LdKuOAoGVnPMCLAZerNRubsqropynTcHLdinOf+mZ2ORw==
+metascraper-publisher@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-5.40.0.tgz#d8da240bf6a6c643ebaf0e22a1dd4ddd6e1f329a"
+  integrity sha512-NB2xkFSo1R3BWUduBkOurnPuJD8TZV89cOG4vwEFrc/TQsCH25kwpLcdDkG4PnS2lECUekNvSQSMKOKiagGW0Q==
   dependencies:
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
 
-metascraper-title@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.39.0.tgz#2e3ad91c6c790aa939eefc677269a6cabe50d58e"
-  integrity sha512-mxSiIxJvfA4fhUnJ3f8hyD5w/c9JyglykR9BJKh4eA6INgDFzayH2iYu9IH+Som+bDpP7OIqii2EUG+EOQVb7A==
+metascraper-title@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.40.0.tgz#a4ad0ae27184f6266d8476a7254e5f926e2d827c"
+  integrity sha512-vLj1DkAzXqWaqNW2d8tqm5NCZbSCbB7dR2YiChIpoOabSOlCRVlcwoPCjyT7J6wzCr7Wsm6znxUAHHJnl9biiw==
   dependencies:
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
 
-metascraper-url@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.39.0.tgz#fdf252db2fd14a38cac7565e326731c60355b98c"
-  integrity sha512-r9GUAH8tzQtdGn4/a29JXnuTF+8jm+Hw4s7dgeuWGZYPJvT4d/b0RDnuHjI2v2kaTT5zKVGen/o8RpB6nd/1OQ==
+metascraper-url@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-5.40.0.tgz#d148880babc8d36de9b4e77cbaca9b23fdcfaddb"
+  integrity sha512-4mVpStLcXFekKZGeVWg07IY+CrsmEkVVqXdTw5+cTDUq3sxK13l73/qJQkqGMAFgGnfK0jbS+rkoWJ7VFnD6yg==
   dependencies:
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
 
-metascraper@5.39.0:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.39.0.tgz#c194a8faab3948a0c7e20fc8e7c513219f317092"
-  integrity sha512-waWYCC2xNxdeDwd4n/ninmUb0Bz2lpDI1EQAGT1XtZ7JqWgaW0jnZumt2tB19MSfbAVEbj701Vu4sXPffbdKNg==
+metascraper@5.40.0:
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.40.0.tgz#d1f861e48de1db6ff236bff203b8475e765aa8f8"
+  integrity sha512-gocK0LcBZ+fo+pQ+eQz2eeeAtfUrtjgCxW6vltEz9Oc3s3K2vgaJbXkFnvxFt+dMcPHpGK6LXbEejN5q1AmpIw==
   dependencies:
-    "@metascraper/helpers" "^5.39.0"
+    "@metascraper/helpers" "^5.40.0"
     cheerio "~1.0.0-rc.12"
     lodash "~4.17.21"
     whoops "~4.1.4"
@@ -24258,12 +24250,7 @@ numbered@^1.1.0:
   resolved "https://registry.yarnpkg.com/numbered/-/numbered-1.1.0.tgz#9fcd79564c73a84b9574e8370c3d8e58fe3c133c"
   integrity sha512-pv/ue2Odr7IfYOO0byC1KgBI10wo5YDauLhxY6/saNzAdAs0r1SotGCPzzCLNPL0xtrAwWRialLu23AAu9xO1g==
 
-nwsapi@^2.2.0, nwsapi@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5"
-  integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==
-
-nwsapi@^2.2.7:
+nwsapi@^2.2.0, nwsapi@^2.2.4, nwsapi@^2.2.7:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
   integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
@@ -26639,12 +26626,7 @@ punycode@^1.2.4:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
 
-punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
-
-punycode@^2.3.1:
+punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0, punycode@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==

From 1c04bdbdb285b63335975780d8bd4f8ae5ec6c20 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:57:27 +0000
Subject: [PATCH 17/36] Update dependency typescript to v5.3.3

---
 apps/admin-x-design-system/package.json | 2 +-
 apps/admin-x-framework/package.json     | 2 +-
 ghost/donations/package.json            | 2 +-
 ghost/email-addresses/package.json      | 2 +-
 ghost/recommendations/package.json      | 2 +-
 package.json                            | 2 +-
 yarn.lock                               | 8 ++++----
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/admin-x-design-system/package.json b/apps/admin-x-design-system/package.json
index 73b279f831..da7e6d25a3 100644
--- a/apps/admin-x-design-system/package.json
+++ b/apps/admin-x-design-system/package.json
@@ -48,7 +48,7 @@
     "sinon": "17.0.0",
     "storybook": "7.6.3",
     "ts-node": "10.9.1",
-    "typescript": "5.3.2",
+    "typescript": "5.3.3",
     "vite": "4.5.1",
     "vite-plugin-svgr": "3.3.0"
   },
diff --git a/apps/admin-x-framework/package.json b/apps/admin-x-framework/package.json
index 63cb2cf242..80ae4c7765 100644
--- a/apps/admin-x-framework/package.json
+++ b/apps/admin-x-framework/package.json
@@ -78,7 +78,7 @@
     "react-dom": "18.2.0",
     "sinon": "17.0.0",
     "ts-node": "10.9.1",
-    "typescript": "5.3.2"
+    "typescript": "5.3.3"
   },
   "dependencies": {
     "@sentry/react": "7.85.0",
diff --git a/ghost/donations/package.json b/ghost/donations/package.json
index 880f80b2f0..7591447cca 100644
--- a/ghost/donations/package.json
+++ b/ghost/donations/package.json
@@ -26,7 +26,7 @@
     "mocha": "10.2.0",
     "sinon": "15.2.0",
     "ts-node": "10.9.1",
-    "typescript": "5.3.2"
+    "typescript": "5.3.3"
   },
   "dependencies": {}
 }
diff --git a/ghost/email-addresses/package.json b/ghost/email-addresses/package.json
index 1522944d15..3d254dc560 100644
--- a/ghost/email-addresses/package.json
+++ b/ghost/email-addresses/package.json
@@ -26,7 +26,7 @@
     "mocha": "10.2.0",
     "sinon": "15.2.0",
     "ts-node": "10.9.1",
-    "typescript": "5.3.2"
+    "typescript": "5.3.3"
   },
   "dependencies": {
     "nodemailer": "^6.6.3"
diff --git a/ghost/recommendations/package.json b/ghost/recommendations/package.json
index 4e8dcb0756..13d4b43731 100644
--- a/ghost/recommendations/package.json
+++ b/ghost/recommendations/package.json
@@ -27,7 +27,7 @@
     "mocha": "10.2.0",
     "sinon": "15.2.0",
     "ts-node": "10.9.1",
-    "typescript": "5.3.2"
+    "typescript": "5.3.3"
   },
   "dependencies": {
     "@tryghost/tpl": "0.1.26",
diff --git a/package.json b/package.json
index 1773454d1d..a4a986bedc 100644
--- a/package.json
+++ b/package.json
@@ -115,6 +115,6 @@
     "nx": "16.8.1",
     "rimraf": "5.0.5",
     "ts-node": "10.9.1",
-    "typescript": "5.3.2"
+    "typescript": "5.3.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 3344defe2a..eabea6ace9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -30452,10 +30452,10 @@ typescript@5.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
   integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
-typescript@5.3.2, typescript@^5.0.4:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43"
-  integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==
+typescript@5.3.3, typescript@^5.0.4:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
+  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From a87804be5700acd142cf08ad3297bf6b11c04010 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 20:30:36 +0000
Subject: [PATCH 18/36] Update dependency i18next to v23.7.8

---
 ghost/i18n/package.json | 2 +-
 yarn.lock               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ghost/i18n/package.json b/ghost/i18n/package.json
index b33614a04b..171e1fde32 100644
--- a/ghost/i18n/package.json
+++ b/ghost/i18n/package.json
@@ -30,6 +30,6 @@
     "mocha": "10.2.0"
   },
   "dependencies": {
-    "i18next": "23.7.7"
+    "i18next": "23.7.8"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index eabea6ace9..50975e523b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19610,10 +19610,10 @@ i18next-parser@8.8.0:
     vinyl-fs "^3.0.2"
     vue-template-compiler "^2.6.11"
 
-i18next@23.7.7:
-  version "23.7.7"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.7.7.tgz#e650ee962417186c5ba78bdaea3979abd31d3bfc"
-  integrity sha512-peTvdT+Lma+o0LfLFD7IC2M37N9DJ04dH0IJYOyOHRhDfLo6nK36v7LkrQH35C2l8NHiiXZqGirhKESlEb/5PA==
+i18next@23.7.8:
+  version "23.7.8"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.7.8.tgz#c59d5f4fb7761d67ceaa9ebea86a35aba0f846b2"
+  integrity sha512-yCe9964O+1abdIG01AOzk6P9mQi0HVJV1B57whYJQu6TjmrB9JHHDYonDI8amGt6M6b9bP3x3R0Zh7ROmvX7JQ==
   dependencies:
     "@babel/runtime" "^7.23.2"
 

From 1b43b5c60af2c2d1e80afcc58b65272984189fc9 Mon Sep 17 00:00:00 2001
From: Chris Raible <chris@ghost.org>
Date: Wed, 6 Dec 2023 15:04:35 -0800
Subject: [PATCH 19/36] Added Sentry performance monitoring to Ghost Server
 (#19243)

refs ARCH-21

- We currently have NewRelic setup for a few of our largest customers
for monitoring performance, but it is too expensive to enable across all
sites
- Sentry has similar (but simpler) performance monitoring tools to keep
track of response times that are available to us for free, but we just
haven't configured them
- This PR sets up Sentry Performance monitoring for API requests so we
can have one place for monitoring errors + performance so we can stay on
top of response times more easily.
- Tracing is disabled by default, so there is no additional overhead
unless `sentry.tracing.enabled` is set to `true` in the site's config.
Additionally, `sentry.tracing.sampleRate` should be set to a decimal
value between 0 and 1. This value defaults to 0 to avoid accidentally
blowing through quota, and requires a value to explicitly be set in
order to send the traces to Sentry.
---
 ghost/core/core/app.js           |  4 +++-
 ghost/core/core/shared/sentry.js | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ghost/core/core/app.js b/ghost/core/core/app.js
index 3039aaf6f9..76bde97d04 100644
--- a/ghost/core/core/app.js
+++ b/ghost/core/core/app.js
@@ -30,7 +30,9 @@ const maintenanceMiddleware = (req, res, next) => {
 const rootApp = () => {
     const app = express('root');
     app.use(sentry.requestHandler);
-
+    if (config.get('sentry')?.tracing?.enabled === true) {
+        app.use(sentry.tracingHandler);
+    }
     app.enable('maintenance');
     app.use(maintenanceMiddleware);
 
diff --git a/ghost/core/core/shared/sentry.js b/ghost/core/core/shared/sentry.js
index aae14d5a93..139e7b1897 100644
--- a/ghost/core/core/shared/sentry.js
+++ b/ghost/core/core/shared/sentry.js
@@ -59,13 +59,22 @@ if (sentryConfig && !sentryConfig.disabled) {
     const Sentry = require('@sentry/node');
     const version = require('@tryghost/version').full;
     const environment = config.get('env');
-    Sentry.init({
+    const sentryInitConfig = {
         dsn: sentryConfig.dsn,
         release: 'ghost@' + version,
         environment: environment,
         maxValueLength: 1000,
-        beforeSend: beforeSend
-    });
+        integrations: [],
+        beforeSend
+    };
+
+    // Enable tracing if sentry.tracing.enabled is true
+    if (sentryConfig.tracing?.enabled === true) {
+        sentryInitConfig.integrations.push(new Sentry.Integrations.Http({tracing: true}));
+        sentryInitConfig.integrations.push(new Sentry.Integrations.Express());
+        sentryInitConfig.tracesSampleRate = parseFloat(sentryConfig.tracing.sampleRate) || 0.0;
+    }
+    Sentry.init(sentryInitConfig);
 
     module.exports = {
         requestHandler: Sentry.Handlers.requestHandler(),
@@ -82,6 +91,7 @@ if (sentryConfig && !sentryConfig.disabled) {
                 return (error.statusCode === 500);
             }
         }),
+        tracingHandler: Sentry.Handlers.tracingHandler(),
         captureException: Sentry.captureException,
         beforeSend: beforeSend
     };
@@ -95,6 +105,7 @@ if (sentryConfig && !sentryConfig.disabled) {
     module.exports = {
         requestHandler: expressNoop,
         errorHandler: expressNoop,
+        tracingHandler: expressNoop,
         captureException: noop
     };
 }

From 66e56b83732f131f39a8d4801bb38b7d1d46c626 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 07:53:21 +0000
Subject: [PATCH 20/36] Update dependency @types/node to v20.10.4

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 50975e523b..7fe4f2104b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8534,9 +8534,9 @@
     "@types/node" "*"
 
 "@types/node@*", "@types/node@>=10.0.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0", "@types/node@^20.5.7":
-  version "20.10.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.3.tgz#4900adcc7fc189d5af5bb41da8f543cea6962030"
-  integrity sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg==
+  version "20.10.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.4.tgz#b246fd84d55d5b1b71bf51f964bd514409347198"
+  integrity sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==
   dependencies:
     undici-types "~5.26.4"
 

From d617891e4610305d82693c24feeb23e7a1c67ff5 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 7 Dec 2023 10:23:38 +0100
Subject: [PATCH 21/36] Configured Nx watch to run in an infinite loop

refs https://ghost.slack.com/archives/C02G9E68C/p1701939292474999?thread_ts=1701881060.000299&cid=C02G9E68C

- when you change branch or do a `git pull`, Nx will kill the watch
  command
- this becomes annoying when you're doing local development because it
  tears down the whole `yarn dev` command
- this puts the nx watch command in an infinite loop so it's just
  restart again and concurrently doesn't detect it as a failure
---
 .github/scripts/dev.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/dev.js b/.github/scripts/dev.js
index f1638b5c03..31c9b14092 100644
--- a/.github/scripts/dev.js
+++ b/.github/scripts/dev.js
@@ -45,7 +45,7 @@ const COMMAND_ADMIN = {
 
 const COMMAND_TYPESCRIPT = {
     name: 'ts',
-    command: 'nx watch --projects=ghost/collections,ghost/in-memory-repository,ghost/bookshelf-repository,ghost/mail-events,ghost/model-to-domain-event-interceptor,ghost/post-revisions,ghost/nql-filter-expansions,ghost/post-events,ghost/donations,ghost/recommendations,ghost/email-addresses -- nx run \\$NX_PROJECT_NAME:build:ts',
+    command: 'while [ 1 ]; do nx watch --projects=ghost/collections,ghost/in-memory-repository,ghost/bookshelf-repository,ghost/mail-events,ghost/model-to-domain-event-interceptor,ghost/post-revisions,ghost/nql-filter-expansions,ghost/post-events,ghost/donations,ghost/recommendations,ghost/email-addresses -- nx run \\$NX_PROJECT_NAME:build:ts; done',
     cwd: path.resolve(__dirname, '../../'),
     prefixColor: 'cyan',
     env: {}
@@ -55,7 +55,7 @@ const adminXApps = '@tryghost/admin-x-demo,@tryghost/admin-x-settings';
 
 const COMMANDS_ADMINX = [{
     name: 'adminXDeps',
-    command: 'nx watch --projects=apps/admin-x-design-system,apps/admin-x-framework -- nx run \\$NX_PROJECT_NAME:build --skip-nx-cache',
+    command: 'while [ 1 ]; do nx watch --projects=apps/admin-x-design-system,apps/admin-x-framework -- nx run \\$NX_PROJECT_NAME:build --skip-nx-cache; done',
     cwd: path.resolve(__dirname, '../..'),
     prefixColor: '#C35831',
     env: {}

From 398f96249c681760868bfd03930c54a6cf7971e6 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Wed, 6 Dec 2023 20:11:52 +0100
Subject: [PATCH 22/36] Added MySQL setup via Docker

refs https://github.com/TryGhost/DevOps/issues/118

- we should standardize how we run MySQL, so there aren't massive gaps
  in developer experience
- Docker is great for this, and it's pretty easy to set up
- this adds a docker-compose.yml file with a small MySQL setup
- also configures `yarn setup` to spin up the Docker container and add
  it to config.local.json
- in the near future, we'll provide a base SQL file in .github/scripts/mysql-preload
  to ensure the DB is in a known state
---
 .github/scripts/docker-compose.yml  | 19 ++++++
 .github/scripts/mysql-preload/.keep |  0
 .github/scripts/setup.js            | 94 +++++++++++++++++++++++++++++
 package.json                        |  3 +-
 4 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 .github/scripts/docker-compose.yml
 create mode 100644 .github/scripts/mysql-preload/.keep
 create mode 100644 .github/scripts/setup.js

diff --git a/.github/scripts/docker-compose.yml b/.github/scripts/docker-compose.yml
new file mode 100644
index 0000000000..eb2caaeed9
--- /dev/null
+++ b/.github/scripts/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '3.8'
+
+services:
+  mysql:
+    image: mysql:8.0.35
+    container_name: ghost-mysql
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: ghost
+    restart: always
+    volumes:
+      # Turns out you can drop .sql or .sql.gz files in here, cool!
+      - ./mysql-preload:/docker-entrypoint-initdb.d
+    healthcheck:
+      test: "mysql -uroot -proot ghost -e 'select 1'"
+      interval: 1s
+      retries: 120
diff --git a/.github/scripts/mysql-preload/.keep b/.github/scripts/mysql-preload/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.github/scripts/setup.js b/.github/scripts/setup.js
new file mode 100644
index 0000000000..59fd37b3b5
--- /dev/null
+++ b/.github/scripts/setup.js
@@ -0,0 +1,94 @@
+const {spawn} = require('child_process');
+const fs = require('fs').promises;
+const path = require('path');
+
+const chalk = require('chalk');
+
+/**
+ * Run a command and stream output to the console
+ *
+ * @param {string} command
+ * @param {string[]} args
+ * @param {object} options
+ */
+async function runAndStream(command, args, options) {
+    return new Promise((resolve, reject) => {
+        const child = spawn(command, args, {
+            stdio: 'inherit',
+            ...options
+        });
+
+        child.on('close', (code) => {
+            if (code === 0) {
+                resolve(code);
+            } else {
+                reject(new Error(`'${command} ${args.join(' ')}' exited with code ${code}`));
+            }
+        });
+
+    });
+}
+
+(async () => {
+    if (process.env.NODE_ENV !== 'development') {
+        console.log(chalk.yellow(`NODE_ENV is not development, skipping setup`));
+        return;
+    }
+
+    const coreFolder = path.join(__dirname, '../../ghost/core');
+    const config = require('../../ghost/core/core/shared/config/loader').loadNconf({
+        customConfigPath: coreFolder
+    });
+
+    const dbClient = config.get('database:client');
+
+    if (!dbClient.includes('mysql')) {
+        let mysqlSetup = false;
+        console.log(chalk.blue(`Attempting to setup MySQL via Docker`));
+        try {
+            await runAndStream('yarn', ['docker:reset'], {cwd: path.join(__dirname, '../../')});
+            mysqlSetup = true;
+        } catch (err) {
+            console.error(chalk.red('Failed to run MySQL Docker container'), err);
+            console.error(chalk.red('Hint: is Docker installed and running?'));
+        }
+
+        if (mysqlSetup) {
+            console.log(chalk.blue(`Adding MySQL credentials to config.local.json`));
+            const currentConfigPath = path.join(coreFolder, 'config.local.json');
+
+            let currentConfig;
+            try {
+                currentConfig = require(currentConfigPath);
+            } catch (err) {
+                currentConfig = {};
+            }
+
+            currentConfig.database = {
+                client: 'mysql',
+                connection: {
+                    host: '127.0.0.1',
+                    user: 'root',
+                    password: 'root',
+                    database: 'ghost'
+                }
+            };
+
+            try {
+                await fs.writeFile(currentConfigPath, JSON.stringify(currentConfig, null, 4));
+            } catch (err) {
+                console.error(chalk.red('Failed to write config.local.json'), err);
+                console.log(chalk.yellow(`Please add the following to config.local.json:\n`), JSON.stringify(currentConfig, null, 4));
+                process.exit(1);
+            }
+
+            console.log(chalk.blue(`Running knex-migrator init`));
+            await runAndStream('yarn', ['knex-migrator', 'init'], {cwd: coreFolder});
+
+            //console.log(chalk.blue(`Running data generator`));
+            //await runAndStream('node', ['index.js', 'generate-data'], {cwd: coreFolder});
+        }
+    } else {
+        console.log(chalk.green(`MySQL already configured, skipping setup`));
+    }
+})();
diff --git a/package.json b/package.json
index a4a986bedc..3f8b7f6848 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,8 @@
     "dev": "node .github/scripts/dev.js",
     "fix": "yarn cache clean && rm -rf node_modules && yarn",
     "knex-migrator": "yarn workspace ghost run knex-migrator",
-    "setup": "yarn && git submodule update --init",
+    "setup": "yarn && git submodule update --init && NODE_ENV=development node .github/scripts/setup.js",
+    "docker:reset": "docker-compose -f .github/scripts/docker-compose.yml down -v && docker-compose -f .github/scripts/docker-compose.yml up -d --wait",
     "lint": "nx run-many -t lint",
     "test": "nx run-many -t test",
     "test:unit": "nx run-many -t test:unit",

From 8197a740b1be96d51d1362b3dc71795219713029 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:23:46 +0000
Subject: [PATCH 23/36] Update dependency metascraper to v5.41.0

---
 ghost/oembed-service/package.json | 2 +-
 yarn.lock                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ghost/oembed-service/package.json b/ghost/oembed-service/package.json
index 4ff6111b13..3cfcf970f0 100644
--- a/ghost/oembed-service/package.json
+++ b/ghost/oembed-service/package.json
@@ -30,7 +30,7 @@
     "cheerio": "0.22.0",
     "iconv-lite": "0.6.3",
     "lodash": "4.17.21",
-    "metascraper": "5.40.0",
+    "metascraper": "5.41.0",
     "metascraper-author": "5.40.0",
     "metascraper-description": "5.40.0",
     "metascraper-image": "5.40.0",
diff --git a/yarn.lock b/yarn.lock
index 7fe4f2104b..37d73d5a1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23018,10 +23018,10 @@ metascraper-url@5.40.0:
   dependencies:
     "@metascraper/helpers" "^5.40.0"
 
-metascraper@5.40.0:
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.40.0.tgz#d1f861e48de1db6ff236bff203b8475e765aa8f8"
-  integrity sha512-gocK0LcBZ+fo+pQ+eQz2eeeAtfUrtjgCxW6vltEz9Oc3s3K2vgaJbXkFnvxFt+dMcPHpGK6LXbEejN5q1AmpIw==
+metascraper@5.41.0:
+  version "5.41.0"
+  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-5.41.0.tgz#b89a06af1805729e7bffcc77616280311c7fda71"
+  integrity sha512-Hb51/Vz6MxpowlK0De/j3L4ez5oHjhLDy4+pOIkpmrko9v+PDRu5HSsSh3YFhIFvf6yM4/AHz6OWtb+utmU1bg==
   dependencies:
     "@metascraper/helpers" "^5.40.0"
     cheerio "~1.0.0-rc.12"

From 739c690a29c27c75200786e48efa83867210231f Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 7 Dec 2023 12:18:49 +0100
Subject: [PATCH 24/36] Fixed generating duplicate newsletter names

refs https://github.com/TryGhost/DevOps/issues/119

- this switches away from using a static list of names in favor of ones
  generated by faker, so we don't run into duplicate names
- also minor code re-arranging
---
 .../lib/importers/NewslettersImporter.js               | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ghost/data-generator/lib/importers/NewslettersImporter.js b/ghost/data-generator/lib/importers/NewslettersImporter.js
index f8b0011c53..856e6eb303 100644
--- a/ghost/data-generator/lib/importers/NewslettersImporter.js
+++ b/ghost/data-generator/lib/importers/NewslettersImporter.js
@@ -6,21 +6,23 @@ const {slugify} = require('@tryghost/string');
 class NewslettersImporter extends TableImporter {
     static table = 'newsletters';
     static dependencies = [];
+
     defaultQuantity = 2;
 
+    sortOrder = 0;
+
     constructor(knex, transaction) {
         super(NewslettersImporter.table, knex, transaction);
-        this.sortOrder = 0;
-        // TODO: Use random names if we ever need more than 2 newsletters
-        this.names = ['Regular premium', 'Occasional freebie'];
     }
 
     generate() {
-        const name = this.names.shift();
+        const name = `${faker.commerce.productAdjective()} ${faker.word.noun()}`;
         const sortOrder = this.sortOrder;
         this.sortOrder = this.sortOrder + 1;
+
         const weekAfter = new Date(blogStartDate);
         weekAfter.setDate(weekAfter.getDate() + 7);
+
         return {
             id: faker.database.mongodbObjectId(),
             uuid: faker.datatype.uuid(),

From bb99a4c3940d41861398ad231ed2279d7b401780 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 7 Dec 2023 12:20:30 +0100
Subject: [PATCH 25/36] Removed unnecessary await

refs https://github.com/TryGhost/DevOps/issues/119

- this is not needed and tsserver was flagging it up
---
 ghost/data-generator/lib/DataGenerator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghost/data-generator/lib/DataGenerator.js b/ghost/data-generator/lib/DataGenerator.js
index 62884ec9e0..f84c4ba98b 100644
--- a/ghost/data-generator/lib/DataGenerator.js
+++ b/ghost/data-generator/lib/DataGenerator.js
@@ -91,7 +91,7 @@ class DataGenerator {
         }
         let baseData = {};
         try {
-            baseData = JSON.parse(await (await fs.readFile(baseDataPack)).toString());
+            baseData = JSON.parse((await fs.readFile(baseDataPack)).toString());
             this.logger.info('Read base data pack');
         } catch (error) {
             this.logger.error('Failed to read data pack: ', error);

From 76455cb64aec58310503b098ddb366a6af6942cf Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 7 Dec 2023 12:25:49 +0100
Subject: [PATCH 26/36] Decreased likelihood of duplicate member emails

refs https://github.com/TryGhost/DevOps/issues/119

- we can just expand the range here so it becomes extremely unlikely to
  ever hit duplicate emails
---
 ghost/data-generator/lib/importers/MembersImporter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghost/data-generator/lib/importers/MembersImporter.js b/ghost/data-generator/lib/importers/MembersImporter.js
index c5fc29b83f..644535b8d5 100644
--- a/ghost/data-generator/lib/importers/MembersImporter.js
+++ b/ghost/data-generator/lib/importers/MembersImporter.js
@@ -71,7 +71,7 @@ class MembersImporter extends TableImporter {
             id,
             uuid: faker.datatype.uuid(),
             transient_id: faker.datatype.uuid(),
-            email: `${name.replace(' ', '.').replace(/[^a-zA-Z0-9]/g, '').toLowerCase()}${faker.datatype.number({min: 1000, max: 9999})}@example.com`,
+            email: `${name.replace(' ', '.').replace(/[^a-zA-Z0-9]/g, '').toLowerCase()}${faker.datatype.number({min: 0, max: 999999})}@example.com`,
             status: luck(5) ? 'comped' : luck(25) ? 'paid' : 'free',
             name: name,
             expertise: luck(30) ? faker.name.jobTitle() : undefined,

From ff34a98b9479ebd6fe4d4384d2e6db62acae819c Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 7 Dec 2023 12:26:48 +0100
Subject: [PATCH 27/36] Deduplicated batch insertion code

refs https://github.com/TryGhost/DevOps/issues/119

- this function can simply call the `import` function, which performs
  the same code as we had here
- this makes the code cleaner to read and understand
---
 .../lib/importers/TableImporter.js            | 63 ++++++++++---------
 ghost/data-generator/package.json             |  1 +
 yarn.lock                                     |  2 +-
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/ghost/data-generator/lib/importers/TableImporter.js b/ghost/data-generator/lib/importers/TableImporter.js
index 04f1ac5a56..621e8cf5e7 100644
--- a/ghost/data-generator/lib/importers/TableImporter.js
+++ b/ghost/data-generator/lib/importers/TableImporter.js
@@ -1,3 +1,5 @@
+const debug = require('@tryghost/debug')('TableImporter');
+
 class TableImporter {
     /**
      * @type {object|undefined} model Referenced model when generating data
@@ -21,27 +23,29 @@ class TableImporter {
         this.transaction = transaction;
     }
 
-    async import(amount = this.defaultQuantity) {
-        const batchSize = 500;
-        let batch = [];
+    async #generateData(amount = this.defaultQuantity) {
+        let data = [];
 
         for (let i = 0; i < amount; i++) {
             const model = await this.generate();
             if (model) {
-                batch.push(model);
-            } else {
-                // After first null assume that there is no more data
-                break;
-            }
-            if (batch.length === batchSize) {
-                await this.knex.batchInsert(this.name, batch, batchSize).transacting(this.transaction);
-                batch = [];
+                data.push(model);
             }
         }
 
-        // Process final batch
-        if (batch.length > 0) {
-            await this.knex.batchInsert(this.name, batch, batchSize).transacting(this.transaction);
+        return data;
+    }
+
+    async import(amount = this.defaultQuantity) {
+        const generateNow = Date.now();
+        const data = await this.#generateData(amount);
+        debug(`${this.name} generated ${data.length} records in ${Date.now() - generateNow}ms`);
+
+        if (data.length > 0) {
+            debug (`Importing ${data.length} records into ${this.name}`);
+            const now = Date.now();
+            await this.knex.batchInsert(this.name, data).transacting(this.transaction);
+            debug(`${this.name} imported ${data.length} records in ${Date.now() - now}ms`);
         }
     }
 
@@ -50,8 +54,10 @@ class TableImporter {
      * @param {Number|function} amount Number of records to import per model
      */
     async importForEach(models = [], amount) {
-        const batchSize = 500;
-        let batch = [];
+        const data = [];
+
+        debug (`Generating data for ${models.length} models for ${this.name}`);
+        const now = Date.now();
 
         for (const model of models) {
             this.setReferencedModel(model);
@@ -59,24 +65,19 @@ class TableImporter {
             if (!Number.isInteger(currentAmount)) {
                 currentAmount = Math.floor(currentAmount) + ((Math.random() < currentAmount % 1) ? 1 : 0);
             }
-            for (let i = 0; i < currentAmount; i++) {
-                const data = await this.generate();
-                if (data) {
-                    batch.push(data);
-                } else {
-                    // After first null assume that there is no more data for this model
-                    break;
-                }
-                if (batch.length === batchSize) {
-                    await this.knex.batchInsert(this.name, batch, batchSize).transacting(this.transaction);
-                    batch = [];
-                }
+
+            const generatedData = await this.#generateData(currentAmount);
+            if (generatedData.length > 0) {
+                data.push(...generatedData);
             }
         }
 
-        // Process final batch
-        if (batch.length > 0) {
-            await this.knex.batchInsert(this.name, batch, batchSize).transacting(this.transaction);
+        debug(`${this.name} generated ${data.length} records in ${Date.now() - now}ms`);
+
+        if (data.length > 0) {
+            const now2 = Date.now();
+            await this.knex.batchInsert(this.name, data).transacting(this.transaction);
+            debug(`${this.name} imported ${data.length} records in ${Date.now() - now2}ms`);
         }
     }
 
diff --git a/ghost/data-generator/package.json b/ghost/data-generator/package.json
index 4adfc78b0b..85e401d9e6 100644
--- a/ghost/data-generator/package.json
+++ b/ghost/data-generator/package.json
@@ -18,6 +18,7 @@
     "lib"
   ],
   "devDependencies": {
+    "@tryghost/debug": "0.1.27",
     "c8": "8.0.1",
     "knex": "2.4.2",
     "mocha": "10.2.0",
diff --git a/yarn.lock b/yarn.lock
index 37d73d5a1b..c40a784c92 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7623,7 +7623,7 @@
     "@tryghost/root-utils" "^0.3.24"
     debug "^4.3.1"
 
-"@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.26", "@tryghost/debug@^0.1.27":
+"@tryghost/debug@0.1.27", "@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.26", "@tryghost/debug@^0.1.27":
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.27.tgz#e1e08e4b69b236de0996a710bac8bcb2d15552bc"
   integrity sha512-pLFSm+1FLYKKnjVR5B8dXC5ArjU9AbbW3IBv1oAtupjFDf+rtN/ShMgaaLI8c4c9G/F6fAtvnO/yOJ2ea85W4A==

From db16e565bc4660fb66de88734c1bd2a26b703f29 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 7 Dec 2023 13:03:56 +0100
Subject: [PATCH 28/36] Added `--print-dependencies` to data generator

refs https://github.com/TryGhost/DevOps/issues/119

- this allows you to debug the dependency chain to understand why a
  particular table is being generated
---
 ghost/core/core/cli/generate-data.js      |  4 +++-
 ghost/data-generator/lib/DataGenerator.js | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ghost/core/core/cli/generate-data.js b/ghost/core/core/cli/generate-data.js
index cd0f3cebb5..d6ec116c55 100644
--- a/ghost/core/core/cli/generate-data.js
+++ b/ghost/core/core/cli/generate-data.js
@@ -10,6 +10,7 @@ module.exports = class DataGeneratorCommand extends Command {
         this.argument('--clear-database', {type: 'boolean', defaultValue: false, desc: 'Clear all entries in the database before importing'});
         this.argument('--tables', {type: 'string', desc: 'Only import the specified list of tables, where quantities can be specified by appending a colon followed by the quantity for each table. Example: --tables=members:1000,posts,tags,members_login_events'});
         this.argument('--with-default', {type: 'boolean', defaultValue: false, desc: 'Include default tables as well as those specified (simply override quantities)'});
+        this.argument('--print-dependencies', {type: 'boolean', defaultValue: false, desc: 'Prints the dependency tree for the data generator and exits'});
     }
 
     initializeContext(context) {
@@ -51,7 +52,8 @@ module.exports = class DataGeneratorCommand extends Command {
             baseUrl: config.getSiteUrl(),
             clearDatabase: argv['clear-database'],
             tables,
-            withDefault: argv['with-default']
+            withDefault: argv['with-default'],
+            printDependencies: argv['print-dependencies']
         });
         try {
             await dataGenerator.importData();
diff --git a/ghost/data-generator/lib/DataGenerator.js b/ghost/data-generator/lib/DataGenerator.js
index f84c4ba98b..fcf387baea 100644
--- a/ghost/data-generator/lib/DataGenerator.js
+++ b/ghost/data-generator/lib/DataGenerator.js
@@ -18,6 +18,7 @@ class DataGenerator {
         baseDataPack = '',
         baseUrl,
         logger,
+        printDependencies,
         withDefault
     }) {
         this.knex = knex;
@@ -28,6 +29,7 @@ class DataGenerator {
         this.baseUrl = baseUrl;
         this.logger = logger;
         this.withDefault = withDefault;
+        this.printDependencies = printDependencies;
     }
 
     sortTableList() {
@@ -158,6 +160,14 @@ class DataGenerator {
 
         this.sortTableList();
 
+        if (this.printDependencies) {
+            this.logger.info('Table dependencies:');
+            for (const table of this.tableList) {
+                this.logger.info(`\t${table.name}: ${table.dependencies.join(', ')}`);
+            }
+            process.exit(0);
+        }
+
         if (this.willClearData) {
             await this.clearData(transaction);
         }

From 845d3cf75951dc23fd8a6f6a96bb70e921c683b6 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <hi@daniellockyer.com>
Date: Thu, 7 Dec 2023 14:08:11 +0100
Subject: [PATCH 29/36] Fixed generating multiple members_newsletters records

refs https://github.com/TryGhost/DevOps/issues/119

- members_newsletters needs members_subscribe_events, but it was also
  then generating `subscriptions` records and the whole thing was really
  slow
- for now, subscriptions is not a used table so we can remove use of it
- also adds support for generating more than one subscription record
  with an 80% chance of being subscribed
---
 .../MembersSubscribeEventsImporter.js         | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/ghost/data-generator/lib/importers/MembersSubscribeEventsImporter.js b/ghost/data-generator/lib/importers/MembersSubscribeEventsImporter.js
index d46a3782a4..94984c54e0 100644
--- a/ghost/data-generator/lib/importers/MembersSubscribeEventsImporter.js
+++ b/ghost/data-generator/lib/importers/MembersSubscribeEventsImporter.js
@@ -5,7 +5,7 @@ const dateToDatabaseString = require('../utils/database-date');
 
 class MembersSubscribeEventsImporter extends TableImporter {
     static table = 'members_subscribe_events';
-    static dependencies = ['members', 'newsletters', 'subscriptions'];
+    static dependencies = ['members', 'newsletters'/*, 'subscriptions'*/];
 
     constructor(knex, transaction) {
         super(MembersSubscribeEventsImporter.table, knex, transaction);
@@ -14,9 +14,9 @@ class MembersSubscribeEventsImporter extends TableImporter {
     async import(quantity) {
         const members = await this.transaction.select('id', 'created_at', 'status').from('members');
         this.newsletters = await this.transaction.select('id').from('newsletters').orderBy('sort_order');
-        this.subscriptions = await this.transaction.select('member_id', 'created_at').from('subscriptions');
+        //this.subscriptions = await this.transaction.select('member_id', 'created_at').from('subscriptions');
 
-        await this.importForEach(members, quantity ? quantity / members.length : 2);
+        await this.importForEach(members, quantity ? quantity / members.length : this.newsletters.length);
     }
 
     setReferencedModel(model) {
@@ -32,22 +32,15 @@ class MembersSubscribeEventsImporter extends TableImporter {
             return null;
         }
 
-        let createdAt = dateToDatabaseString(faker.date.between(new Date(this.model.created_at), new Date()));
         let subscribed = luck(80);
 
-        // Free newsletter by default
-        let newsletterId = this.newsletters[1].id;
-        if (this.model.status === 'paid' && count === 0) {
-            // Paid newsletter
-            newsletterId = this.newsletters[0].id;
-            createdAt = this.subscriptions.find(s => s.member_id === this.model.id).created_at;
-            subscribed = luck(98);
-        }
-
         if (!subscribed) {
             return null;
         }
 
+        const createdAt = dateToDatabaseString(faker.date.between(new Date(this.model.created_at), new Date()));
+        const newsletterId = this.newsletters[count % this.newsletters.length].id;
+
         return {
             id: faker.database.mongodbObjectId(),
             member_id: this.model.id,

From 4b5718f6e39e5d9658c62ddd9dfc15b85ebde565 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@ghost.org>
Date: Thu, 7 Dec 2023 14:11:07 +0000
Subject: [PATCH 30/36] Added error reporting when editor instances fail to
 load (#19284)

no issue

- recently we introduced code that broke the editor in older versions of
Safari but we weren't alerted to it until we started getting customer
reports
- we have an `ErrorBoundary` around the React editor components but this
wasn't reporting the error anywhere and simply showed an error message
- updated the boundary to report to Sentry when configured so we can
notice and fix any editor-breaking issues faster
---
 .../app/components/koenig-lexical-editor-input.js  | 14 +++++++++++++-
 .../admin/app/components/koenig-lexical-editor.js  | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ghost/admin/app/components/koenig-lexical-editor-input.js b/ghost/admin/app/components/koenig-lexical-editor-input.js
index 950859846c..526b6cd34b 100644
--- a/ghost/admin/app/components/koenig-lexical-editor-input.js
+++ b/ghost/admin/app/components/koenig-lexical-editor-input.js
@@ -14,6 +14,18 @@ class ErrorHandler extends React.Component {
         return {hasError: true};
     }
 
+    componentDidCatch(error) {
+        if (this.props.config.sentry_dsn) {
+            Sentry.captureException(error, {
+                tags: {
+                    lexical: true
+                }
+            });
+        }
+
+        console.error(error, errorInfo); // eslint-disable-line
+    }
+
     render() {
         if (this.state.hasError) {
             return (
@@ -82,7 +94,7 @@ export default class KoenigLexicalEditorInput extends Component {
     ReactComponent = (props) => {
         return (
             <div className={['koenig-react-editor', this.args.className].filter(Boolean).join(' ')}>
-                <ErrorHandler>
+                <ErrorHandler config={this.config}>
                     <Suspense fallback={<p className="koenig-react-editor-loading">Loading editor...</p>}>
                         <KoenigComposer
                             editorResource={this.editorResource}
diff --git a/ghost/admin/app/components/koenig-lexical-editor.js b/ghost/admin/app/components/koenig-lexical-editor.js
index de54ccc3f7..5c2f26c4d4 100644
--- a/ghost/admin/app/components/koenig-lexical-editor.js
+++ b/ghost/admin/app/components/koenig-lexical-editor.js
@@ -49,6 +49,18 @@ class ErrorHandler extends React.Component {
         return {hasError: true};
     }
 
+    componentDidCatch(error) {
+        if (this.props.config.sentry_dsn) {
+            Sentry.captureException(error, {
+                tags: {
+                    lexical: true
+                }
+            });
+        }
+
+        console.error(error, errorInfo); // eslint-disable-line
+    }
+
     render() {
         if (this.state.hasError) {
             return (
@@ -513,7 +525,7 @@ export default class KoenigLexicalEditor extends Component {
 
         return (
             <div className={['koenig-react-editor', 'koenig-lexical', this.args.className].filter(Boolean).join(' ')}>
-                <ErrorHandler>
+                <ErrorHandler config={this.config}>
                     <Suspense fallback={<p className="koenig-react-editor-loading">Loading editor...</p>}>
                         <KoenigComposer
                             editorResource={this.editorResource}

From e5c6b0a23f74979bd8dd1eb6335f141344f29ca2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 14:13:15 +0000
Subject: [PATCH 31/36] Update storybook monorepo to v7.6.4

---
 apps/admin-x-design-system/package.json |  14 +-
 apps/signup-form/package.json           |  14 +-
 yarn.lock                               | 544 ++++++++++++------------
 3 files changed, 286 insertions(+), 286 deletions(-)

diff --git a/apps/admin-x-design-system/package.json b/apps/admin-x-design-system/package.json
index da7e6d25a3..433d2375d8 100644
--- a/apps/admin-x-design-system/package.json
+++ b/apps/admin-x-design-system/package.json
@@ -27,13 +27,13 @@
   ],
   "devDependencies": {
     "@codemirror/lang-html": "^6.4.5",
-    "@storybook/addon-essentials": "7.6.3",
-    "@storybook/addon-interactions": "7.6.3",
-    "@storybook/addon-links": "7.6.3",
+    "@storybook/addon-essentials": "7.6.4",
+    "@storybook/addon-interactions": "7.6.4",
+    "@storybook/addon-links": "7.6.4",
     "@storybook/addon-styling": "1.3.7",
-    "@storybook/blocks": "7.6.3",
-    "@storybook/react": "7.6.3",
-    "@storybook/react-vite": "7.6.3",
+    "@storybook/blocks": "7.6.4",
+    "@storybook/react": "7.6.4",
+    "@storybook/react-vite": "7.6.4",
     "@storybook/testing-library": "0.2.2",
     "@testing-library/react": "14.1.0",
     "@vitejs/plugin-react": "4.2.1",
@@ -46,7 +46,7 @@
     "react-dom": "^18.2.0",
     "rollup-plugin-node-builtins": "2.1.2",
     "sinon": "17.0.0",
-    "storybook": "7.6.3",
+    "storybook": "7.6.4",
     "ts-node": "10.9.1",
     "typescript": "5.3.3",
     "vite": "4.5.1",
diff --git a/apps/signup-form/package.json b/apps/signup-form/package.json
index b6499da02d..fe7b847869 100644
--- a/apps/signup-form/package.json
+++ b/apps/signup-form/package.json
@@ -40,13 +40,13 @@
     },
     "devDependencies": {
         "@playwright/test": "1.38.1",
-        "@storybook/addon-essentials": "7.6.3",
-        "@storybook/addon-interactions": "7.6.3",
-        "@storybook/addon-links": "7.6.3",
+        "@storybook/addon-essentials": "7.6.4",
+        "@storybook/addon-interactions": "7.6.4",
+        "@storybook/addon-links": "7.6.4",
         "@storybook/addon-styling": "1.3.7",
-        "@storybook/blocks": "7.6.3",
-        "@storybook/react": "7.6.3",
-        "@storybook/react-vite": "7.6.3",
+        "@storybook/blocks": "7.6.4",
+        "@storybook/react": "7.6.4",
+        "@storybook/react-vite": "7.6.4",
         "@storybook/testing-library": "0.2.2",
         "@tailwindcss/line-clamp": "0.4.4",
         "@types/react": "18.2.42",
@@ -61,7 +61,7 @@
         "postcss-import": "15.1.0",
         "prop-types": "15.8.1",
         "rollup-plugin-node-builtins": "2.1.2",
-        "storybook": "7.6.3",
+        "storybook": "7.6.4",
         "stylelint": "15.10.3",
         "tailwindcss": "3.3.6",
         "vite": "4.5.1",
diff --git a/yarn.lock b/yarn.lock
index c40a784c92..1bad9745e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6437,120 +6437,120 @@
     "@stdlib/utils-constructor-name" "^0.0.x"
     "@stdlib/utils-global" "^0.0.x"
 
-"@storybook/addon-actions@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.6.3.tgz#c84980d8cf95b47918d87f996844c309c45252e3"
-  integrity sha512-f4HXteYE8IJXztAK+ab5heSjXWNWvyIAU63T3Fqe3zmqONwCerUKY54Op+RkAZc/R6aALTxvGRKAH2ff8g2vjQ==
+"@storybook/addon-actions@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.6.4.tgz#b2d2941baa926718f0c53581c8cc8b19c2e0393b"
+  integrity sha512-91UD5KPDik74VKVioPMcbwwvDXN/non8p1wArYAHCHCmd/Pts5MJRiFueSdfomSpNjUtjtn6eSXtwpIL3XVOfQ==
   dependencies:
-    "@storybook/core-events" "7.6.3"
+    "@storybook/core-events" "7.6.4"
     "@storybook/global" "^5.0.0"
     "@types/uuid" "^9.0.1"
     dequal "^2.0.2"
     polished "^4.2.2"
     uuid "^9.0.0"
 
-"@storybook/addon-backgrounds@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.6.3.tgz#4f4ca4ed998fb2267d2a056f8921a43d9869bff8"
-  integrity sha512-ZZFNf8FBYBsuXvXdVk3sBgxJTn6s0HznuEE9OmAA7tMsLEDlUiWS9LEvjX2jX5K0kWivHTkJDTXV0NcLL1vWAg==
+"@storybook/addon-backgrounds@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.6.4.tgz#8ba49f4ad88327f606edb1f08fb0aef4e8eb3f05"
+  integrity sha512-gNy3kIkHSr+Lg/jVDHwbZjIe1po5SDGZNVe39vrJwnqGz8T1clWes9WHCL6zk/uaCDA3yUna2Nt/KlOFAWDSoQ==
   dependencies:
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-controls@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.6.3.tgz#1ade53748b04c37d9b604f76e1da82dfe4721c0b"
-  integrity sha512-xsM3z+CY1YOPqrcCldQLoon947fbd/o3gSO7hM3NwKiw/2WikExPO3VM4R2oi4W4PvnhkSOIO+ZDRuSs1yFmOg==
+"@storybook/addon-controls@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.6.4.tgz#8f8651a1e929f5f8506d025bcc5c3e454444b1c3"
+  integrity sha512-k4AtZfazmD/nL3JAtLGAB7raPhkhUo0jWnaZWrahd9h1Fm13mBU/RW+JzTRhCw3Mp2HPERD7NI5Qcd2fUP6WDA==
   dependencies:
-    "@storybook/blocks" "7.6.3"
+    "@storybook/blocks" "7.6.4"
     lodash "^4.17.21"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-docs@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.6.3.tgz#113e62a13729489e2657d2b779b5be33893f6758"
-  integrity sha512-2Ts+3EFg9ehkQdbjBWnCH1SE0BdyCLN6hO2N030tGxi0Vko9t9O7NLj5qdBwxLcEzb/XzL4zWukzfU17pktQwA==
+"@storybook/addon-docs@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.6.4.tgz#e15ab003482d5c43da43edae8557ac6e0988017e"
+  integrity sha512-PbFMbvC9sK3sGdMhwmagXs9TqopTp9FySji+L8O7W9SHRC6wSmdwoWWPWybkOYxr/z/wXi7EM0azSAX7yQxLbw==
   dependencies:
     "@jest/transform" "^29.3.1"
     "@mdx-js/react" "^2.1.5"
-    "@storybook/blocks" "7.6.3"
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/components" "7.6.3"
-    "@storybook/csf-plugin" "7.6.3"
-    "@storybook/csf-tools" "7.6.3"
+    "@storybook/blocks" "7.6.4"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/components" "7.6.4"
+    "@storybook/csf-plugin" "7.6.4"
+    "@storybook/csf-tools" "7.6.4"
     "@storybook/global" "^5.0.0"
     "@storybook/mdx2-csf" "^1.0.0"
-    "@storybook/node-logger" "7.6.3"
-    "@storybook/postinstall" "7.6.3"
-    "@storybook/preview-api" "7.6.3"
-    "@storybook/react-dom-shim" "7.6.3"
-    "@storybook/theming" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/postinstall" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/react-dom-shim" "7.6.4"
+    "@storybook/theming" "7.6.4"
+    "@storybook/types" "7.6.4"
     fs-extra "^11.1.0"
     remark-external-links "^8.0.0"
     remark-slug "^6.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-essentials@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.6.3.tgz#04bec8eadfe22833cdeacac105a295b3099c2c72"
-  integrity sha512-bpbt5O0wcB83VLZg8QMXut+8g+7EF4iuevpwiynN9mbpQFvG49c6SE6T2eFJKTvVb4zszyfcNA0Opne2G83wZw==
+"@storybook/addon-essentials@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.6.4.tgz#9ae4fa2836a603cccaf6065ae0ca81d7fb5f7139"
+  integrity sha512-J+zPmP4pbuuFxQ3pjLRYQRnxEtp7jF3xRXGFO8brVnEqtqoxwJ6j3euUrRLe0rpGAU3AD7dYfaaFjd3xkENgTw==
   dependencies:
-    "@storybook/addon-actions" "7.6.3"
-    "@storybook/addon-backgrounds" "7.6.3"
-    "@storybook/addon-controls" "7.6.3"
-    "@storybook/addon-docs" "7.6.3"
-    "@storybook/addon-highlight" "7.6.3"
-    "@storybook/addon-measure" "7.6.3"
-    "@storybook/addon-outline" "7.6.3"
-    "@storybook/addon-toolbars" "7.6.3"
-    "@storybook/addon-viewport" "7.6.3"
-    "@storybook/core-common" "7.6.3"
-    "@storybook/manager-api" "7.6.3"
-    "@storybook/node-logger" "7.6.3"
-    "@storybook/preview-api" "7.6.3"
+    "@storybook/addon-actions" "7.6.4"
+    "@storybook/addon-backgrounds" "7.6.4"
+    "@storybook/addon-controls" "7.6.4"
+    "@storybook/addon-docs" "7.6.4"
+    "@storybook/addon-highlight" "7.6.4"
+    "@storybook/addon-measure" "7.6.4"
+    "@storybook/addon-outline" "7.6.4"
+    "@storybook/addon-toolbars" "7.6.4"
+    "@storybook/addon-viewport" "7.6.4"
+    "@storybook/core-common" "7.6.4"
+    "@storybook/manager-api" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-highlight@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.6.3.tgz#e6c9b8fe88acbf91c76c82e519eda7f2d129da61"
-  integrity sha512-Z9AJ05XCTzFZPAxQSkQf9/Hazf5/QQI0jYSsvKqt7Vk+03q5727oD9KcIY5IHPYqQqN9fHExQh1eyqY8AnS8mg==
+"@storybook/addon-highlight@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.6.4.tgz#0d71de9b081fd7d2fa0d7003a19b47002be1e4f3"
+  integrity sha512-0kvjDzquoPwWWU61QYmEtcSGWXufnV7Z/bfBTYh132uxvV/X9YzDFcXXrxGL7sBJkK32gNUUBDuiTOxs5NxyOQ==
   dependencies:
     "@storybook/global" "^5.0.0"
 
-"@storybook/addon-interactions@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-interactions/-/addon-interactions-7.6.3.tgz#0e062aa81aaee1ebce9b943ad29c7f0cf56816a9"
-  integrity sha512-Gm2UJvQC8xs9KIbVZQegTLT3VBsEZIRsXy3htNqWjSdoJZK5M4/YJ3jB247CA/Jc+Mkj7d5SlJe+bCGEzjKTbw==
+"@storybook/addon-interactions@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-interactions/-/addon-interactions-7.6.4.tgz#e46a68f715b48b8d630fdc6a98c94ad3c7553f73"
+  integrity sha512-LjK9uhkgnbGyDwwa7pQhLptDEHeTIFmy+KurfJs9T08DpvRFfuuzyW4mj/hA63R1W5yjFSAhRiZj26+D7kBIyw==
   dependencies:
     "@storybook/global" "^5.0.0"
-    "@storybook/types" "7.6.3"
+    "@storybook/types" "7.6.4"
     jest-mock "^27.0.6"
     polished "^4.2.2"
     ts-dedent "^2.2.0"
 
-"@storybook/addon-links@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-7.6.3.tgz#027a51941b5700494cced6c02555c7864011fc48"
-  integrity sha512-dUIf6Y0nckxZfVQvQSqcthaycRxy69dCJLo3aORrOPL8NvGz3v1bK0AUded5wv8vnOVxfSx/Zqu7MyFr9xyjOA==
+"@storybook/addon-links@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-7.6.4.tgz#e484cd67d26c4877e3dd77b2211fc3d02875e3c1"
+  integrity sha512-TEhxYdMhJO28gD84ej1FCwLv9oLuCPt77bRXip9ndaNPRTdHYdWv6IP94dhbuDi8eHux7Z4A/mllciFuDFrnCw==
   dependencies:
     "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-measure@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.6.3.tgz#56fd1c21c220b2023462c07219f4644b8c4f17ea"
-  integrity sha512-DqxADof04ktA5GSA8XnckYGdVYyC4oN8vfKSGcPzpcKrJ2uVr0BXbcyJAEcJAshEJimmpA6nH5TxabXDFBZgPQ==
+"@storybook/addon-measure@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.6.4.tgz#0597ae04a27ff596bc8f2015f7c746b33eef78a3"
+  integrity sha512-73wsJ8PALsgWniR3MA/cmxcFuU6cRruWdIyYzOMgM8ife2Jm3xSkV7cTTXAqXt2H9Uuki4PGnuMHWWFLpPeyVA==
   dependencies:
     "@storybook/global" "^5.0.0"
     tiny-invariant "^1.3.1"
 
-"@storybook/addon-outline@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.6.3.tgz#09969830938c803c9ad24037acdd4bb56eff98bf"
-  integrity sha512-M7d2tcqBBl+mPBUS6Nrwis50QYSCcmT/uKamud7CnlIWsMH/5GZFfAzGSLY5ETfiGsSFYssOwrXLOV4y0enu2g==
+"@storybook/addon-outline@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.6.4.tgz#1c62a4c5e97f277ded888e3157d5948618ec98fb"
+  integrity sha512-CFxGASRse/qeFocetDKFNeWZ3Aa2wapVtRciDNa4Zx7k1wCnTjEsPIm54waOuCaNVcrvO+nJUAZG5WyiorQvcg==
   dependencies:
     "@storybook/global" "^5.0.0"
     ts-dedent "^2.0.0"
@@ -6579,15 +6579,15 @@
     sass-loader "^13.2.2"
     style-loader "^3.3.2"
 
-"@storybook/addon-toolbars@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.6.3.tgz#f95704d054ac418a3410c424cc81e9b4d28ad8c5"
-  integrity sha512-8GpwOt0J5yLrJhTr9/h0a/LTDjt49FhdvdxiVWLlLMrjIXSIc7j193ZgoHfnlwVhJS5zojcjB+HmRw/E+AneoA==
+"@storybook/addon-toolbars@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.6.4.tgz#de76577d20db8a0e63c567d9cbfad7de15ca0f56"
+  integrity sha512-ENMQJgU4sRCLLDVXYfa+P3cQVV9PC0ZxwVAKeM3NPYPNH/ODoryGNtq+Q68LwHlM4ObCE2oc9MzaQqPxloFcCw==
 
-"@storybook/addon-viewport@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.6.3.tgz#70b8920f0b272ab723b5b2a3819cdaf10acfa051"
-  integrity sha512-I9FQxHi4W7RUyZut4NziYa+nkBCpD1k2YpEDE5IwSC3lqQpDzFZN89eNWQtZ38tIU4c90jL3L1k69IHvANGHsA==
+"@storybook/addon-viewport@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.6.4.tgz#f39601082f48a903c47cae71a84b05428ea20331"
+  integrity sha512-SoTcHIoqybhYD28v7QExF1EZnl7FfxuP74VDhtze5LyMd2CbqmVnUfwewLCz/3IvCNce0GqdNyg1m6QJ7Eq1uw==
   dependencies:
     memoizerific "^1.11.3"
 
@@ -6599,22 +6599,22 @@
     "@storybook/client-logger" "7.0.20"
     "@storybook/manager-api" "7.0.20"
 
-"@storybook/blocks@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.6.3.tgz#61f1ce2935b20f6fd55a95f1a970809be53bdcc7"
-  integrity sha512-EyjyNNCZMcV9UnBSujwduiq+F1VLVX/f16fTTPqqZOHigyfrG5LoEYC6dwOC4yO/xfWY+h3qJ51yiugMxVl0Vg==
+"@storybook/blocks@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.6.4.tgz#f5d0de020b886e0fd17021608df5b73e5e39ae69"
+  integrity sha512-iXinXXhTUBtReREP1Jifpu35DnGg7FidehjvCM8sM4E4aymfb8czdg9DdvG46T2UFUPUct36nnjIdMLWOya8Bw==
   dependencies:
-    "@storybook/channels" "7.6.3"
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/components" "7.6.3"
-    "@storybook/core-events" "7.6.3"
+    "@storybook/channels" "7.6.4"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/components" "7.6.4"
+    "@storybook/core-events" "7.6.4"
     "@storybook/csf" "^0.1.2"
-    "@storybook/docs-tools" "7.6.3"
+    "@storybook/docs-tools" "7.6.4"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.6.3"
-    "@storybook/preview-api" "7.6.3"
-    "@storybook/theming" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/manager-api" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/theming" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/lodash" "^4.14.167"
     color-convert "^2.0.1"
     dequal "^2.0.2"
@@ -6628,15 +6628,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/builder-manager@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-7.6.3.tgz#bb16bbf945872d1acff7edc9f9e6b42cec4841d5"
-  integrity sha512-eLMjRudhiRsg7kgbmPcCkuVf2ut753fbiVR7REtqIYwq5vu8UeNOzt1vA6HgfsUj77/7+1zG8/zeyBv/5nY5mw==
+"@storybook/builder-manager@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-7.6.4.tgz#64d4745f918bf370924b767cc3a767818fa45a47"
+  integrity sha512-k5+D3fXw7LdMOWd5tF7cIq8L3irrdW6/vmcEHLaJj1EXZ+DvsNCH9xSsLS+6zfrUcxug4oSfRqvF87w6Oz3DtA==
   dependencies:
     "@fal-works/esbuild-plugin-global-externals" "^2.1.2"
-    "@storybook/core-common" "7.6.3"
-    "@storybook/manager" "7.6.3"
-    "@storybook/node-logger" "7.6.3"
+    "@storybook/core-common" "7.6.4"
+    "@storybook/manager" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
     "@types/ejs" "^3.1.1"
     "@types/find-cache-dir" "^3.2.1"
     "@yarnpkg/esbuild-plugin-pnp" "^3.0.0-rc.10"
@@ -6650,19 +6650,19 @@
     process "^0.11.10"
     util "^0.12.4"
 
-"@storybook/builder-vite@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-vite/-/builder-vite-7.6.3.tgz#421c658eb2c1affc2959bcab2f2e7835a8ff989c"
-  integrity sha512-r/G/6wdwgbhMiMZ8Z+Js8VLjIo7a0DG5SxJorTHSWNi0+jyM+3Qlg3Xj96I8yL4gfTIKWVScHqHprhjRb2E64g==
+"@storybook/builder-vite@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-vite/-/builder-vite-7.6.4.tgz#a9baaf41731c1da63a9f70bd015975b638f95bc5"
+  integrity sha512-eqb3mLUfuXd4a7+46cWevQ9qH81FvHy1lrAbZGwp4bQ/Tj0YF8Ej7lKBbg7zoIwiu2zDci+BbMiaDOY1kPtILw==
   dependencies:
-    "@storybook/channels" "7.6.3"
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/core-common" "7.6.3"
-    "@storybook/csf-plugin" "7.6.3"
-    "@storybook/node-logger" "7.6.3"
-    "@storybook/preview" "7.6.3"
-    "@storybook/preview-api" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/channels" "7.6.4"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-common" "7.6.4"
+    "@storybook/csf-plugin" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/preview" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/find-cache-dir" "^3.2.1"
     browser-assert "^1.2.1"
     es-module-lexer "^0.9.3"
@@ -6677,35 +6677,35 @@
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.20.tgz#a681c3d463b4099b001dae9edeb3a607a8f4854a"
   integrity sha512-AL5GGSQ8WTDUoh3gitKEzo3fu7Vq5okXq2pAknAZlQA2Oio+HHO5nMeXvOfGdvo/tzbpNE3n5utmCJz006xrCA==
 
-"@storybook/channels@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.6.3.tgz#b3e0a8d92dfd553ba582fdb5dd0c55272790d3f9"
-  integrity sha512-o9J0TBbFon16tUlU5V6kJgzAlsloJcS1cTHWqh3VWczohbRm+X1PLNUihJ7Q8kBWXAuuJkgBu7RQH7Ib46WyYg==
+"@storybook/channels@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.6.4.tgz#d0af47f1f049c3ad77bcdefec54253f56b3b0a47"
+  integrity sha512-Z4PY09/Czl70ap4ObmZ4bgin+EQhPaA3HdrEDNwpnH7A9ttfEO5u5KThytIjMq6kApCCihmEPDaYltoVrfYJJA==
   dependencies:
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/core-events" "7.6.3"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-events" "7.6.4"
     "@storybook/global" "^5.0.0"
     qs "^6.10.0"
     telejson "^7.2.0"
     tiny-invariant "^1.3.1"
 
-"@storybook/cli@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.6.3.tgz#3c1935c0bee5e805d2fb55a875e5c377cb3503ae"
-  integrity sha512-OuYnzZlAtpGm4rDgI4ZWkNbAkddutlJh6KmoU9oQAlZP0zmETyJN8REUWjj5T9Z1AS2iXjCMGlFVd4TC8nKocw==
+"@storybook/cli@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.6.4.tgz#3680233a32975a400c091341f8b6ae4cdb01c72f"
+  integrity sha512-GqvaFdkkBMJOdnrVe82XY0V3b+qFMhRNyVoTv2nqB87iMUXZHqh4Pu4LqwaJBsBpuNregvCvVOPe9LGgoOzy4A==
   dependencies:
     "@babel/core" "^7.23.2"
     "@babel/preset-env" "^7.23.2"
     "@babel/types" "^7.23.0"
     "@ndelangen/get-tarball" "^3.0.7"
-    "@storybook/codemod" "7.6.3"
-    "@storybook/core-common" "7.6.3"
-    "@storybook/core-events" "7.6.3"
-    "@storybook/core-server" "7.6.3"
-    "@storybook/csf-tools" "7.6.3"
-    "@storybook/node-logger" "7.6.3"
-    "@storybook/telemetry" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/codemod" "7.6.4"
+    "@storybook/core-common" "7.6.4"
+    "@storybook/core-events" "7.6.4"
+    "@storybook/core-server" "7.6.4"
+    "@storybook/csf-tools" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/telemetry" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/semver" "^7.3.4"
     "@yarnpkg/fslib" "2.10.3"
     "@yarnpkg/libzip" "2.3.0"
@@ -6743,25 +6743,25 @@
   dependencies:
     "@storybook/global" "^5.0.0"
 
-"@storybook/client-logger@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.6.3.tgz#221d6617e6874025b94602bc7ba6bf09d154bf5f"
-  integrity sha512-BpsCnefrBFdxD6ukMjAblm1D6zB4U5HR1I85VWw6LOqZrfzA6l/1uBxItz0XG96HTjngbvAabWf5k7ZFCx5UCg==
+"@storybook/client-logger@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.6.4.tgz#7533f5194903f554c297b0d327efee04c5accfbb"
+  integrity sha512-vJwMShC98tcoFruRVQ4FphmFqvAZX1FqZqjFyk6IxtFumPKTVSnXJjlU1SnUIkSK2x97rgdUMqkdI+wAv/tugQ==
   dependencies:
     "@storybook/global" "^5.0.0"
 
-"@storybook/codemod@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.6.3.tgz#02db1a61f1fc088348f694b80aef18a929111da5"
-  integrity sha512-A1i8+WQfNg3frVcwSyu8E/cDkCu88Sw7JiGNnq9iW2e2oWMr2awpCDgXp8WfTK+HiDb2X1Pq5y/GmUlh3qr77Q==
+"@storybook/codemod@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.6.4.tgz#e3a314ad07f9dc799bd2531bb7ffc6ab3cf15996"
+  integrity sha512-q4rZVOfozxzbDRH/LzuFDoIGBdXs+orAm18fi6iAx8PeMHe8J/MOXKccNV1zdkm/h7mTQowuRo45KwJHw8vX+g==
   dependencies:
     "@babel/core" "^7.23.2"
     "@babel/preset-env" "^7.23.2"
     "@babel/types" "^7.23.0"
     "@storybook/csf" "^0.1.2"
-    "@storybook/csf-tools" "7.6.3"
-    "@storybook/node-logger" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/csf-tools" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/cross-spawn" "^6.0.2"
     cross-spawn "^7.0.3"
     globby "^11.0.2"
@@ -6770,38 +6770,38 @@
     prettier "^2.8.0"
     recast "^0.23.1"
 
-"@storybook/components@7.6.3", "@storybook/components@^7.0.12":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.6.3.tgz#07ab85253abd62d3725ccf23542362ddf11ece2d"
-  integrity sha512-UNV0WoUo+W0huOLvoEMuqRN/VB4p0CNswrXN1mi/oGWvAFJ8idu63lSuV4uQ/LKxAZ6v3Kpdd+oK/o+OeOoL6w==
+"@storybook/components@7.6.4", "@storybook/components@^7.0.12":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.6.4.tgz#44cf5fa1b52af540157b4dee7d23a46817329ab1"
+  integrity sha512-K5RvEObJAnX+SbGJbkM1qrZEk+VR2cUhRCSrFnlfMwsn8/60T3qoH7U8bCXf8krDgbquhMwqev5WzDB+T1VV8g==
   dependencies:
     "@radix-ui/react-select" "^1.2.2"
     "@radix-ui/react-toolbar" "^1.0.4"
-    "@storybook/client-logger" "7.6.3"
+    "@storybook/client-logger" "7.6.4"
     "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/theming" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/theming" "7.6.4"
+    "@storybook/types" "7.6.4"
     memoizerific "^1.11.3"
     use-resize-observer "^9.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/core-client@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.6.3.tgz#6324400b71e007c7414135d6d97054d515356677"
-  integrity sha512-RM0Svlajddl8PP4Vq7LK8T22sFefNcTDgo82iRPZzGz0oH8LT0oXGFanj2Nkn0jruOBFClkiJ7EcwrbGJZHELg==
+"@storybook/core-client@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.6.4.tgz#d38ddb80bbc6119017a8ba15b88c030cf03d27e0"
+  integrity sha512-0msqdGd+VYD1dRgAJ2StTu4d543Wveb7LVVujX3PwD/QCxmCaVUHuAoZrekM/H7jZLw546ZIbLZo0xWrADAUMw==
   dependencies:
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/preview-api" "7.6.3"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
 
-"@storybook/core-common@7.6.3", "@storybook/core-common@^7.0.12":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.6.3.tgz#33d726c0178d4336da581c74620680c2a59050cc"
-  integrity sha512-/ZE4BEyGwBHCQCOo681GyBKF4IqCiwVV/ZJCHTMTHFCPLJT2r+Qwv4tnI7xt1kwflOlbBlG6B6CvAqTjjVw/Ew==
+"@storybook/core-common@7.6.4", "@storybook/core-common@^7.0.12":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.6.4.tgz#8ee282058ea4dd8fc0a053c30759f4bf65dab86b"
+  integrity sha512-qes4+mXqINu0kCgSMFjk++GZokmYjb71esId0zyJsk0pcIPkAiEjnhbSEQkMhbUfcvO1lztoaQTBW2P7Rd1tag==
   dependencies:
-    "@storybook/core-events" "7.6.3"
-    "@storybook/node-logger" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/core-events" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/find-cache-dir" "^3.2.1"
     "@types/node" "^18.0.0"
     "@types/node-fetch" "^2.6.4"
@@ -6828,33 +6828,33 @@
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.20.tgz#53878b736463c30141115ccdfba401bcf2645cba"
   integrity sha512-gUBQsbcDmRufmg8LdH7D57c/9BQ+cPi2vBcXdudmxeJFafGwDmLRu1mlv9rxlW4kicn/LZWJjKXtq4XXzF4OGg==
 
-"@storybook/core-events@7.6.3", "@storybook/core-events@^7.0.12":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.6.3.tgz#55ea88f5355bd995daf9ed0287293536b3eb7091"
-  integrity sha512-Vu3JX1mjtR8AX84lyqWsi2s2lhD997jKRWVznI3wx+UpTk8t7TTMLFk2rGYJRjaornhrqwvLYpnmtxRSxW9BOQ==
+"@storybook/core-events@7.6.4", "@storybook/core-events@^7.0.12":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.6.4.tgz#55405545dbc9ae5715654d2198ee1f1a3cc34ef7"
+  integrity sha512-i3xzcJ19ILSy4oJL5Dz9y0IlyApynn5RsGhAMIsW+mcfri+hGfeakq1stNCo0o7jW4Y3A7oluFTtIoK8DOxQdQ==
   dependencies:
     ts-dedent "^2.0.0"
 
-"@storybook/core-server@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.6.3.tgz#a5172b20f7ac813d332ba0dcab62dd81a7a07e00"
-  integrity sha512-IsM24MmiFmtZeyqoijiExpIPkJNBaWQg9ttkkHS6iYwf3yFNBpYVbvuX2OpT7FDdiF3uTl0R8IvfnJR58tHD7w==
+"@storybook/core-server@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.6.4.tgz#7732be1437af2affb3d7b0c5528446006a4c72a3"
+  integrity sha512-mXxZMpCwOhjEPPRjqrTHdiCpFdkc47f46vlgTj02SX+9xKHxslmZ2D3JG/8O4Ab9tG+bBl6lBm3RIrIzaiCu9Q==
   dependencies:
     "@aw-web-design/x-default-browser" "1.4.126"
     "@discoveryjs/json-ext" "^0.5.3"
-    "@storybook/builder-manager" "7.6.3"
-    "@storybook/channels" "7.6.3"
-    "@storybook/core-common" "7.6.3"
-    "@storybook/core-events" "7.6.3"
+    "@storybook/builder-manager" "7.6.4"
+    "@storybook/channels" "7.6.4"
+    "@storybook/core-common" "7.6.4"
+    "@storybook/core-events" "7.6.4"
     "@storybook/csf" "^0.1.2"
-    "@storybook/csf-tools" "7.6.3"
+    "@storybook/csf-tools" "7.6.4"
     "@storybook/docs-mdx" "^0.1.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager" "7.6.3"
-    "@storybook/node-logger" "7.6.3"
-    "@storybook/preview-api" "7.6.3"
-    "@storybook/telemetry" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/manager" "7.6.4"
+    "@storybook/node-logger" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/telemetry" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/detect-port" "^1.3.0"
     "@types/node" "^18.0.0"
     "@types/pretty-hrtime" "^1.0.0"
@@ -6882,25 +6882,25 @@
     watchpack "^2.2.0"
     ws "^8.2.3"
 
-"@storybook/csf-plugin@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.6.3.tgz#d42e04f0ea9c92f584031300a32ebe59187ae99f"
-  integrity sha512-8bMYPsWw2tv+fqZ5H436l4x1KLSB6gIcm6snsjyF916yCHG6WcWm+EI6+wNUoySEtrQY2AiwFJqE37wI5OUJFg==
+"@storybook/csf-plugin@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.6.4.tgz#5d18cffc1c92dfd12d8571b2ba9d1456de58d8b2"
+  integrity sha512-7g9p8s2ITX+Z9iThK5CehPhJOcusVN7JcUEEW+gVF5PlYT+uk/x+66gmQno+scQuNkV9+8UJD6RLFjP+zg2uCA==
   dependencies:
-    "@storybook/csf-tools" "7.6.3"
+    "@storybook/csf-tools" "7.6.4"
     unplugin "^1.3.1"
 
-"@storybook/csf-tools@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.6.3.tgz#e79bc4219626240a1d4acff1217a7f630c62533a"
-  integrity sha512-Zi3pg2pg88/mvBKewkfWhFUR1J4uYpHI5fSjOE+J/FeZObX/DIE7r+wJxZ0UBGyrk0Wy7Jajlb2uSP56Y0i19w==
+"@storybook/csf-tools@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.6.4.tgz#4c1ef7a79ecd6f96d7fc1cb092cf2ed942cd65e2"
+  integrity sha512-6sLayuhgReIK3/QauNj5BW4o4ZfEMJmKf+EWANPEM/xEOXXqrog6Un8sjtBuJS9N1DwyhHY6xfkEiPAwdttwqw==
   dependencies:
     "@babel/generator" "^7.23.0"
     "@babel/parser" "^7.23.0"
     "@babel/traverse" "^7.23.2"
     "@babel/types" "^7.23.0"
     "@storybook/csf" "^0.1.2"
-    "@storybook/types" "7.6.3"
+    "@storybook/types" "7.6.4"
     fs-extra "^11.1.0"
     recast "^0.23.1"
     ts-dedent "^2.0.0"
@@ -6917,14 +6917,14 @@
   resolved "https://registry.yarnpkg.com/@storybook/docs-mdx/-/docs-mdx-0.1.0.tgz#33ba0e39d1461caf048b57db354b2cc410705316"
   integrity sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==
 
-"@storybook/docs-tools@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.6.3.tgz#f04dc5916fc157cc70d1e4222be605c4241fd0b4"
-  integrity sha512-6MtirRCQIkBeQ3bksPignZgUuFmjWqcFleTEN6vrNEfbCzMlMvuBGfm9tl4sS3n8ATWmKGj87DcJepPOT3FB4A==
+"@storybook/docs-tools@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.6.4.tgz#504b8654f348a109b69cc77cdab556f0bf9c2304"
+  integrity sha512-2eGam43aD7O3cocA72Z63kRi7t/ziMSpst0qB218QwBWAeZjT4EYDh8V6j/Xhv6zVQL3msW7AglrQP5kCKPvPA==
   dependencies:
-    "@storybook/core-common" "7.6.3"
-    "@storybook/preview-api" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/core-common" "7.6.4"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/doctrine" "^0.0.3"
     assert "^2.1.0"
     doctrine "^3.0.0"
@@ -6956,19 +6956,19 @@
     telejson "^7.0.3"
     ts-dedent "^2.0.0"
 
-"@storybook/manager-api@7.6.3", "@storybook/manager-api@^7.0.12":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.6.3.tgz#b3b6e5f4b248f724ba8351dcb2ef485e034a5436"
-  integrity sha512-soDH7GZuukkhYRGzlw4jhCm5EzjfkuIAtb37/DFplqxuVbvlyJEVzkMUM2KQO7kq0/8GlWPiZ5mn56wagYyhKQ==
+"@storybook/manager-api@7.6.4", "@storybook/manager-api@^7.0.12":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.6.4.tgz#edf5d553a78987ad8602700b7200391776010f48"
+  integrity sha512-RFb/iaBJfXygSgXkINPRq8dXu7AxBicTGX7MxqKXbz5FU7ANwV7abH6ONBYURkSDOH9//TQhRlVkF5u8zWg3bw==
   dependencies:
-    "@storybook/channels" "7.6.3"
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/core-events" "7.6.3"
+    "@storybook/channels" "7.6.4"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-events" "7.6.4"
     "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/router" "7.6.3"
-    "@storybook/theming" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/router" "7.6.4"
+    "@storybook/theming" "7.6.4"
+    "@storybook/types" "7.6.4"
     dequal "^2.0.2"
     lodash "^4.17.21"
     memoizerific "^1.11.3"
@@ -6977,37 +6977,37 @@
     telejson "^7.2.0"
     ts-dedent "^2.0.0"
 
-"@storybook/manager@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-7.6.3.tgz#10fc8171e02d19aac8e0c0bfa05b4897f1179b78"
-  integrity sha512-6eMaogHANCSVV2zLPt4Q7fp8RT+AdlOe6IR0583AuqpepcFzj33iGNYABk2rmXAlkD0WzoLcC4H5mouU0fduLA==
+"@storybook/manager@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-7.6.4.tgz#11ea1ce8f37a069c96e594a716957f0d6c7690f3"
+  integrity sha512-Ug2ejfKgKre8h/RJbkumukwAA44TbvTPEjDcJmyFdAI+kHYhOYdKPEC2UNmVYz8/4HjwMTJQ3M7t/esK8HHY4A==
 
 "@storybook/mdx2-csf@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@storybook/mdx2-csf/-/mdx2-csf-1.1.0.tgz#97f6df04d0bf616991cc1005a073ac004a7281e5"
   integrity sha512-TXJJd5RAKakWx4BtpwvSNdgTDkKM6RkXU8GK34S/LhidQ5Pjz3wcnqb0TxEkfhK/ztbP8nKHqXFwLfa2CYkvQw==
 
-"@storybook/node-logger@7.6.3", "@storybook/node-logger@^7.0.12":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.6.3.tgz#f3fd7cd029fa21621129210d5f282f4d4c745174"
-  integrity sha512-7yL0CMHuh1DhpUAoKCU0a53DvxBpkUom9SX5RaC1G2A9BK/B3XcHtDPAC0uyUwNCKLJMZo9QtmJspvxWjR0LtA==
+"@storybook/node-logger@7.6.4", "@storybook/node-logger@^7.0.12":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.6.4.tgz#e471ee117bbd329522113dd98e5a42e83e259f9c"
+  integrity sha512-GDkEnnDj4Op+PExs8ZY/P6ox3wg453CdEIaR8PR9TxF/H/T2fBL6puzma3hN2CMam6yzfAL8U+VeIIDLQ5BZdQ==
 
-"@storybook/postinstall@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.6.3.tgz#d72d7a6f076b4a8571fea1b64d424a4e2b25b884"
-  integrity sha512-WpgdpJpY6rionluxjFZLbKiSDjvQJ5cPgufjvBRuXTsnVOsH3JNRWnPdkQkJLT9uTUMoNcyBMxbjYkK3vU6wSg==
+"@storybook/postinstall@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.6.4.tgz#baefcec351ac79ee711ad27b65bf1ec28e545da6"
+  integrity sha512-7uoB82hSzlFSdDMS3hKQD+AaeSvPit/fAMvXCBxn0/D0UGJUZcq4M9JcKBwEHkZJcbuDROgOTJ6TUeXi/FWO0w==
 
-"@storybook/preview-api@7.6.3", "@storybook/preview-api@^7.0.12":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.6.3.tgz#da8e30e5cbe1c0ca5e40af5dc01a4714c37d5af8"
-  integrity sha512-uPaK7yLE1P++F+IOb/1j9pgdCwfMYZrUPHogF/Mf9r4cfEjDCcIeKgGMcsbU1KnkzNQQGPh8JRzRr/iYnLjswg==
+"@storybook/preview-api@7.6.4", "@storybook/preview-api@^7.0.12":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.6.4.tgz#df103fbdfada5ceee540f6ea68001c0d2c718113"
+  integrity sha512-KhisNdQX5NdfAln+spLU4B82d804GJQp/CnI5M1mm/taTnjvMgs/wTH9AmR89OPoq+tFZVW0vhy2zgPS3ar71A==
   dependencies:
-    "@storybook/channels" "7.6.3"
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/core-events" "7.6.3"
+    "@storybook/channels" "7.6.4"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-events" "7.6.4"
     "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/types" "7.6.3"
+    "@storybook/types" "7.6.4"
     "@types/qs" "^6.9.5"
     dequal "^2.0.2"
     lodash "^4.17.21"
@@ -7017,41 +7017,41 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/preview@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.6.3.tgz#80bb73cc4106f1b38e54bc153d11d067431db364"
-  integrity sha512-obSmKN8arWSHuLbCDM1H0lTVRMvAP/l7vOi6TQtFi6TxBz9MRCJA3Ugc0PZrbDADVZP+cp0ZJA0JQtAm+SqNAA==
+"@storybook/preview@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.6.4.tgz#36cca1d10fd3729f1a68789d95bfc400e33aa616"
+  integrity sha512-p9xIvNkgXgTpSRphOMV9KpIiNdkymH61jBg3B0XyoF6IfM1S2/mQGvC89lCVz1dMGk2SrH4g87/WcOapkU5ArA==
 
-"@storybook/react-dom-shim@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.6.3.tgz#cf634b816cc600968e27359824d82d8117b669ee"
-  integrity sha512-UtaEaTQB27aBsAmn5IfAYkX2xl4wWWXkoAO/jUtx86FQ/r85FG0zxh/rac6IgzjYUqzjJtjIeLdeciG/48hMMA==
+"@storybook/react-dom-shim@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.6.4.tgz#d1f5440c8f1ccd95abcc01117872ce46d0ab9dc3"
+  integrity sha512-wGJfomlDEBnowNmhmumWDu/AcUInxSoPqUUJPgk2f5oL0EW17fR9fDP/juG3XOEdieMDM0jDX48GML7lyvL2fg==
 
-"@storybook/react-vite@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/react-vite/-/react-vite-7.6.3.tgz#4e789ea4ccc5d753ca1eed20e4b29ed73c81993b"
-  integrity sha512-sPrNJbnThmxsSeNj6vyG9pCCnnYzyiS+f7DVy2qeQrXvEuCYiQc503bavE3BKLxqjZQ3SkbhPsiEHcaw3I9x7A==
+"@storybook/react-vite@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/react-vite/-/react-vite-7.6.4.tgz#a319711d32376909a0abaa44f41965e025e2f948"
+  integrity sha512-1NYzCJRO6k/ZyoMzpu1FQiaUaiLNjAvTAB1x3HE7oY/tEIT8kGpzXGYH++LJVWvyP/5dSWlUnRSy2rJvySraiw==
   dependencies:
     "@joshwooding/vite-plugin-react-docgen-typescript" "0.3.0"
     "@rollup/pluginutils" "^5.0.2"
-    "@storybook/builder-vite" "7.6.3"
-    "@storybook/react" "7.6.3"
+    "@storybook/builder-vite" "7.6.4"
+    "@storybook/react" "7.6.4"
     "@vitejs/plugin-react" "^3.0.1"
     magic-string "^0.30.0"
     react-docgen "^7.0.0"
 
-"@storybook/react@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.6.3.tgz#f8f17a032e12e41fcc03b52b8c1f22651e904e29"
-  integrity sha512-W+530cC0BAU+yBc7NzSXYWR3e8Lo5qMsmFJjWYK7zGW/YZGhSG3mjhF9pDzNM+cMtHvUS6qf5PJPQM8jePpPhg==
+"@storybook/react@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.6.4.tgz#b17c451eb1240399d75c45ccb90a145ab1de44ac"
+  integrity sha512-XYRP+eylH3JqkCuziwtQGY5vOCeDreOibRYJmj5na6k4QbURjGVB44WCIW04gWVlmBXM9SqLAmserUi3HP890Q==
   dependencies:
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/core-client" "7.6.3"
-    "@storybook/docs-tools" "7.6.3"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-client" "7.6.4"
+    "@storybook/docs-tools" "7.6.4"
     "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "7.6.3"
-    "@storybook/react-dom-shim" "7.6.3"
-    "@storybook/types" "7.6.3"
+    "@storybook/preview-api" "7.6.4"
+    "@storybook/react-dom-shim" "7.6.4"
+    "@storybook/types" "7.6.4"
     "@types/escodegen" "^0.0.6"
     "@types/estree" "^0.0.51"
     "@types/node" "^18.0.0"
@@ -7076,23 +7076,23 @@
     memoizerific "^1.11.3"
     qs "^6.10.0"
 
-"@storybook/router@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.6.3.tgz#4aab0c4ac23948338440c568feb8a92268c9abf9"
-  integrity sha512-NZfhJqsXYca9mZCL/LGx6FmZDbrxX2S4ImW7Tqdtcc/sSlZ0BpCDkNUTesCA287cmoKMhXZRh/+bU+C2h2a+bw==
+"@storybook/router@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.6.4.tgz#13112bd9d6709bebe4072d923e4921b660f8f00c"
+  integrity sha512-5MQ7Z4D7XNPN2yhFgjey7hXOYd6s8CggUqeAwhzGTex90SMCkKHSz1hfkcXn1ZqBPaall2b53uK553OvPLp9KQ==
   dependencies:
-    "@storybook/client-logger" "7.6.3"
+    "@storybook/client-logger" "7.6.4"
     memoizerific "^1.11.3"
     qs "^6.10.0"
 
-"@storybook/telemetry@7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-7.6.3.tgz#c41dfed339e60b9e87fd6b4375c84f145793c9e5"
-  integrity sha512-NDCZWhVIUI3M6Lq4M/HPOvZqDXqANDNbI3kyHr4pFGoVaCUXuDPokL9wR+CZcMvATkJ1gHrfLPBdcRq6Biw3Iw==
+"@storybook/telemetry@7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-7.6.4.tgz#b28e8f7abf73b4900d83dfa68a988b6f3df9c24a"
+  integrity sha512-Q4QpvcgloHUEqC9PGo7tgqkUH91/PjX+74/0Hi9orLo8QmLMgdYS5fweFwgSKoTwDGNg2PaHp/jqvhhw7UmnJA==
   dependencies:
-    "@storybook/client-logger" "7.6.3"
-    "@storybook/core-common" "7.6.3"
-    "@storybook/csf-tools" "7.6.3"
+    "@storybook/client-logger" "7.6.4"
+    "@storybook/core-common" "7.6.4"
+    "@storybook/csf-tools" "7.6.4"
     chalk "^4.1.0"
     detect-package-manager "^2.0.1"
     fetch-retry "^5.0.2"
@@ -7118,13 +7118,13 @@
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
 
-"@storybook/theming@7.6.3", "@storybook/theming@^7.0.12":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.6.3.tgz#69adc0c7c2e6cad67cf327834fe57ab4ae698575"
-  integrity sha512-9ToNU2LM6a2kVBjOXitXEeEOuMurVLhn+uaZO1dJjv8NGnJVYiLwNPwrLsImiUD8/XXNuil972aanBR6+Aj9jw==
+"@storybook/theming@7.6.4", "@storybook/theming@^7.0.12":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.6.4.tgz#cc81d0aee5fc80fe383cb6790e3a0e2ad80d2185"
+  integrity sha512-Z/dcC5EpkIXelYCkt9ojnX6D7qGOng8YHxV/OWlVE9TrEGYVGPOEfwQryR0RhmGpDha1TYESLYrsDb4A8nJ1EA==
   dependencies:
     "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
-    "@storybook/client-logger" "7.6.3"
+    "@storybook/client-logger" "7.6.4"
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
 
@@ -7138,12 +7138,12 @@
     "@types/express" "^4.7.0"
     file-system-cache "^2.0.0"
 
-"@storybook/types@7.6.3", "@storybook/types@^7.0.12":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.6.3.tgz#cd37997cfcd349d3eb4d2c9da9eb7f334d2fb937"
-  integrity sha512-vj9Jzg5eR52l8O9512QywbQpNdo67Z6BQWR8QoZRcG+/Bhzt08YI8IZMPQLFMKzcmWDPK0blQ4GfyKDYplMjPA==
+"@storybook/types@7.6.4", "@storybook/types@^7.0.12":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.6.4.tgz#3bb50b46286cc83484848c3c450c32cc2071eb21"
+  integrity sha512-qyiiXPCvol5uVgfubcIMzJBA0awAyFPU+TyUP1mkPYyiTHnsHYel/mKlSdPjc8a97N3SlJXHOCx41Hde4IyJgg==
   dependencies:
-    "@storybook/channels" "7.6.3"
+    "@storybook/channels" "7.6.4"
     "@types/babel__core" "^7.0.0"
     "@types/express" "^4.7.0"
     file-system-cache "2.3.0"
@@ -28962,12 +28962,12 @@ store2@^2.14.2:
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.2.tgz#56138d200f9fe5f582ad63bc2704dbc0e4a45068"
   integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==
 
-storybook@7.6.3:
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/storybook/-/storybook-7.6.3.tgz#6b87d0b96b2f9f4911408f6d3d0435de3226e58c"
-  integrity sha512-H3odxahMiR8vVW7ltlqcHhn3UVH5ta03weKlY7xvpv5DV+thZ+mEO2cDYfsufCSg0Ldb5LQ4qq3OyLVdpDBN8g==
+storybook@7.6.4:
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/storybook/-/storybook-7.6.4.tgz#4f89d25be3990f0e057020efb0dcb3429dfa179c"
+  integrity sha512-nQhs9XkrroxjqMoBnnToyc6M8ndbmpkOb1qmULO4chtfMy4k0p9Un3K4TJvDaP8c3wPUFGd4ZaJ1hZNVmIl56Q==
   dependencies:
-    "@storybook/cli" "7.6.3"
+    "@storybook/cli" "7.6.4"
 
 stream-browserify@^2.0.1:
   version "2.0.2"

From 309aaf98aa545ff69d7bfdb69fd22218a9c17cdb Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@ghost.org>
Date: Thu, 7 Dec 2023 15:46:23 +0000
Subject: [PATCH 32/36] Added TK support to feature image caption editor
 (#19285)

closes https://github.com/TryGhost/Product/issues/4227

- added `@onTKCountChange` to `<KoenigLexicalEditorInput>`
  - when present the `isTKEnabled` flag will be turned on and the `<TKCountPlugin>` registered
- added `@registerAPI` support to `<KoenigLexicalEditorInput>` so we can focus the caption editor when its TK indicator is clicked
- added manual display of TK indicator for the caption input
  - default editor indicator positioning doesn't work for this input because its container is not full editor width
  - hid it by adding `overflow: hidden` to the inner caption container
  - added custom indicator button shown when we have a non-zero count
---
 .../components/gh-editor-feature-image.hbs    | 10 ++++++++-
 .../app/components/gh-editor-feature-image.js | 21 +++++++++++++++++++
 .../components/gh-koenig-editor-lexical.hbs   |  1 +
 .../components/koenig-lexical-editor-input.js |  8 +++++++
 ghost/admin/app/controllers/lexical-editor.js | 11 ++++++++--
 ghost/admin/app/styles/layouts/editor.css     | 10 +++++++--
 ghost/admin/app/templates/lexical-editor.hbs  |  1 +
 7 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/ghost/admin/app/components/gh-editor-feature-image.hbs b/ghost/admin/app/components/gh-editor-feature-image.hbs
index aaf68c256a..ddda57309c 100644
--- a/ghost/admin/app/components/gh-editor-feature-image.hbs
+++ b/ghost/admin/app/components/gh-editor-feature-image.hbs
@@ -50,7 +50,7 @@
                     {{svg-jar "koenig/kg-trash"}}
                 </button>
             </div>
-            <div class="flex justify-between align-center">
+            <div class="relative flex justify-between align-center">
                 {{#if this.isEditingAlt}}
                     <input
                         type="text"
@@ -70,6 +70,8 @@
                         @placeholderText={{if this.captionInputFocused "" "Add a caption to the feature image"}}
                         @onFocus={{fn (mut this.captionInputFocused) true}}
                         @onBlur={{this.handleCaptionBlur}}
+                        @onTKCountChange={{this.onTKCountChange}}
+                        @registerAPI={{this.registerEditorAPI}}
                     />
                 {{/if}}
                 <button
@@ -78,6 +80,12 @@
                 >
                     Alt
                 </button>
+
+                {{#if (and this.tkCount (not this.isEditingAlt))}}
+                    <div class="tk-indicator" data-testid="feature-image-tk-indicator" role="button" {{on "click" this.focusCaptionEditor}}>
+                        TK
+                    </div>
+                {{/if}}
             </div>
         {{else}}
             {{!-- no-image state --}}
diff --git a/ghost/admin/app/components/gh-editor-feature-image.js b/ghost/admin/app/components/gh-editor-feature-image.js
index 0bc821093d..d621d0de5f 100644
--- a/ghost/admin/app/components/gh-editor-feature-image.js
+++ b/ghost/admin/app/components/gh-editor-feature-image.js
@@ -18,6 +18,7 @@ export default class GhEditorFeatureImageComponent extends Component {
     @tracked captionInputFocused = false;
     @tracked showUnsplashSelector = false;
     @tracked canDrop = false;
+    @tracked tkCount = 0;
 
     get caption() {
         const content = this.args.caption;
@@ -34,6 +35,18 @@ export default class GhEditorFeatureImageComponent extends Component {
         this.args.updateCaption(cleanedHtml);
     }
 
+    @action
+    registerEditorAPI(API) {
+        this.editorAPI = API;
+    }
+
+    @action
+    focusCaptionEditor() {
+        if (this.editorAPI) {
+            this.editorAPI.focusEditor({position: 'bottom'});
+        }
+    }
+
     @action
     handleCaptionBlur() {
         this.captionInputFocused = false;
@@ -116,4 +129,12 @@ export default class GhEditorFeatureImageComponent extends Component {
         this.canDrop = false;
         setFiles([imageFile]);
     }
+
+    @action
+    onTKCountChange(count) {
+        if (this.args.onTKCountChange) {
+            this.tkCount = count;
+            this.args.onTKCountChange(count);
+        }
+    }
 }
diff --git a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
index a8efb4d02e..12b88c3032 100644
--- a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
+++ b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
@@ -19,6 +19,7 @@
             @handleCaptionBlur={{@handleFeatureImageCaptionBlur}}
             @forceButtonDisplay={{or (not @title) (eq @title "(Untitled)") this.titleIsHovered this.titleIsFocused}}
             @isHidden={{or (not @cardOptions.post.showTitleAndFeatureImage) false}}
+            @onTKCountChange={{@updateFeatureImageTkCount}}
         />
 
         <div class="gh-editor-title-container page-improvements">
diff --git a/ghost/admin/app/components/koenig-lexical-editor-input.js b/ghost/admin/app/components/koenig-lexical-editor-input.js
index 526b6cd34b..19bcbdd705 100644
--- a/ghost/admin/app/components/koenig-lexical-editor-input.js
+++ b/ghost/admin/app/components/koenig-lexical-editor-input.js
@@ -57,6 +57,11 @@ const EmojiPickerPlugin = ({editorResource, ...props}) => {
     return <_EmojiPickerPlugin {...props} />;
 };
 
+const TKCountPlugin = ({editorResource, ...props}) => {
+    const {TKCountPlugin: _TKCountPlugin} = editorResource.read();
+    return <_TKCountPlugin {...props} />;
+};
+
 export default class KoenigLexicalEditorInput extends Component {
     @service ajax;
     @service feature;
@@ -100,6 +105,7 @@ export default class KoenigLexicalEditorInput extends Component {
                             editorResource={this.editorResource}
                             initialEditorState={this.args.lexical}
                             onError={this.onError}
+                            isTKEnabled={this.args.onTKCountChange ? true : false}
                         >
                             <KoenigComposableEditor
                                 editorResource={this.editorResource}
@@ -112,9 +118,11 @@ export default class KoenigLexicalEditorInput extends Component {
                                 className={`koenig-lexical-editor-input ${this.feature.nightShift ? 'dark' : ''}`}
                                 placeholderText={props.placeholderText}
                                 placeholderClassName="koenig-lexical-editor-input-placeholder"
+                                registerAPI={this.args.registerAPI}
                             >
                                 <HtmlOutputPlugin editorResource={this.editorResource} html={props.html} setHtml={props.onChangeHtml} />
                                 {this.emojiPicker ? <EmojiPickerPlugin editorResource={this.editorResource} /> : null}
+                                {this.args.onTKCountChange ? <TKCountPlugin editorResource={this.editorResource} onChange={this.args.onTKCountChange} /> : null}
                             </KoenigComposableEditor>
                         </KoenigComposer>
                     </Suspense>
diff --git a/ghost/admin/app/controllers/lexical-editor.js b/ghost/admin/app/controllers/lexical-editor.js
index ce21935936..a233e409e6 100644
--- a/ghost/admin/app/controllers/lexical-editor.js
+++ b/ghost/admin/app/controllers/lexical-editor.js
@@ -131,6 +131,7 @@ export default class LexicalEditorController extends Controller {
     // koenig related properties
     wordCount = 0;
     postTkCount = 0;
+    featureImageTkCount = 0;
 
     /* private properties ----------------------------------------------------*/
 
@@ -262,9 +263,9 @@ export default class LexicalEditorController extends Controller {
         return true;
     }
 
-    @computed('titleHasTk', 'postTkCount')
+    @computed('titleHasTk', 'postTkCount', 'featureImageTkCount')
     get tkCount() {
-        return (this.titleHasTk ? 1 : 0) + this.postTkCount;
+        return (this.titleHasTk ? 1 : 0) + this.postTkCount + this.featureImageTkCount;
     }
 
     @action
@@ -368,6 +369,11 @@ export default class LexicalEditorController extends Controller {
         this.set('postTkCount', count);
     }
 
+    @action
+    updateFeatureImageTkCount(count) {
+        this.set('featureImageTkCount', count);
+    }
+
     @action
     setFeatureImage(url) {
         this.post.set('featureImage', url);
@@ -1135,6 +1141,7 @@ export default class LexicalEditorController extends Controller {
         this.set('showSettingsMenu', false);
         this.set('wordCount', 0);
         this.set('postTkCount', 0);
+        this.set('featureImageTkCount', 0);
 
         // remove the onbeforeunload handler as it's only relevant whilst on
         // the editor route
diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css
index 2af885244b..be44f97f09 100644
--- a/ghost/admin/app/styles/layouts/editor.css
+++ b/ghost/admin/app/styles/layouts/editor.css
@@ -635,6 +635,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     background-color: transparent !important;
     transition: border-color .15s linear;
     -webkit-appearance: none;
+    overflow: hidden; /* Hides any indicators such as TK */
 }
 
 .gh-editor-feature-image-alttext::placeholder,
@@ -683,7 +684,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     opacity: .5;
 }
 
-.gh-editor-title-container .tk-indicator {
+.gh-editor .tk-indicator {
     position: absolute;
     top: 15px;
     right: -5.6rem;
@@ -691,7 +692,12 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone {
     color: #95A1AD;
     font-size: 1.2rem;
     font-weight: 500;
-    cursor: default;
+    cursor: pointer;
+}
+
+.gh-editor-feature-image-container .tk-indicator {
+    top: 0;
+    padding: 0 .4rem;
 }
 
 .gh-editor-back-button {
diff --git a/ghost/admin/app/templates/lexical-editor.hbs b/ghost/admin/app/templates/lexical-editor.hbs
index d0cb2d14b2..3d7cd95c9a 100644
--- a/ghost/admin/app/templates/lexical-editor.hbs
+++ b/ghost/admin/app/templates/lexical-editor.hbs
@@ -79,6 +79,7 @@
                 @onEditorCreated={{this.setKoenigEditor}}
                 @updateWordCount={{this.updateWordCount}}
                 @updatePostTkCount={{this.updatePostTkCount}}
+                @updateFeatureImageTkCount={{if (feature "tkReminders") this.updateFeatureImageTkCount}}
                 @featureImage={{this.post.featureImage}}
                 @featureImageAlt={{this.post.featureImageAlt}}
                 @featureImageCaption={{this.post.featureImageCaption}}

From b84cb87d9054df090020b50f339f87ad04439eba Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 15:47:21 +0000
Subject: [PATCH 33/36] Update dependency terser to v5.26.0

---
 ghost/minifier/package.json | 2 +-
 yarn.lock                   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ghost/minifier/package.json b/ghost/minifier/package.json
index b8280a34ef..5fd2295aeb 100644
--- a/ghost/minifier/package.json
+++ b/ghost/minifier/package.json
@@ -28,7 +28,7 @@
     "@tryghost/errors": "1.2.26",
     "@tryghost/tpl": "0.1.26",
     "csso": "5.0.5",
-    "terser": "5.25.0",
+    "terser": "5.26.0",
     "tiny-glob": "0.2.9"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 1bad9745e6..9b217095dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29786,10 +29786,10 @@ terser-webpack-plugin@^5.3.7:
     serialize-javascript "^6.0.1"
     terser "^5.16.8"
 
-terser@5.25.0, terser@^5.16.8, terser@^5.7.0:
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.25.0.tgz#6579b4cca45b08bf0fdaa1a04605fd5860dfb2ac"
-  integrity sha512-we0I9SIsfvNUMP77zC9HG+MylwYYsGFSBG8qm+13oud2Yh+O104y614FRbyjpxys16jZwot72Fpi827YvGzuqg==
+terser@5.26.0, terser@^5.16.8, terser@^5.7.0:
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.26.0.tgz#ee9f05d929f4189a9c28a0feb889d96d50126fe1"
+  integrity sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"

From 1fb22c8acab3740e42fdc5a0ae6050d286274b09 Mon Sep 17 00:00:00 2001
From: Sag <guptazy@gmail.com>
Date: Thu, 7 Dec 2023 16:28:14 -0300
Subject: [PATCH 34/36] Removed hardcoded title for single free tier in Portal
 (#19289)

fixes PROD-68
---
 apps/portal/src/utils/helpers.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/portal/src/utils/helpers.js b/apps/portal/src/utils/helpers.js
index 19dd9d716b..e382e638b1 100644
--- a/apps/portal/src/utils/helpers.js
+++ b/apps/portal/src/utils/helpers.js
@@ -451,11 +451,6 @@ export function getFreeProductBenefits({site}) {
 
 export function getFreeTierTitle({site}) {
     const freeProduct = getFreeProduct({site});
-
-    if (freeProduct?.name === 'Free' && hasOnlyFreeProduct({site})) {
-        return 'Free membership';
-    }
-
     return freeProduct?.name || 'Free';
 }
 

From 8cbf133614aaef5dca65e3d384139cbd77f7a580 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 19:29:14 +0000
Subject: [PATCH 35/36] Update dependency newrelic to v11.6.1

---
 ghost/core/package.json |  2 +-
 yarn.lock               | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ghost/core/package.json b/ghost/core/package.json
index a3094baf74..497348ccdd 100644
--- a/ghost/core/package.json
+++ b/ghost/core/package.json
@@ -209,7 +209,7 @@
     "multer": "1.4.4",
     "mysql2": "3.6.5",
     "nconf": "0.12.1",
-    "newrelic": "11.6.0",
+    "newrelic": "11.6.1",
     "node-jose": "2.2.0",
     "path-match": "1.2.4",
     "probe-image-size": "7.2.3",
diff --git a/yarn.lock b/yarn.lock
index 9b217095dd..42592964d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4266,10 +4266,10 @@
     pump "^3.0.0"
     tar-fs "^2.1.1"
 
-"@newrelic/aws-sdk@^7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@newrelic/aws-sdk/-/aws-sdk-7.0.2.tgz#e93f1796c89be8323a75f3d7ec45b1bdd5a29292"
-  integrity sha512-nT19hzId0MbjR3v1ks5YetvNfrwIEgMfeai+T2pQkuWkjCsYm3z+OybLOYMCN66gueqOOqGTq60qhM4dFu5s5w==
+"@newrelic/aws-sdk@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@newrelic/aws-sdk/-/aws-sdk-7.0.3.tgz#aada548b28c69c30bd0caf54dc27b759fc4fafed"
+  integrity sha512-oafBFD+DEAqXTg0w15eEu2rfoedWMS7abyW5CuOJxSb+7OWiFUx9jZPpdFblsYPVNWBehxFdws6/JEio3GklyA==
 
 "@newrelic/koa@^8.0.1":
   version "8.0.1"
@@ -23767,14 +23767,14 @@ neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-newrelic@11.6.0:
-  version "11.6.0"
-  resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-11.6.0.tgz#0a75ef5382428cb0e9a219edc4ed9b392b1b3341"
-  integrity sha512-peYHffhstQlPQnjTYnXZmz/VX4rvnk8rE9n/kM0KKDbStQbcQE+COkdliDS7jg82ERf90aawu8YGWQRVD/w/GQ==
+newrelic@11.6.1:
+  version "11.6.1"
+  resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-11.6.1.tgz#ae2af414662bc2c201d589b235fc24cf8ab1007c"
+  integrity sha512-3tmSRqAcKdPPKGz9qswOvNDlsZXueC8QgJGty0uD95aurFzQoIOjI6/1dQBn3cxM8xxm3/vVa/Z2CAe4q0WK7g==
   dependencies:
     "@grpc/grpc-js" "^1.9.4"
     "@grpc/proto-loader" "^0.7.5"
-    "@newrelic/aws-sdk" "^7.0.2"
+    "@newrelic/aws-sdk" "^7.0.3"
     "@newrelic/koa" "^8.0.1"
     "@newrelic/security-agent" "0.5.0"
     "@newrelic/superagent" "^7.0.1"

From 181c5c0920efa811305b1bad720e91a49a8bb0dd Mon Sep 17 00:00:00 2001
From: Ronald Langeveld <hi@ronaldlangeveld.com>
Date: Fri, 8 Dec 2023 09:11:52 +0200
Subject: [PATCH 36/36] Changed code injection to full screen editor. (#19259)

fixes PROD-7
https://ghost.slack.com/archives/C0568LN2CGJ/p1701690959138659

- Changed the code injector editor to only use the full screen editor in
its own modal.

---------

Co-authored-by: Peter Zimon <peter.zimon@gmail.com>
---
 .../src/global/TabView.tsx                    | 12 ++-
 .../settings/advanced/CodeInjection.tsx       | 89 +++---------------
 .../settings/advanced/code/CodeModal.tsx      | 93 +++++++++++++++++--
 .../src/hooks/useSaveButton.ts                | 32 +++++++
 .../acceptance/advanced/codeInjection.test.ts | 59 ++----------
 5 files changed, 143 insertions(+), 142 deletions(-)
 create mode 100644 apps/admin-x-settings/src/hooks/useSaveButton.ts

diff --git a/apps/admin-x-design-system/src/global/TabView.tsx b/apps/admin-x-design-system/src/global/TabView.tsx
index 49b9448e91..23e2ea17b9 100644
--- a/apps/admin-x-design-system/src/global/TabView.tsx
+++ b/apps/admin-x-design-system/src/global/TabView.tsx
@@ -5,6 +5,8 @@ export type Tab<ID = string> = {
     id: ID;
     title: string;
     counter?: number | null;
+    tabWrapperClassName?: string;
+    containerClassName?: string;
 
     /**
      * Optional, so you can just use the tabs to other views
@@ -102,6 +104,7 @@ export interface TabViewProps<ID = string> {
     border?: boolean;
     buttonBorder?: boolean;
     width?: TabWidth;
+    containerClassName?: string;
 }
 
 function TabView<ID extends string = string>({
@@ -110,7 +113,8 @@ function TabView<ID extends string = string>({
     selectedTab,
     border = true,
     buttonBorder = border,
-    width = 'normal'
+    width = 'normal',
+    containerClassName
 }: TabViewProps<ID>) {
     if (tabs.length !== 0 && selectedTab === undefined) {
         selectedTab = tabs[0].id;
@@ -126,7 +130,7 @@ function TabView<ID extends string = string>({
     };
 
     return (
-        <section>
+        <section className={containerClassName}>
             <TabList
                 border={border}
                 buttonBorder={buttonBorder}
@@ -139,8 +143,8 @@ function TabView<ID extends string = string>({
                 return (
                     <>
                         {tab.contents &&
-                            <div key={tab.id} className={`${selectedTab === tab.id ? 'block' : 'hidden'}`} role='tabpanel'>
-                                <div>{tab.contents}</div>
+                            <div key={tab.id} className={`${selectedTab === tab.id ? 'block' : 'hidden'} ${tab.tabWrapperClassName}`} role='tabpanel'>
+                                <div className={tab.containerClassName}>{tab.contents}</div>
                             </div>
                         }
                     </>
diff --git a/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx b/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx
index 335a7c8e59..aba04ba3c0 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx
@@ -1,93 +1,26 @@
 import CodeModal from './code/CodeModal';
 import NiceModal from '@ebay/nice-modal-react';
-import React, {useMemo, useRef, useState} from 'react';
+import React from 'react';
 import TopLevelGroup from '../../TopLevelGroup';
-import useSettingGroup from '../../../hooks/useSettingGroup';
-import {Button, CodeEditor, TabView, withErrorBoundary} from '@tryghost/admin-x-design-system';
-import {ReactCodeMirrorRef} from '@uiw/react-codemirror';
-import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {Button, SettingGroupHeader, withErrorBoundary} from '@tryghost/admin-x-design-system';
 
 const CodeInjection: React.FC<{ keywords: string[] }> = ({keywords}) => {
-    const {
-        localSettings,
-        isEditing,
-        saveState,
-        handleSave,
-        handleCancel,
-        updateSetting,
-        handleEditingChange
-    } = useSettingGroup();
-
-    const [headerContent, footerContent] = getSettingValues<string>(localSettings, ['codeinjection_head', 'codeinjection_foot']);
-
-    const [selectedTab, setSelectedTab] = useState<'header' | 'footer'>('header');
-
-    const headerEditorRef = useRef<ReactCodeMirrorRef>(null);
-    const footerEditorRef = useRef<ReactCodeMirrorRef>(null);
-
-    const html = useMemo(() => import('@codemirror/lang-html').then(module => module.html()), []);
-
-    const headerProps = {
-        extensions: [html],
-        hint: 'Code here will be injected into the {{ghost_head}} tag on every page of the site',
-        value: headerContent || '',
-        onChange: (value: string) => updateSetting('codeinjection_head', value)
-    };
-
-    const footerProps = {
-        extensions: [html],
-        hint: 'Code here will be injected into the {{ghost_foot}} tag on every page of the site',
-        value: footerContent || '',
-        onChange: (value: string) => updateSetting('codeinjection_foot', value)
-    };
-
-    const tabs = [
-        {
-            id: 'header',
-            title: 'Site header',
-            contents: (<CodeEditor {...headerProps} ref={headerEditorRef} className='mt-2' data-testid='header-code' autoFocus />)
-        },
-        {
-            id: 'footer',
-            title: 'Site footer',
-            contents: (<CodeEditor {...footerProps} ref={footerEditorRef} className='mt-2' data-testid='footer-code' />)
-        }
-    ] as const;
-
     return (
         <TopLevelGroup
+            customHeader={
+                <div className='z-10 flex items-start justify-between'>
+                    <SettingGroupHeader description='Add custom code to your publication.' title='Code injection' />
+                    <Button color='green' label='Open' link linkWithPadding onClick={() => {
+                        NiceModal.show(CodeModal);
+                    }} />
+                </div>
+            }
             description="Add custom code to your publication"
-            isEditing={isEditing}
             keywords={keywords}
             navid='code-injection'
-            saveState={saveState}
             testId='code-injection'
             title="Code injection"
-            onCancel={handleCancel}
-            onEditingChange={handleEditingChange}
-            onSave={handleSave}
-        >
-            {isEditing && (
-                <div className='relative'>
-                    <TabView<'header' | 'footer'> selectedTab={selectedTab} tabs={tabs} onTabChange={setSelectedTab} />
-                    <Button
-                        className='absolute right-0 top-1 text-sm'
-                        label='Fullscreen'
-                        unstyled
-                        onClick={() => NiceModal.show(CodeModal, {
-                            ...(selectedTab === 'header' ? headerProps : footerProps),
-                            afterClose: () => {
-                                if (selectedTab === 'header') {
-                                    headerEditorRef.current?.view?.focus();
-                                } else {
-                                    footerEditorRef.current?.view?.focus();
-                                }
-                            }
-                        })}
-                    />
-                </div>
-            )}
-        </TopLevelGroup>
+        />
     );
 };
 
diff --git a/apps/admin-x-settings/src/components/settings/advanced/code/CodeModal.tsx b/apps/admin-x-settings/src/components/settings/advanced/code/CodeModal.tsx
index d4a274127c..d8094d9575 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/code/CodeModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/code/CodeModal.tsx
@@ -1,6 +1,10 @@
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
-import React, {useMemo} from 'react';
-import {CodeEditor, Modal} from '@tryghost/admin-x-design-system';
+import React, {useMemo, useRef, useState} from 'react';
+import useSettingGroup from '../../../../hooks/useSettingGroup';
+import {ButtonGroup, CodeEditor, Heading, Modal, TabView} from '@tryghost/admin-x-design-system';
+import {ReactCodeMirrorRef} from '@uiw/react-codemirror';
+import {getSettingValues} from '@tryghost/admin-x-framework/api/settings';
+import {useSaveButton} from '../../../../hooks/useSaveButton';
 
 interface CodeModalProps {
     hint?: React.ReactNode;
@@ -9,18 +13,91 @@ interface CodeModalProps {
     afterClose?: () => void
 }
 
-const CodeModal: React.FC<CodeModalProps> = ({hint, value, onChange, afterClose}) => {
+const CodeModal: React.FC<CodeModalProps> = ({afterClose}) => {
+    const {
+        localSettings,
+        handleSave,
+        updateSetting
+    } = useSettingGroup();
     const modal = useModal();
 
+    const [headerContent, footerContent] = getSettingValues<string>(localSettings, ['codeinjection_head', 'codeinjection_foot']);
+
+    const [selectedTab, setSelectedTab] = useState<'header' | 'footer'>('header');
+
+    const headerEditorRef = useRef<ReactCodeMirrorRef>(null);
+    const footerEditorRef = useRef<ReactCodeMirrorRef>(null);
+
     const html = useMemo(() => import('@codemirror/lang-html').then(module => module.html()), []);
 
-    const onOk = () => {
-        modal.remove();
-        afterClose?.();
+    const headerProps = {
+        extensions: [html],
+        hint: 'Code here will be injected into the {{ghost_head}} tag on every page of the site',
+        value: headerContent || '',
+        onChange: (value: string) => updateSetting('codeinjection_head', value)
     };
 
-    return <Modal afterClose={afterClose} cancelLabel='' okColor='grey' okLabel='Done' size='full' testId='modal-code' onOk={onOk}>
-        <CodeEditor extensions={[html]} height='full' hint={hint} value={value} autoFocus onChange={onChange} />
+    const footerProps = {
+        extensions: [html],
+        hint: 'Code here will be injected into the {{ghost_foot}} tag on every page of the site',
+        value: footerContent || '',
+        onChange: (value: string) => updateSetting('codeinjection_foot', value)
+    };
+
+    const tabs = [
+        {
+            id: 'header',
+            title: 'Site header',
+            contents: (<CodeEditor height='full' {...headerProps} ref={headerEditorRef} className='mt-2' data-testid='header-code' autoFocus />),
+            tabWrapperClassName: 'flex-auto',
+            containerClassName: 'h-full'
+        },
+        {
+            id: 'footer',
+            title: 'Site footer',
+            contents: (<CodeEditor height='full' {...footerProps} ref={footerEditorRef} className='mt-2' data-testid='footer-code' />),
+            tabWrapperClassName: 'flex-auto',
+            containerClassName: 'h-full'
+        }
+    ] as const;
+
+    const {savingTitle, isSaving, onSaveClick} = useSaveButton(handleSave, true);
+
+    return <Modal
+        afterClose={afterClose}
+        cancelLabel='Close'
+        footer={<></>}
+        height='full'
+        size='full'
+        testId='modal-code-injection'
+    >
+        <div className='flex h-full flex-col'>
+            <div className='mb-4 flex items-center justify-between'>
+                <Heading level={2}>Code injection</Heading>
+                <ButtonGroup buttons={[
+                    {
+                        label: 'Close',
+                        color: 'outline',
+                        onClick: () => {
+                            modal.remove();
+                            afterClose?.();
+                        }
+                    },
+                    {
+                        disabled: isSaving,
+                        label: savingTitle,
+                        color: savingTitle === 'Saved' ? 'green' : 'black',
+                        onClick: onSaveClick
+                    }
+                ]} />
+            </div>
+            <TabView<'header' | 'footer'>
+                containerClassName='flex-auto flex flex-col mb-16'
+                selectedTab={selectedTab}
+                tabs={tabs}
+                onTabChange={setSelectedTab}
+            />
+        </div>
     </Modal>;
 };
 
diff --git a/apps/admin-x-settings/src/hooks/useSaveButton.ts b/apps/admin-x-settings/src/hooks/useSaveButton.ts
new file mode 100644
index 0000000000..ac2bce7110
--- /dev/null
+++ b/apps/admin-x-settings/src/hooks/useSaveButton.ts
@@ -0,0 +1,32 @@
+import {SaveHandler} from '@tryghost/admin-x-framework/hooks';
+import {useState} from 'react';
+
+export const useSaveButton = (handleSave: SaveHandler, fakeWhenUnchanged?: boolean) => {
+    const [savingTitle, setSavingTitle] = useState('Save');
+    const [isSaving, setIsSaving] = useState(false);
+
+    const onSaveClick = async () => {
+        setIsSaving(true);
+        setSavingTitle('Saving');
+
+        // Execute the save operation
+        await handleSave({fakeWhenUnchanged});
+
+        // After a second, change the label to 'Saved'
+        setTimeout(() => {
+            setSavingTitle('Saved');
+
+            // After yet another second, reset to 'Save'
+            setTimeout(() => {
+                setSavingTitle('Save');
+                setIsSaving(false);
+            }, 1000);
+        }, 1000);
+    };
+
+    return {
+        savingTitle,
+        isSaving,
+        onSaveClick
+    };
+};
diff --git a/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts b/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts
index f20f844523..1397fb83a1 100644
--- a/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts
+++ b/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts
@@ -21,23 +21,24 @@ test.describe('Code injection settings', async () => {
 
         const section = page.getByTestId('code-injection');
 
-        await section.getByRole('button', {name: 'Edit'}).click();
+        await section.getByRole('button', {name: 'Open'}).click();
+
+        const modal = page.getByTestId('modal-code-injection');
         // Click on the CodeMirror content to make sure it's loaded
-        await section.getByTestId('header-code').locator('.cm-content').click();
+        await modal.getByTestId('header-code').locator('.cm-content').click();
 
         for (const character of (PADDING + 'testhead').split('')) {
             await page.keyboard.press(character);
         }
 
-        await section.getByRole('tab', {name: 'Site footer'}).click();
-        await section.getByTestId('footer-code').locator('.cm-content').click();
+        await modal.getByRole('tab', {name: 'Site footer'}).click();
+        await modal.getByTestId('footer-code').locator('.cm-content').click();
 
         for (const character of (PADDING + 'testfoot').split('')) {
             await page.keyboard.press(character);
         }
 
-        await section.getByRole('button', {name: 'Save'}).click();
-        await expect(section.getByRole('button', {name: 'Save'})).toBeHidden();
+        await modal.getByRole('button', {name: 'Save'}).click();
 
         expect(lastApiRequests.editSettings?.body).toMatchObject({
             settings: [
@@ -46,50 +47,4 @@ test.describe('Code injection settings', async () => {
             ]
         });
     });
-
-    test('Supports continuing editing in fullscreen', async ({page}) => {
-        const {lastApiRequests} = await mockApi({page, requests: {
-            ...globalDataRequests,
-            editSettings: {method: 'PUT', path: '/settings/', response: updatedSettingsResponse([
-                {key: 'codeinjection_head', value: '<1 /><2 /><3 />'}
-            ])}
-        }});
-
-        await page.goto('/');
-
-        const section = page.getByTestId('code-injection');
-
-        await section.getByRole('button', {name: 'Edit'}).click();
-
-        for (const character of PADDING.split('')) {
-            await page.keyboard.press(character);
-        }
-
-        for (const character of '<1>'.split('')) {
-            await page.keyboard.press(character);
-        }
-
-        await section.getByRole('button', {name: 'Fullscreen'}).click();
-
-        await page.keyboard.press('End');
-        for (const character of '<2>'.split('')) {
-            await page.keyboard.press(character);
-        }
-
-        await page.getByTestId('modal-code').getByRole('button', {name: 'Done'}).click();
-
-        await page.keyboard.press('End');
-        for (const character of '<3>'.split('')) {
-            await page.keyboard.press(character);
-        }
-
-        await section.getByRole('button', {name: 'Save'}).click();
-        await expect(section.getByRole('button', {name: 'Save'})).toBeHidden();
-
-        expect(lastApiRequests.editSettings?.body).toMatchObject({
-            settings: [
-                {key: 'codeinjection_head', value: /<1><2><3>$/}
-            ]
-        });
-    });
 });