Skip to content

Commit 733891e

Browse files
committed
Moved @tryghost/member-attribution to core folder
fix https://linear.app/ghost/issue/ENG-2382/member-attribution - 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 8c48bb0 commit 733891e

21 files changed

+21
-87
lines changed

.docker/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ COPY ghost/html-to-plaintext/package.json ghost/html-to-plaintext/package.json
8080
COPY ghost/i18n/package.json ghost/i18n/package.json
8181
COPY ghost/job-manager/package.json ghost/job-manager/package.json
8282
COPY ghost/link-replacer/package.json ghost/link-replacer/package.json
83-
COPY ghost/member-attribution/package.json ghost/member-attribution/package.json
8483
COPY ghost/members-csv/package.json ghost/members-csv/package.json
8584
COPY ghost/mw-error-handler/package.json ghost/mw-error-handler/package.json
8685
COPY ghost/mw-vhost/package.json ghost/mw-vhost/package.json

compose.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ services:
4545
- node_modules_ghost_i18n:/home/ghost/ghost/i18n/node_modules:delegated
4646
- node_modules_ghost_job-manager:/home/ghost/ghost/job-manager/node_modules:delegated
4747
- node_modules_ghost_link-replacer:/home/ghost/ghost/link-replacer/node_modules:delegated
48-
- node_modules_ghost_member-attribution:/home/ghost/ghost/member-attribution/node_modules:delegated
4948
- node_modules_ghost_members-csv:/home/ghost/ghost/members-csv/node_modules:delegated
5049
- node_modules_ghost_mw-error-handler:/home/ghost/ghost/mw-error-handler/node_modules:delegated
5150
- node_modules_ghost_mw-vhost:/home/ghost/ghost/mw-vhost/node_modules:delegated
@@ -92,7 +91,7 @@ services:
9291
dockerfile: ./.docker/Dockerfile
9392
target: tinybird
9493
working_dir: /home/ghost/ghost/web-analytics
95-
profiles: [ tinybird]
94+
profiles: [ tinybird ]
9695
tty: true
9796

9897
browser-tests:
@@ -193,7 +192,6 @@ volumes:
193192
node_modules_ghost_i18n: {}
194193
node_modules_ghost_job-manager: {}
195194
node_modules_ghost_link-replacer: {}
196-
node_modules_ghost_member-attribution: {}
197195
node_modules_ghost_members-csv: {}
198196
node_modules_ghost_mw-error-handler: {}
199197
node_modules_ghost_mw-vhost: {}

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ class MemberAttributionServiceWrapper {
1111
}
1212

1313
// Wire up all the dependencies
14-
const {
15-
MemberAttributionService, UrlTranslator, ReferrerTranslator, AttributionBuilder, OutboundLinkTagger
16-
} = require('@tryghost/member-attribution');
14+
const MemberAttributionService = require('./MemberAttributionService');
15+
const UrlTranslator = require('./UrlTranslator');
16+
const ReferrerTranslator = require('./ReferrerTranslator');
17+
const AttributionBuilder = require('./AttributionBuilder');
18+
const OutboundLinkTagger = require('./OutboundLinkTagger');
1719
const models = require('../../models');
1820

1921
const urlTranslator = new UrlTranslator({

ghost/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
"@tryghost/limit-service": "1.2.15",
101101
"@tryghost/link-replacer": "0.0.0",
102102
"@tryghost/logging": "2.4.21",
103-
"@tryghost/member-attribution": "0.0.0",
104103
"@tryghost/members-csv": "0.0.0",
105104
"@tryghost/members-offers": "0.0.0",
106105
"@tryghost/metrics": "1.0.37",
@@ -113,6 +112,7 @@
113112
"@tryghost/pretty-cli": "1.2.46",
114113
"@tryghost/prometheus-metrics": "0.0.0",
115114
"@tryghost/promise": "0.3.14",
115+
"@tryghost/referrer-parser": "0.1.1",
116116
"@tryghost/request": "1.0.10",
117117
"@tryghost/root-utils": "0.3.32",
118118
"@tryghost/security": "0.0.0",

ghost/member-attribution/test/attribution.test.js renamed to ghost/core/test/unit/server/services/member-attribution/attribution.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
require('should');
1+
const should = require('should');
22

3-
const UrlHistory = require('../lib/UrlHistory');
4-
const AttributionBuilder = require('../lib/AttributionBuilder');
3+
const UrlHistory = require('../../../../../core/server/services/member-attribution/UrlHistory');
4+
const AttributionBuilder = require('../../../../../core/server/services/member-attribution/AttributionBuilder');
55

66
describe('AttributionBuilder', function () {
77
let attributionBuilder;

ghost/member-attribution/test/history.test.js renamed to ghost/core/test/unit/server/services/member-attribution/history.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
require('should');
1+
const should = require('should');
22

3-
const UrlHistory = require('../lib/UrlHistory');
3+
const UrlHistory = require('../../../../../core/server/services/member-attribution/UrlHistory');
44

55
describe('UrlHistory', function () {
66
it('sets history to empty array if invalid', function () {

ghost/member-attribution/test/outbound-link-tagger.test.js renamed to ghost/core/test/unit/server/services/member-attribution/outbound-link-tagger.test.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
const {OutboundLinkTagger} = require('../');
21
const assert = require('assert/strict');
2+
const should = require('should');
3+
4+
const OutboundLinkTagger = require('../../../../../core/server/services/member-attribution/OutboundLinkTagger');
35

46
describe('OutboundLinkTagger', function () {
57
describe('Constructor', function () {

ghost/member-attribution/test/referrer-translator.test.js renamed to ghost/core/test/unit/server/services/member-attribution/referrer-translator.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
require('should');
1+
const should = require('should');
22

3-
const ReferrerTranslator = require('../lib/ReferrerTranslator');
3+
const ReferrerTranslator = require('../../../../../core/server/services/member-attribution/ReferrerTranslator');
44

55
describe('ReferrerTranslator', function () {
66
describe('Constructor', function () {

ghost/member-attribution/test/service.test.js renamed to ghost/core/test/unit/server/services/member-attribution/service.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
require('should');
1+
const should = require('should');
22

3-
const MemberAttributionService = require('../lib/MemberAttributionService');
3+
const MemberAttributionService = require('../../../../../core/server/services/member-attribution/MemberAttributionService');
44

55
describe('MemberAttributionService', function () {
66
describe('Constructor', function () {

ghost/member-attribution/test/url-translator.test.js renamed to ghost/core/test/unit/server/services/member-attribution/url-translator.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
require('should');
1+
const should = require('should');
22

3-
const UrlTranslator = require('../lib/UrlTranslator');
3+
const UrlTranslator = require('../../../../../core/server/services/member-attribution/UrlTranslator');
44

55
const models = {
66
Post: {

ghost/member-attribution/.eslintrc.js

-6
This file was deleted.

ghost/member-attribution/README.md

-21
This file was deleted.

ghost/member-attribution/index.js

-7
This file was deleted.

ghost/member-attribution/package.json

-27
This file was deleted.

ghost/member-attribution/test/.eslintrc.js

-6
This file was deleted.

0 commit comments

Comments
 (0)