Skip to content

Commit 9ba11b8

Browse files
committed
Moved @tryghost/email-suppression-list to core folder
fix https://linear.app/ghost/issue/ENG-2377/email-suppression-list - 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
1 parent f86d23b commit 9ba11b8

File tree

14 files changed

+6
-75
lines changed

14 files changed

+6
-75
lines changed

.docker/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ COPY ghost/domain-events/package.json ghost/domain-events/package.json
7878
COPY ghost/donations/package.json ghost/donations/package.json
7979
COPY ghost/email-addresses/package.json ghost/email-addresses/package.json
8080
COPY ghost/email-service/package.json ghost/email-service/package.json
81-
COPY ghost/email-suppression-list/package.json ghost/email-suppression-list/package.json
8281
COPY ghost/html-to-plaintext/package.json ghost/html-to-plaintext/package.json
8382
COPY ghost/i18n/package.json ghost/i18n/package.json
8483
COPY ghost/job-manager/package.json ghost/job-manager/package.json

compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ services:
4141
- node_modules_ghost_donations:/home/ghost/ghost/donations/node_modules:delegated
4242
- node_modules_ghost_email-addresses:/home/ghost/ghost/email-addresses/node_modules:delegated
4343
- node_modules_ghost_email-service:/home/ghost/ghost/email-service/node_modules:delegated
44-
- node_modules_ghost_email-suppression-list:/home/ghost/ghost/email-suppression-list/node_modules:delegated
4544
- node_modules_ghost_html-to-plaintext:/home/ghost/ghost/html-to-plaintext/node_modules:delegated
4645
- node_modules_ghost_i18n:/home/ghost/ghost/i18n/node_modules:delegated
4746
- node_modules_ghost_job-manager:/home/ghost/ghost/job-manager/node_modules:delegated
@@ -172,7 +171,6 @@ volumes:
172171
node_modules_ghost_donations: {}
173172
node_modules_ghost_email-addresses: {}
174173
node_modules_ghost_email-service: {}
175-
node_modules_ghost_email-suppression-list: {}
176174
node_modules_ghost_html-to-plaintext: {}
177175
node_modules_ghost_i18n: {}
178176
node_modules_ghost_job-manager: {}

ghost/email-suppression-list/lib/email-suppression-list.js renamed to ghost/core/core/server/services/email-suppression-list/EmailSuppressionList.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable ghost/filenames/match-regex */
2+
13
const assert = require('assert/strict');
24

35
/**

ghost/core/core/server/services/email-suppression-list/InMemoryEmailSuppressionList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const {AbstractEmailSuppressionList, EmailSuppressionData} = require('@tryghost/email-suppression-list');
1+
const {AbstractEmailSuppressionList, EmailSuppressionData} = require('./EmailSuppressionList');
22

33
module.exports = class InMemoryEmailSuppressionList extends AbstractEmailSuppressionList {
44

ghost/core/core/server/services/email-suppression-list/MailgunEmailSuppressionList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const {AbstractEmailSuppressionList, EmailSuppressionData, EmailSuppressedEvent} = require('@tryghost/email-suppression-list');
1+
const {AbstractEmailSuppressionList, EmailSuppressionData, EmailSuppressedEvent} = require('./EmailSuppressionList');
22
const {SpamComplaintEvent, EmailBouncedEvent} = require('@tryghost/email-service');
33
const DomainEvents = require('@tryghost/domain-events');
44
const logging = require('@tryghost/logging');

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const RouterController = require('./controllers/RouterController');
1515
const MemberController = require('./controllers/MemberController');
1616
const WellKnownController = require('./controllers/WellKnownController');
1717

18-
const {EmailSuppressedEvent} = require('@tryghost/email-suppression-list');
18+
const {EmailSuppressedEvent} = require('../../email-suppression-list/EmailSuppressionList');
1919
const DomainEvents = require('@tryghost/domain-events');
2020

2121
module.exports = function MembersAPI({

ghost/core/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
"@tryghost/email-addresses": "0.0.0",
8383
"@tryghost/email-mock-receiver": "0.3.10",
8484
"@tryghost/email-service": "0.0.0",
85-
"@tryghost/email-suppression-list": "0.0.0",
8685
"@tryghost/errors": "1.3.7",
8786
"@tryghost/helpers": "1.1.91",
8887
"@tryghost/html-to-plaintext": "0.0.0",

ghost/email-suppression-list/test/lib/email-suppression-list.test.js renamed to ghost/core/test/unit/server/services/email-suppression-list/EmailSuppressionList.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const assert = require('assert/strict');
2-
const {EmailSuppressionData, EmailSuppressedEvent} = require('../../lib/email-suppression-list');
2+
const {EmailSuppressionData, EmailSuppressedEvent} = require('../../../../../core/server/services/email-suppression-list/EmailSuppressionList');
33

44
describe('EmailSuppressionData', function () {
55
it('Has null info when not suppressed', function () {

ghost/email-suppression-list/.eslintrc.js

-6
This file was deleted.

ghost/email-suppression-list/README.md

-21
This file was deleted.

ghost/email-suppression-list/index.js

-1
This file was deleted.

ghost/email-suppression-list/package.json

-27
This file was deleted.

ghost/email-suppression-list/test/.eslintrc.js

-6
This file was deleted.

ghost/email-suppression-list/test/index.test.js

-6
This file was deleted.

0 commit comments

Comments
 (0)