ghost 6.11.0 → 6.12.0

package/core/server/services/member-attribution/README.md

@@ -40,26 +40,26 @@ graph TD
 
 ### Components
 
-#### 1. **MemberAttributionService** (`MemberAttributionService.js`)
+#### 1. **MemberAttributionService** (`member-attribution-service.js`)
 Main service interface that coordinates all attribution logic.
 
-#### 2. **AttributionBuilder** (`AttributionBuilder.js`)
+#### 2. **AttributionBuilder** (`attribution-builder.js`)
 Converts URL history into attribution resources using the "Last Post Algorithm™️".
 
 **Key Classes:**
 - `Attribution`: Represents attribution data with methods to fetch and enrich resources
 - `AttributionBuilder`: Factory for creating `Attribution` instances
 
-#### 3. **UrlHistory** (`UrlHistory.js`)
+#### 3. **UrlHistory** (`url-history.js`)
 Validated container for URL history arrays from the frontend.
 
-#### 4. **UrlTranslator** (`UrlTranslator.js`)
+#### 4. **UrlTranslator** (`url-translator.js`)
 Translates between URLs and Ghost resources.
 
-#### 5. **ReferrerTranslator** (`ReferrerTranslator.js`)
+#### 5. **ReferrerTranslator** (`referrer-translator.js`)
 Parses referrer information into source and medium classifications.
 
-#### 6. **OutboundLinkTagger** (`OutboundLinkTagger.js`)
+#### 6. **OutboundLinkTagger** (`outbound-link-tagger.js`)
 Adds `?ref=` parameters to external links in newsletters.
 
 #### 7. **Frontend Script** (`member-attribution.js`)

package/core/server/services/member-attribution/{AttributionBuilder.js → attribution-builder.js}

@@ -15,7 +15,7 @@
  */
 
 class Attribution {
-    /** @type {import('./UrlTranslator')} */
+    /** @type {import('./url-translator')} */
     #urlTranslator;
 
     /**
@@ -133,9 +133,9 @@ class Attribution {
  * Convert a UrlHistory to an attribution object
  */
 class AttributionBuilder {
-    /** @type {import('./UrlTranslator')} */
+    /** @type {import('./url-translator')} */
     urlTranslator;
-    /** @type {import('./ReferrerTranslator')} */
+    /** @type {import('./referrer-translator')} */
     referrerTranslator;
 
     /**
@@ -166,7 +166,7 @@ class AttributionBuilder {
 
     /**
      * Last Post Algorithm™️
-     * @param {import('./UrlHistory').UrlHistoryArray} history
+     * @param {import('./url-history').UrlHistoryArray} history
      * @returns {Promise<Attribution>}
      */
     async getAttribution(history) {

package/core/server/services/member-attribution/index.js

@@ -11,11 +11,11 @@ class MemberAttributionServiceWrapper {
         }
 
         // Wire up all the dependencies
-        const MemberAttributionService = require('./MemberAttributionService');
-        const UrlTranslator = require('./UrlTranslator');
-        const ReferrerTranslator = require('./ReferrerTranslator');
-        const AttributionBuilder = require('./AttributionBuilder');
-        const OutboundLinkTagger = require('./OutboundLinkTagger');
+        const MemberAttributionService = require('./member-attribution-service');
+        const UrlTranslator = require('./url-translator');
+        const ReferrerTranslator = require('./referrer-translator');
+        const AttributionBuilder = require('./attribution-builder');
+        const OutboundLinkTagger = require('./outbound-link-tagger');
         const models = require('../../models');
 
         const urlTranslator = new UrlTranslator({

package/core/server/services/member-attribution/{MemberAttributionService.js → member-attribution-service.js}

@@ -1,4 +1,4 @@
-const UrlHistory = require('./UrlHistory');
+const UrlHistory = require('./url-history');
 
 class MemberAttributionService {
     /**
@@ -23,7 +23,7 @@ class MemberAttributionService {
     /**
      *
      * @param {Object} context instance of ghost framework context object
-     * @returns {Promise<import('./AttributionBuilder').AttributionResource|null>}
+     * @returns {Promise<import('./attribution-builder').AttributionResource|null>}
      */
     async getAttributionFromContext(context) {
         if (!context || !this.isTrackingEnabled) {
@@ -70,8 +70,8 @@ class MemberAttributionService {
 
     /**
      *
-     * @param {import('./UrlHistory').UrlHistoryArray} historyArray
-     * @returns {Promise<import('./AttributionBuilder').Attribution>}
+     * @param {import('./url-history').UrlHistoryArray} historyArray
+     * @returns {Promise<import('./attribution-builder').Attribution>}
      */
     async getAttribution(historyArray) {
         let history = UrlHistory.create(historyArray);
@@ -107,7 +107,7 @@ class MemberAttributionService {
      * Returns the attribution resource for a given event model (MemberCreatedEvent / SubscriptionCreatedEvent), where the model has the required relations already loaded
      * You need to already load the 'postAttribution', 'userAttribution', and 'tagAttribution' relations
      * @param {Object} eventModel MemberCreatedEvent or SubscriptionCreatedEvent
-     * @returns {import('./AttributionBuilder').AttributionResource|null}
+     * @returns {import('./attribution-builder').AttributionResource|null}
      */
     getEventAttribution(eventModel) {
         const _attribution = this.attributionBuilder.build({
@@ -139,7 +139,7 @@ class MemberAttributionService {
     /**
      * Returns the parsed attribution for a member creation event
      * @param {string} memberId
-     * @returns {Promise<import('./AttributionBuilder').AttributionResource|null>}
+     * @returns {Promise<import('./attribution-builder').AttributionResource|null>}
      */
     async getMemberCreatedAttribution(memberId) {
         const memberCreatedEvent = await this.models.MemberCreatedEvent.findOne({member_id: memberId}, {require: false, withRelated: []});
@@ -160,7 +160,7 @@ class MemberAttributionService {
     /**
      * Returns the last attribution for a given subscription ID
      * @param {string} subscriptionId
-     * @returns {Promise<import('./AttributionBuilder').AttributionResource|null>}
+     * @returns {Promise<import('./attribution-builder').AttributionResource|null>}
      */
     async getSubscriptionCreatedAttribution(subscriptionId) {
         const subscriptionCreatedEvent = await this.models.SubscriptionCreatedEvent.findOne({subscription_id: subscriptionId}, {require: false, withRelated: []});
@@ -180,8 +180,8 @@ class MemberAttributionService {
 
     /**
      * Fetches the resource for a given attribution without the use of an event model
-     * @param {Object} attribution 
-     * @returns {Promise<import('./AttributionBuilder').AttributionResource|null>}
+     * @param {Object} attribution
+     * @returns {Promise<import('./attribution-builder').AttributionResource|null>}
      */
     async fetchResource(attribution) {
         if (!attribution) {

package/core/server/services/member-attribution/{ReferrerTranslator.js → referrer-translator.js}

@@ -32,7 +32,7 @@ class ReferrerTranslator {
 
     /**
      * Calculate referrer details from history
-     * @param {import('./UrlHistory').UrlHistoryArray} history
+     * @param {import('./url-history').UrlHistoryArray} history
      * @returns {ReferrerData|null}
      */
     getReferrerDetails(history) {

package/core/server/services/member-attribution/{UrlTranslator.js → url-translator.js}

@@ -54,7 +54,7 @@ class UrlTranslator {
 
     /**
      * Get the resource type and ID from a URLHistory item that was added by the frontend attribution script
-     * @param {import('./UrlHistory').UrlHistoryItem} item
+     * @param {import('./url-history').UrlHistoryItem} item
      * @returns {Promise<{type: string, id: string | null, url: string}|null>} Returns null if the item is invalid
      */
     async getResourceDetails(item) {

package/core/server/services/member-welcome-emails/constants.js

@@ -14,8 +14,29 @@ const MESSAGES = {
     memberWelcomeEmailInactive: memberStatus => `Member welcome email for "${memberStatus}" members is inactive`
 };
 
+// Default welcome email content in Lexical JSON format
+// Uses __GHOST_URL__ placeholder which Ghost replaces with the actual site URL
+// These match the defaults used in the admin UI (apps/admin-x-settings/src/components/settings/membership/member-emails.tsx)
+const DEFAULT_FREE_LEXICAL_CONTENT = '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome! Thanks for subscribing — it\'s great to have you here.","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"You\'ll now receive new posts straight to your inbox. You can also log in any time to read the ","type":"extended-text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"full archive","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":"noreferrer","target":null,"title":null,"url":"__GHOST_URL__/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" or catch up on new posts as they go live.","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"A little housekeeping: If this email landed in spam or promotions, try moving it to your primary inbox and adding this address to your contacts. Small signals like that help your inbox recognize that these messages matter to you.","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Have questions or just want to say hi? Feel free to reply directly to this email or any newsletter in the future.","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1},{"children":[],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}';
+
+const DEFAULT_PAID_LEXICAL_CONTENT = '{"root":{"children":[{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Welcome, and thank you for your support — it means a lot.","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"As a paid member, you now have full access to everything: the complete archive, and any paid-only content going forward. New posts will land straight to your inbox, and you can log in any time to ","type":"extended-text","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"catch up","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"link","version":1,"rel":"noreferrer","target":null,"title":null,"url":"__GHOST_URL__/"},{"detail":0,"format":0,"mode":"normal","style":"","text":" on anything you\'ve missed.","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"A little housekeeping: If this email landed in spam or promotions, try moving it to your primary inbox and adding this address to your contacts. Small signals like that help your inbox recognize that these messages matter to you.","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1},{"children":[{"detail":0,"format":0,"mode":"normal","style":"","text":"Have questions or just want to say hi? Feel free to reply directly to this email or any newsletter in the future.","type":"extended-text","version":1}],"direction":"ltr","format":"","indent":0,"type":"paragraph","version":1}],"direction":"ltr","format":"","indent":0,"type":"root","version":1}}';
+
+const DEFAULT_WELCOME_EMAILS = {
+    free: {
+        lexical: DEFAULT_FREE_LEXICAL_CONTENT,
+        subject: 'Welcome to {{site.title}}',
+        status: 'active'
+    },
+    paid: {
+        lexical: DEFAULT_PAID_LEXICAL_CONTENT,
+        subject: 'Welcome to your paid subscription',
+        status: 'active'
+    }
+};
+
 module.exports = {
     MEMBER_WELCOME_EMAIL_LOG_KEY,
     MEMBER_WELCOME_EMAIL_SLUGS,
-    MESSAGES
+    MESSAGES,
+    DEFAULT_WELCOME_EMAILS
 };

package/core/server/services/member-welcome-emails/service.js

@@ -7,8 +7,8 @@ const emailAddressService = require('../email-address');
 const mail = require('../mail');
 // @ts-expect-error type checker has trouble with the dynamic exporting in models
 const {AutomatedEmail} = require('../../models');
-const MemberWelcomeEmailRenderer = require('./MemberWelcomeEmailRenderer');
-const {MEMBER_WELCOME_EMAIL_LOG_KEY, MEMBER_WELCOME_EMAIL_SLUGS, MESSAGES} = require('./constants');
+const MemberWelcomeEmailRenderer = require('./member-welcome-email-renderer');
+const {MEMBER_WELCOME_EMAIL_LOG_KEY, MEMBER_WELCOME_EMAIL_SLUGS, MESSAGES, DEFAULT_WELCOME_EMAILS} = require('./constants');
 
 class MemberWelcomeEmailService {
     #mailer;
@@ -30,14 +30,32 @@ class MemberWelcomeEmailService {
     }
 
     async loadMemberWelcomeEmails() {
+        const useDefaults = Boolean(config.get('memberWelcomeEmailTestInbox'));
+
         for (const [memberStatus, slug] of Object.entries(MEMBER_WELCOME_EMAIL_SLUGS)) {
             const row = await AutomatedEmail.findOne({slug});
 
-            if (!row || !row.get('lexical')) {
+            if (!row) {
+                // No row - use default template when test inbox is configured
+                if (useDefaults) {
+                    const defaultEmail = DEFAULT_WELCOME_EMAILS[memberStatus];
+                    this.#memberWelcomeEmails[memberStatus] = {
+                        ...defaultEmail,
+                        lexical: urlUtils.transformReadyToAbsolute(defaultEmail.lexical)
+                    };
+                } else {
+                    this.#memberWelcomeEmails[memberStatus] = null;
+                }
+                continue;
+            }
+
+            // Row exists - check if it has content
+            if (!row.get('lexical')) {
                 this.#memberWelcomeEmails[memberStatus] = null;
                 continue;
             }
 
+            // Use DB template (status check happens in send())
             this.#memberWelcomeEmails[memberStatus] = {
                 lexical: row.get('lexical'),
                 subject: row.get('subject'),
@@ -99,7 +117,7 @@ class MemberWelcomeEmailService {
         if (!slug) {
             return false;
         }
-        
+
         const row = await AutomatedEmail.findOne({slug});
         return Boolean(row && row.get('lexical') && row.get('status') === 'active');
     }
@@ -119,7 +137,7 @@ class MemberWelcomeEmailService {
                 message: MESSAGES.MISSING_EMAIL_CONTENT
             });
         }
-            
+
         if (!subject) {
             throw new errors.ValidationError({
                 message: MESSAGES.MISSING_EMAIL_SUBJECT

package/core/server/services/members/api.js

@@ -10,7 +10,7 @@ const signupEmail = require('./emails/signup');
 const signupPaidEmail = require('./emails/signup-paid');
 const subscribeEmail = require('./emails/subscribe');
 const updateEmail = require('./emails/update-email');
-const SingleUseTokenProvider = require('./SingleUseTokenProvider');
+const SingleUseTokenProvider = require('./single-use-token-provider');
 const urlUtils = require('../../../shared/url-utils');
 const labsService = require('../../../shared/labs');
 const offersService = require('../offers');

package/core/server/services/members/importer/index.js

@@ -1,8 +1,8 @@
-const MembersCSVImporter = require('./MembersCSVImporter');
-const MembersCSVImporterStripeUtils = require('./MembersCSVImporterStripeUtils');
+const MembersCSVImporter = require('./members-csv-importer');
+const MembersCSVImporterStripeUtils = require('./members-csv-importer-stripe-utils');
 
 /**
- * @typedef {import('./MembersCSVImporter').MembersCSVImporterOptions} MembersCSVImporterOptions
+ * @typedef {import('./members-csv-importer').MembersCSVImporterOptions} MembersCSVImporterOptions
  */
 
 /**

package/core/server/services/members/importer/{MembersCSVImporter.js → members-csv-importer.js}

@@ -33,8 +33,8 @@ const DEFAULT_CSV_HEADER_MAPPING = {
  * @property {string} storagePath - The path to store CSV's in before importing
  * @property {Function} getTimezone - function returning currently configured timezone
  * @property {() => Object} getMembersRepository - member model access instance for data access and manipulation
- * @property {() => Promise<import('../../tiers/Tier')>} getDefaultTier - async function returning default Member Tier
- * @property {(string) => Promise<import('../../tiers/Tier')>} getTierByName - async function returning Member Tier by name
+ * @property {() => Promise<import('../../tiers/tier')>} getDefaultTier - async function returning default Member Tier
+ * @property {(string) => Promise<import('../../tiers/tier')>} getTierByName - async function returning Member Tier by name
  * @property {Function} sendEmail - function sending an email
  * @property {(string) => boolean} isSet - Method checking if specific feature is enabled
  * @property {({job, offloaded, name}) => void} addJob - Method registering an async job

package/core/server/services/members/members-api/members-api.js

@@ -3,20 +3,20 @@ const body = require('body-parser');
 const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 
-const PaymentsService = require('./services/PaymentsService');
-const TokenService = require('./services/TokenService');
-const GeolocationService = require('./services/GeolocationService');
-const MemberBREADService = require('./services/MemberBREADService');
-const MemberRepository = require('./repositories/MemberRepository');
-
-const EventRepository = require('./repositories/EventRepository');
-const ProductRepository = require('./repositories/ProductRepository');
-const RouterController = require('./controllers/RouterController');
-const MemberController = require('./controllers/MemberController');
-const WellKnownController = require('./controllers/WellKnownController');
-
-const {EmailSuppressedEvent} = require('../../email-suppression-list/EmailSuppressionList');
-const MagicLink = require('../../lib/magic-link/MagicLink');
+const PaymentsService = require('./services/payments-service');
+const TokenService = require('./services/token-service');
+const GeolocationService = require('./services/geolocation-service');
+const MemberBREADService = require('./services/member-bread-service');
+const MemberRepository = require('./repositories/member-repository');
+
+const EventRepository = require('./repositories/event-repository');
+const ProductRepository = require('./repositories/product-repository');
+const RouterController = require('./controllers/router-controller');
+const MemberController = require('./controllers/member-controller');
+const WellKnownController = require('./controllers/well-known-controller');
+
+const {EmailSuppressedEvent} = require('../../email-suppression-list/email-suppression-list');
+const MagicLink = require('../../lib/magic-link/magic-link');
 const DomainEvents = require('@tryghost/domain-events');
 
 module.exports = function MembersAPI({

package/core/server/services/members/members-api/repositories/{MemberRepository.js → member-repository.js}

@@ -9,7 +9,7 @@ const {NotFoundError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
 const crypto = require('crypto');
 const config = require('../../../../../shared/config');
-const StartOutboxProcessingEvent = require('../../../outbox/events/StartOutboxProcessingEvent');
+const StartOutboxProcessingEvent = require('../../../outbox/events/start-outbox-processing-event');
 const {MEMBER_WELCOME_EMAIL_SLUGS} = require('../../../member-welcome-emails/constants');
 const messages = {
     noStripeConnection: 'Cannot {action} without a Stripe Connection',
@@ -343,10 +343,13 @@ module.exports = class MemberRepository {
         const memberAddOptions = {...(options || {}), withRelated};
         let member;
 
-        if (config.get('memberWelcomeEmailTestInbox') && WELCOME_EMAIL_SOURCES.includes(source)) {
+        const hasTestInbox = Boolean(config.get('memberWelcomeEmailTestInbox'));
+        if (hasTestInbox && WELCOME_EMAIL_SOURCES.includes(source)) {
             const freeWelcomeEmail = this._AutomatedEmail ? await this._AutomatedEmail.findOne({slug: MEMBER_WELCOME_EMAIL_SLUGS.free}) : null;
             const isFreeWelcomeEmailActive = freeWelcomeEmail && freeWelcomeEmail.get('lexical') && freeWelcomeEmail.get('status') === 'active';
             const isFreeSignup = !stripeCustomer;
+            // Use default template only when no DB row exists (not when inactive - respect explicit user choice)
+            const useDefaultFreeTemplate = !freeWelcomeEmail && hasTestInbox;
 
             const runMemberCreation = async (transacting) => {
                 const newMember = await this._Member.add({
@@ -355,10 +358,10 @@ module.exports = class MemberRepository {
                     labels
                 }, {...memberAddOptions, transacting});
 
-                // Only send the free welcome email if:
-                // 1. The free welcome email is active
+                // Send the free welcome email if:
+                // 1. The free welcome email is active OR no DB row exists and test inbox is configured (uses default template)
                 // 2. The member is not signing up for a paid subscription (no stripeCustomer)
-                if (isFreeWelcomeEmailActive && isFreeSignup) {
+                if ((isFreeWelcomeEmailActive || useDefaultFreeTemplate) && isFreeSignup) {
                     const timestamp = eventData.created_at || newMember.get('created_at');
 
                     await this._Outbox.add({
@@ -384,7 +387,7 @@ module.exports = class MemberRepository {
                 member = await this._Member.transaction(runMemberCreation);
             }
 
-            if (isFreeWelcomeEmailActive && isFreeSignup) {
+            if ((isFreeWelcomeEmailActive || useDefaultFreeTemplate) && isFreeSignup) {
                 this.dispatchEvent(StartOutboxProcessingEvent.create({memberId: member.id}), memberAddOptions);
             }
         } else {
@@ -1425,11 +1428,17 @@ module.exports = class MemberRepository {
             const source = this._resolveContextSource(context);
             const shouldSendPaidWelcomeEmail = config.get('memberWelcomeEmailTestInbox') && WELCOME_EMAIL_SOURCES.includes(source);
             let isPaidWelcomeEmailActive = false;
+            let paidWelcomeEmail = null;
             if (shouldSendPaidWelcomeEmail && this._AutomatedEmail) {
-                const paidWelcomeEmail = await this._AutomatedEmail.findOne({slug: MEMBER_WELCOME_EMAIL_SLUGS.paid}, options);
+                paidWelcomeEmail = await this._AutomatedEmail.findOne({slug: MEMBER_WELCOME_EMAIL_SLUGS.paid}, options);
                 isPaidWelcomeEmailActive = paidWelcomeEmail && paidWelcomeEmail.get('lexical') && paidWelcomeEmail.get('status') === 'active';
             }
-            if (updatedMember.get('status') === 'paid' && isPaidWelcomeEmailActive) {
+            // Use default template only when no DB row exists (not when inactive - respect explicit user choice)
+            const useDefaultPaidTemplate = !paidWelcomeEmail && shouldSendPaidWelcomeEmail;
+            // Send paid welcome email if:
+            // 1. The paid welcome email is active OR no DB row exists and test inbox is configured (uses default template)
+            // 2. The member status changed to 'paid'
+            if (updatedMember.get('status') === 'paid' && (isPaidWelcomeEmailActive || useDefaultPaidTemplate)) {
                 await this._Outbox.add({
                     id: ObjectId().toHexString(),
                     event_type: MemberCreatedEvent.name,

package/core/server/services/members/members-api/services/{MemberBREADService.js → member-bread-service.js}

@@ -30,7 +30,7 @@ const messages = {
 module.exports = class MemberBREADService {
     /**
      * @param {object} deps
-     * @param {import('../repositories/MemberRepository')} deps.memberRepository
+     * @param {import('../repositories/member-repository')} deps.memberRepository
      * @param {import('@tryghost/members-offers/lib/application/OffersAPI')} deps.offersAPI
      * @param {ILabsService} deps.labsService
      * @param {IEmailService} deps.emailService

package/core/server/services/members/members-api/services/{PaymentsService.js → payments-service.js}

@@ -1,17 +1,17 @@
 const logging = require('@tryghost/logging');
 const DomainEvents = require('@tryghost/domain-events');
-const TierCreatedEvent = require('../../../../../../core/server/services/tiers/TierCreatedEvent');
-const TierPriceChangeEvent = require('../../../../../../core/server/services/tiers/TierPriceChangeEvent');
-const TierNameChangeEvent = require('../../../../../../core/server/services/tiers/TierNameChangeEvent');
-const OfferCreatedEvent = require('../../../../../../core/server/services/offers/domain/events/OfferCreatedEvent');
+const TierCreatedEvent = require('../../../tiers/tier-created-event');
+const TierPriceChangeEvent = require('../../../tiers/tier-price-change-event');
+const TierNameChangeEvent = require('../../../tiers/tier-name-change-event');
+const OfferCreatedEvent = require('../../../offers/domain/events/offer-created-event');
 const {BadRequestError} = require('@tryghost/errors');
 
 class PaymentsService {
     /**
      * @param {object} deps
      * @param {import('bookshelf').Model} deps.Offer
-     * @param {import('../../../offers/application/OffersAPI')} deps.offersAPI
-     * @param {import('../../../stripe/StripeAPI')} deps.stripeAPIService
+     * @param {import('../../../offers/application/offers-api')} deps.offersAPI
+     * @param {import('../../../stripe/stripe-api')} deps.stripeAPIService
      * @param {{get(key: string): any}} deps.settingsCache
      */
     constructor(deps) {
@@ -57,7 +57,7 @@ class PaymentsService {
 
     /**
      * @param {object} params
-     * @param {import('../../../tiers/Tier')} params.tier
+     * @param {import('../../../tiers/tier')} params.tier
      * @param {Tier.Cadence} params.cadence
      * @param {Offer} [params.offer]
      * @param {Member} [params.member]
@@ -183,7 +183,7 @@ class PaymentsService {
     }
 
     /**
-     * @param {import('../../../tiers/Tier')} tier
+     * @param {import('../../../tiers/tier')} tier
      * @returns {Promise<{id: string}>}
      */
     async getProductForTier(tier) {
@@ -211,7 +211,7 @@ class PaymentsService {
     }
 
     /**
-     * @param {import('../../../tiers/Tier')} tier
+     * @param {import('../../../tiers/tier')} tier
      * @returns {Promise<import('stripe').default.Product>}
      */
     async createProductForTier(tier) {
@@ -224,7 +224,7 @@ class PaymentsService {
     }
 
     /**
-     * @param {import('../../../tiers/Tier')} tier
+     * @param {import('../../../tiers/tier')} tier
      * @returns {Promise<void>}
      */
     async updateNameForTierProducts(tier) {
@@ -398,7 +398,7 @@ class PaymentsService {
     }
 
     /**
-     * @param {import('../../../tiers/Tier')} tier
+     * @param {import('../../../tiers/tier')} tier
      * @param {'month'|'year'} cadence
      * @returns {Promise<{id: string}>}
      */
@@ -442,7 +442,7 @@ class PaymentsService {
     }
 
     /**
-     * @param {import('../../../tiers/Tier')} tier
+     * @param {import('../../../tiers/tier')} tier
      * @param {'month'|'year'} cadence
      * @returns {Promise<import('stripe').default.Price>}
      */

package/core/server/services/members/service.js

@@ -3,9 +3,9 @@ const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const MembersSSR = require('./members-ssr');
 const db = require('../../data/db');
-const MembersConfigProvider = require('./MembersConfigProvider');
+const MembersConfigProvider = require('./members-config-provider');
 const makeMembersCSVImporter = require('./importer');
-const MembersStats = require('./stats/MembersStats');
+const MembersStats = require('./stats/members-stats');
 const memberJobs = require('./jobs');
 const logging = require('@tryghost/logging');
 const urlUtils = require('../../../shared/url-utils');
@@ -16,10 +16,10 @@ const models = require('../../models');
 const {GhostMailer} = require('../mail');
 const jobsService = require('../jobs');
 const tiersService = require('../tiers');
-const VerificationTrigger = require('../VerificationTrigger');
+const VerificationTrigger = require('../verification-trigger');
 const DatabaseInfo = require('@tryghost/database-info');
 const settingsHelpers = require('../settings-helpers');
-const RequestIntegrityTokenProvider = require('./RequestIntegrityTokenProvider');
+const RequestIntegrityTokenProvider = require('./request-integrity-token-provider');
 
 const messages = {
     noLiveKeysInDevelopment: 'Cannot use live stripe keys in development. Please restart in production mode.',

package/core/server/services/members-events/index.js

@@ -13,9 +13,9 @@ class MembersEventsServiceWrapper {
         }
 
         // Wire up all the dependencies
-        const EventStorage = require('./EventStorage');
-        const LastSeenAtUpdater = require('./LastSeenAtUpdater');
-        const LastSeenAtCache = require('./LastSeenAtCache');
+        const EventStorage = require('./event-storage');
+        const LastSeenAtUpdater = require('./last-seen-at-updater');
+        const LastSeenAtCache = require('./last-seen-at-cache');
         const models = require('../../models');
 
         // Listen for events and store them in the database

package/core/server/services/members-events/{LastSeenAtUpdater.js → last-seen-at-updater.js}

@@ -1,9 +1,9 @@
 const {MemberPageViewEvent, MemberCommentEvent, MemberLinkClickEvent} = require('../../../shared/events');
 const moment = require('moment-timezone');
 const {IncorrectUsageError} = require('@tryghost/errors');
-const EmailOpenedEvent = require('../../services/email-service/events/EmailOpenedEvent');
+const EmailOpenedEvent = require('../email-service/events/email-opened-event');
 const logging = require('@tryghost/logging');
-const LastSeenAtCache = require('./LastSeenAtCache');
+const LastSeenAtCache = require('./last-seen-at-cache');
 
 /**
  * Listen for `MemberViewEvent` to update the `member.last_seen_at` timestamp

package/core/server/services/mentions/{BookshelfMentionRepository.js → bookshelf-mention-repository.js}

@@ -1,18 +1,18 @@
-const Mention = require('./Mention');
+const Mention = require('./mention');
 const logging = require('@tryghost/logging');
 
 /**
- * @typedef {import('./MentionsAPI').IMentionRepository} IMentionRepository
+ * @typedef {import('./mentions-api').IMentionRepository} IMentionRepository
  */
 
 /**
  * @template Model
- * @typedef {import('./MentionsAPI').Page<Model>} Page
+ * @typedef {import('./mentions-api').Page<Model>} Page
  */
 
 /**
- * @typedef {import('./MentionsAPI').GetPageOptions} GetPageOptions
- * @typedef {import('./MentionsAPI').GetAllOptions} GetAllOptions
+ * @typedef {import('./mentions-api').GetPageOptions} GetPageOptions
+ * @typedef {import('./mentions-api').GetAllOptions} GetAllOptions
  */
 
 /**
@@ -64,7 +64,7 @@ module.exports = class BookshelfMentionRepository {
 
     /**
      * @param {GetPageOptions} options
-     * @returns {Promise<Page<import('./Mention')>>}
+     * @returns {Promise<Page<import('./mention')>>}
      */
     async getPage(options) {
         /**
@@ -88,7 +88,7 @@ module.exports = class BookshelfMentionRepository {
 
     /**
      * @param {GetAllOptions} options
-     * @returns {Promise<import('./Mention')[]>}
+     * @returns {Promise<import('./mention')[]>}
      */
     async getAll(options) {
         const models = await this.#MentionModel.findAll(options);
@@ -99,7 +99,7 @@ module.exports = class BookshelfMentionRepository {
     /**
      * @param {URL} source
      * @param {URL} target
-     * @returns {Promise<import('./Mention')|null>}
+     * @returns {Promise<import('./mention')|null>}
      */
     async getBySourceAndTarget(source, target) {
         const model = await this.#MentionModel.findOne({
@@ -115,7 +115,7 @@ module.exports = class BookshelfMentionRepository {
     }
 
     /**
-     * @param {import('./Mention')} mention
+     * @param {import('./mention')} mention
      * @returns {Promise<void>}
      */
     async save(mention) {

package/core/server/services/mentions/{InMemoryMentionRepository.js → in-memory-mention-repository.js}

@@ -1,14 +1,14 @@
 const nql = require('@tryghost/nql');
-const Mention = require('./Mention');
+const Mention = require('./mention');
 
 /**
- * @typedef {import('./MentionsAPI').GetPageOptions} GetPageOptions
- * @typedef {import('./MentionsAPI').IMentionRepository} IMentionRepository
+ * @typedef {import('./mentions-api').GetPageOptions} GetPageOptions
+ * @typedef {import('./mentions-api').IMentionRepository} IMentionRepository
  */
 
 /**
  * @template Model
- * @typedef {import('./MentionsAPI').Page<Model>} Page<Model>
+ * @typedef {import('./mentions-api').Page<Model>} Page<Model>
  */
 
 /**