Skip to content

Commit 900de81

Browse files
committed
Moved @tryghost/announcement-bar-settings to services folder
fix https://linear.app/ghost/issue/ENG-2114/announcement-bar-settings - 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 bbc9807 commit 900de81

File tree

12 files changed

+3
-68
lines changed

12 files changed

+3
-68
lines changed

Diff for: compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ services:
3535
- node_modules_ghost_adapter-cache-redis:/home/ghost/ghost/adapter-cache-redis/node_modules:delegated
3636
- node_modules_ghost_adapter-manager:/home/ghost/ghost/adapter-manager/node_modules:delegated
3737
- node_modules_ghost_admin:/home/ghost/ghost/admin/node_modules:delegated
38-
- node_modules_ghost_announcement-bar-settings:/home/ghost/ghost/announcement-bar-settings/node_modules:delegated
3938
- node_modules_ghost_api-framework:/home/ghost/ghost/api-framework/node_modules:delegated
4039
- node_modules_ghost_constants:/home/ghost/ghost/constants/node_modules:delegated
4140
- node_modules_ghost_core:/home/ghost/ghost/core/node_modules:delegated
@@ -177,7 +176,6 @@ volumes:
177176
node_modules_ghost_adapter-cache-redis: {}
178177
node_modules_ghost_adapter-manager: {}
179178
node_modules_ghost_admin: {}
180-
node_modules_ghost_announcement-bar-settings: {}
181179
node_modules_ghost_api-framework: {}
182180
node_modules_ghost_constants: {}
183181
node_modules_ghost_core: {}

Diff for: ghost/announcement-bar-settings/.eslintrc.js

-6
This file was deleted.

Diff for: ghost/announcement-bar-settings/README.md

-23
This file was deleted.

Diff for: ghost/announcement-bar-settings/index.js

-1
This file was deleted.

Diff for: ghost/announcement-bar-settings/package.json

-26
This file was deleted.

Diff for: ghost/announcement-bar-settings/test/.eslintrc.js

-6
This file was deleted.

Diff for: ghost/core/core/server/api/endpoints/utils/validators/input/settings.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const _ = require('lodash');
22
const {ValidationError} = require('@tryghost/errors');
33
const validator = require('@tryghost/validator');
44
const tpl = require('@tryghost/tpl');
5-
const AnnouncementBarSettings = require('@tryghost/announcement-bar-settings');
5+
const AnnouncementBarSettings = require('../../../../../services/announcement-bar-service/AnnouncementBarSettings');
66

77
const messages = {
88
invalidEmailReceived: 'Please send a valid email',

Diff for: ghost/core/core/server/services/announcement-bar-service/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const settingsCache = require('../../../shared/settings-cache');
2-
const AnnouncementBarSettings = require('@tryghost/announcement-bar-settings');
2+
const AnnouncementBarSettings = require('./AnnouncementBarSettings');
33

44
const announcementBarService = new AnnouncementBarSettings({
55
getAnnouncementSettings: () => ({

Diff for: ghost/core/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
"@tryghost/adapter-cache-redis": "0.0.0",
6868
"@tryghost/adapter-manager": "0.0.0",
6969
"@tryghost/admin-api-schema": "4.5.5",
70-
"@tryghost/announcement-bar-settings": "0.0.0",
7170
"@tryghost/api-framework": "0.0.0",
7271
"@tryghost/bookshelf-plugins": "0.6.25",
7372
"@tryghost/color-utils": "0.2.2",

Diff for: ghost/announcement-bar-settings/test/AnnouncementBarSettings.test.js renamed to ghost/core/test/unit/server/services/announcement-bar/AnnouncementBarSettings.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const assert = require('assert/strict');
2-
const AnnouncementBarSettings = require('../index');
2+
const AnnouncementBarSettings = require('../../../../../core/server/services/announcement-bar-service/AnnouncementBarSettings');
33

44
describe('AnnouncementBarSettings', function () {
55
it('can initialize', function () {

0 commit comments

Comments
 (0)