Moved @tryghost/member-events to core folder

fix https://linear.app/ghost/issue/ENG-2379/member-events

- this commit moves the lib code and tests to the core folder so we can
  colocate code in one place rather than splitting it out across
  packages, which increases the cognitive load and overhead

Author: daniellockyer

.docker/Dockerfile

@@ -84,7 +84,6 @@ COPY ghost/job-manager/package.json ghost/job-manager/package.json
 COPY ghost/link-replacer/package.json ghost/link-replacer/package.json
 COPY ghost/magic-link/package.json ghost/magic-link/package.json
 COPY ghost/member-attribution/package.json ghost/member-attribution/package.json
-COPY ghost/member-events/package.json ghost/member-events/package.json
 COPY ghost/members-csv/package.json ghost/members-csv/package.json
 COPY ghost/mw-error-handler/package.json ghost/mw-error-handler/package.json
 COPY ghost/mw-vhost/package.json ghost/mw-vhost/package.json

compose.yml

@@ -47,7 +47,6 @@ services:
       - node_modules_ghost_link-replacer:/home/ghost/ghost/link-replacer/node_modules:delegated
       - node_modules_ghost_magic-link:/home/ghost/ghost/magic-link/node_modules:delegated
       - node_modules_ghost_member-attribution:/home/ghost/ghost/member-attribution/node_modules:delegated
-      - node_modules_ghost_member-events:/home/ghost/ghost/member-events/node_modules:delegated
       - node_modules_ghost_members-csv:/home/ghost/ghost/members-csv/node_modules:delegated
       - node_modules_ghost_mw-error-handler:/home/ghost/ghost/mw-error-handler/node_modules:delegated
       - node_modules_ghost_mw-vhost:/home/ghost/ghost/mw-vhost/node_modules:delegated
@@ -177,7 +176,6 @@ volumes:
   node_modules_ghost_link-replacer: {}
   node_modules_ghost_magic-link: {}
   node_modules_ghost_member-attribution: {}
-  node_modules_ghost_member-events: {}
   node_modules_ghost_members-csv: {}
   node_modules_ghost_mw-error-handler: {}
   node_modules_ghost_mw-vhost: {}

ghost/core/core/frontend/services/sitemap/SiteMapManager.js

@@ -1,5 +1,5 @@
 const DomainEvents = require('@tryghost/domain-events');
-const URLResourceUpdatedEvent = require('../../../shared/events/URLResourceUpdatedEvent');
+const {URLResourceUpdatedEvent} = require('../../../shared/events');
 const IndexMapGenerator = require('./SiteMapIndexGenerator');
 const PagesMapGenerator = require('./PageMapGenerator');
 const PostsMapGenerator = require('./PostMapGenerator');

ghost/core/core/frontend/web/site.js

@@ -2,7 +2,7 @@ const debug = require('@tryghost/debug')('frontend');
 const path = require('path');
 const express = require('../../shared/express');
 const DomainEvents = require('@tryghost/domain-events');
-const {MemberPageViewEvent} = require('@tryghost/member-events');
+const {MemberPageViewEvent} = require('../../shared/events');
 
 // App requires
 const config = require('../../shared/config');

ghost/core/core/server/services/VerificationTrigger.js

@@ -1,6 +1,6 @@
 const errors = require('@tryghost/errors');
 const DomainEvents = require('@tryghost/domain-events');
-const {MemberCreatedEvent} = require('@tryghost/member-events');
+const {MemberCreatedEvent} = require('../../shared/events');
 
 const messages = {
     emailVerificationNeeded: `We're hard at work processing your import. To make sure you get great deliverability, we'll need to enable some extra features for your account. A member of our team will be in touch with you by email to review your account make sure everything is configured correctly so you're ready to go.`,

ghost/core/core/server/services/comments/CommentsService.js

@@ -1,6 +1,6 @@
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
-const {MemberCommentEvent} = require('@tryghost/member-events');
+const {MemberCommentEvent} = require('../../../shared/events');
 const DomainEvents = require('@tryghost/domain-events');
 
 const messages = {

ghost/core/core/server/services/link-tracking/index.js

@@ -17,7 +17,7 @@ class LinkTrackingServiceWrapper {
 
         // Wire up all the dependencies
         const models = require('../../models');
-        const {MemberLinkClickEvent} = require('@tryghost/member-events');
+        const {MemberLinkClickEvent} = require('../../../shared/events');
         const DomainEvents = require('@tryghost/domain-events');
 
         const LinkClickTrackingService = require('./LinkClickTrackingService');

ghost/core/core/server/services/members-events/EventStorage.js

@@ -1,4 +1,4 @@
-const {MemberCreatedEvent, SubscriptionCreatedEvent} = require('@tryghost/member-events');
+const {MemberCreatedEvent, SubscriptionCreatedEvent} = require('../../../shared/events');
 
 /**
  * Store events in the database

ghost/core/core/server/services/members-events/LastSeenAtUpdater.js

@@ -1,4 +1,4 @@
-const {MemberPageViewEvent, MemberCommentEvent, MemberLinkClickEvent} = require('@tryghost/member-events');
+const {MemberPageViewEvent, MemberCommentEvent, MemberLinkClickEvent} = require('../../../shared/events');
 const moment = require('moment-timezone');
 const {IncorrectUsageError} = require('@tryghost/errors');
 const {EmailOpenedEvent} = require('@tryghost/email-service');

ghost/core/core/server/services/members/members-api/repositories/MemberRepository.js

@@ -3,7 +3,7 @@ const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
 const DomainEvents = require('@tryghost/domain-events');
-const {SubscriptionActivatedEvent, MemberCreatedEvent, SubscriptionCreatedEvent, MemberSubscribeEvent, SubscriptionCancelledEvent, OfferRedemptionEvent} = require('@tryghost/member-events');
+const {SubscriptionActivatedEvent, MemberCreatedEvent, SubscriptionCreatedEvent, MemberSubscribeEvent, SubscriptionCancelledEvent, OfferRedemptionEvent} = require('../../../../../shared/events');
 const ObjectId = require('bson-objectid').default;
 const {NotFoundError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');

ghost/core/core/server/services/staff/StaffService.js

@@ -1,4 +1,4 @@
-const {MemberCreatedEvent, SubscriptionCancelledEvent, SubscriptionActivatedEvent} = require('@tryghost/member-events');
+const {MemberCreatedEvent, SubscriptionCancelledEvent, SubscriptionActivatedEvent} = require('../../../shared/events');
 const MilestoneCreatedEvent = require('../milestones/MilestoneCreatedEvent');
 
 // @NOTE: 'StaffService' is a vague name that does not describe what it's actually doing.

ghost/core/core/server/services/url/Resources.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('services:url:resources');
 const DomainEvents = require('@tryghost/domain-events');
-const URLResourceUpdatedEvent = require('../../../shared/events/URLResourceUpdatedEvent');
+const {URLResourceUpdatedEvent} = require('../../../shared/events');
 const Resource = require('./Resource');
 const config = require('../../../shared/config');
 const models = require('../../models');

ghost/member-events/lib/MemberCommentEvent.js renamed to ghost/core/core/shared/events/MemberCommentEvent.js

@@ -0,0 +1,17 @@
+module.exports = {
+    MemberCommentEvent: require('./MemberCommentEvent'),
+    MemberCreatedEvent: require('./MemberCreatedEvent'),
+    MemberEntryViewEvent: require('./MemberEntryViewEvent'),
+    MemberLinkClickEvent: require('./MemberLinkClickEvent'),
+    MemberPageViewEvent: require('./MemberPageViewEvent'),
+    MemberPaidCancellationEvent: require('./MemberPaidCancellationEvent'),
+    MemberPaidConversionEvent: require('./MemberPaidConversionEvent'),
+    MemberSignupEvent: require('./MemberSignupEvent'),
+    MemberSubscribeEvent: require('./MemberSubscribeEvent'),
+    MemberUnsubscribeEvent: require('./MemberUnsubscribeEvent'),
+    OfferRedemptionEvent: require('./OfferRedemptionEvent'),
+    SubscriptionActivatedEvent: require('./SubscriptionActivatedEvent'),
+    SubscriptionCancelledEvent: require('./SubscriptionCancelledEvent'),
+    SubscriptionCreatedEvent: require('./SubscriptionCreatedEvent'),
+    URLResourceUpdatedEvent: require('./URLResourceUpdatedEvent')
+};

ghost/member-events/lib/MemberCreatedEvent.js renamed to ghost/core/core/shared/events/MemberCreatedEvent.js

@@ -101,7 +101,6 @@
     "@tryghost/link-replacer": "0.0.0",
     "@tryghost/logging": "2.4.21",
     "@tryghost/member-attribution": "0.0.0",
-    "@tryghost/member-events": "0.0.0",
     "@tryghost/members-csv": "0.0.0",
     "@tryghost/members-offers": "0.0.0",
     "@tryghost/metrics": "1.0.37",

ghost/member-events/lib/MemberEntryViewEvent.js renamed to ghost/core/core/shared/events/MemberEntryViewEvent.js

@@ -8,7 +8,7 @@ const configUtils = require('../utils/configUtils');
 const settingsCache = require('../../core/shared/settings-cache');
 const settingsHelpers = require('../../core/server/services/settings-helpers');
 const DomainEvents = require('@tryghost/domain-events');
-const {MemberPageViewEvent} = require('@tryghost/member-events');
+const {MemberPageViewEvent} = require('../../core/shared/events');
 const models = require('../../core/server/models');
 const {fixtureManager} = require('../utils/e2e-framework');
 const DataGenerator = require('../utils/fixtures/data-generator');

ghost/member-events/lib/MemberLinkClickEvent.js renamed to ghost/core/core/shared/events/MemberLinkClickEvent.js

@@ -4,7 +4,7 @@ const assert = require('assert/strict');
 
 // Stuff we are testing
 const DomainEvents = require('@tryghost/domain-events');
-const URLResourceUpdatedEvent = require('../../../../../core/shared/events/URLResourceUpdatedEvent');
+const {URLResourceUpdatedEvent} = require('../../../../../core/shared/events');
 
 const events = require('../../../../../core/server/lib/common/events');
 

ghost/member-events/lib/MemberPageViewEvent.js renamed to ghost/core/core/shared/events/MemberPageViewEvent.js

@@ -1,7 +1,7 @@
 require('should');
 const sinon = require('sinon');
 
-const {MemberCreatedEvent, SubscriptionCreatedEvent} = require('@tryghost/member-events');
+const {MemberCreatedEvent, SubscriptionCreatedEvent} = require('../../../../../core/shared/events');
 const EventStorage = require('../../../../../core/server/services/members-events/EventStorage');
 
 describe('EventStorage', function () {

ghost/member-events/lib/MemberPaidCancellationEvent.js renamed to ghost/core/core/shared/events/MemberPaidCancellationEvent.js

@@ -3,7 +3,7 @@ const assert = require('assert/strict');
 const sinon = require('sinon');
 const LastSeenAtUpdater = require('../../../../../core/server/services/members-events/LastSeenAtUpdater');
 const DomainEvents = require('@tryghost/domain-events');
-const {MemberPageViewEvent, MemberCommentEvent, MemberSubscribeEvent, MemberLinkClickEvent} = require('@tryghost/member-events');
+const {MemberPageViewEvent, MemberCommentEvent, MemberSubscribeEvent, MemberLinkClickEvent} = require('../../../../../core/shared/events');
 const moment = require('moment');
 const {EmailOpenedEvent} = require('@tryghost/email-service');
 const EventEmitter = require('events');

ghost/member-events/lib/MemberPaidConversionEvent.js renamed to ghost/core/core/shared/events/MemberPaidConversionEvent.js

@@ -2,7 +2,7 @@ const assert = require('assert/strict');
 const sinon = require('sinon');
 const DomainEvents = require('@tryghost/domain-events');
 const MemberRepository = require('../../../../../../../core/server/services/members/members-api/repositories/MemberRepository');
-const {SubscriptionCreatedEvent, OfferRedemptionEvent} = require('@tryghost/member-events');
+const {SubscriptionCreatedEvent, OfferRedemptionEvent} = require('../../../../../../../core/shared/events');
 
 const mockOfferRedemption = {
     add: sinon.stub(),

ghost/member-events/lib/MemberSignupEvent.js renamed to ghost/core/core/shared/events/MemberSignupEvent.js

@@ -5,7 +5,7 @@ const DomainEvents = require('@tryghost/domain-events');
 const {mockManager} = require('../../../../utils/e2e-framework');
 const models = require('../../../../../core/server/models');
 
-const {SubscriptionCancelledEvent, MemberCreatedEvent, SubscriptionActivatedEvent} = require('@tryghost/member-events');
+const {SubscriptionCancelledEvent, MemberCreatedEvent, SubscriptionActivatedEvent} = require('../../../../../core/shared/events');
 const MilestoneCreatedEvent = require('../../../../../core/server/services/milestones/MilestoneCreatedEvent');
 
 describe('Staff Service:', function () {

ghost/member-events/lib/MemberSubscribeEvent.js renamed to ghost/core/core/shared/events/MemberSubscribeEvent.js

@@ -1,7 +1,7 @@
 // Switch these lines once there are useful utils
 // const testUtils = require('./utils');
 const sinon = require('sinon');
-const {MemberCreatedEvent, SubscriptionCancelledEvent, SubscriptionActivatedEvent} = require('@tryghost/member-events');
+const {MemberCreatedEvent, SubscriptionCancelledEvent, SubscriptionActivatedEvent} = require('../../../../../core/shared/events');
 const MilestoneCreatedEvent = require('../../../../../core/server/services/milestones/MilestoneCreatedEvent');
 
 // Stuff we are testing

ghost/member-events/lib/MemberUnsubscribeEvent.js renamed to ghost/core/core/shared/events/MemberUnsubscribeEvent.js

@@ -5,7 +5,7 @@ const assert = require('assert/strict');
 require('should');
 const VerificationTrigger = require('../../../../core/server/services/VerificationTrigger');
 const DomainEvents = require('@tryghost/domain-events');
-const {MemberCreatedEvent} = require('@tryghost/member-events');
+const {MemberCreatedEvent} = require('../../../../core/shared/events');
 
 describe('Import threshold', function () {
     beforeEach(function () {

ghost/member-events/lib/OfferRedemptionEvent.js renamed to ghost/core/core/shared/events/OfferRedemptionEvent.js

@@ -1,5 +1,5 @@
 const assert = require('assert/strict');
-const URLResourceUpdatedEvent = require('../../../../core/shared/events/URLResourceUpdatedEvent');
+const {URLResourceUpdatedEvent} = require('../../../../core/shared/events');
 
 describe('URLResourceUpdatedEvent', function () {
     it('exports a static create method to create instances', function () {

ghost/member-events/lib/SubscriptionActivatedEvent.js renamed to ghost/core/core/shared/events/SubscriptionActivatedEvent.js

@@ -21,7 +21,6 @@
   },
   "dependencies": {
     "@tryghost/domain-events": "0.0.0",
-    "@tryghost/member-events": "0.0.0",
     "@tryghost/referrer-parser": "0.1.1",
     "@tryghost/string": "0.2.13"
   }