Added eslint rule for file naming convention

As discussed with the product team we want to enforce kebab-case file names for
all files, with the exception of files which export a single class, in which
case they should be PascalCase and reflect the class which they export.

This will help find classes faster, and should push better naming for them too.

Some files and packages have been excluded from this linting, specifically when
a library or framework depends on the naming of a file for the functionality
e.g. Ember, knex-migrator, adapter-manager

ghost/adapter-cache-memory-ttl/index.js

@@ -1 +1 @@
-module.exports = require('./lib/adapter-cache-memory-ttl');
+module.exports = require('./lib/AdapterCacheMemoryTTL');

ghost/adapter-cache-memory-ttl/lib/AdapterCacheMemoryTTL.js

@@ -8,7 +8,7 @@ const Base = require('@tryghost/adapter-base-cache');
  * - it supports time-to-live (TTL)
  * - it supports a max number of items
  */
-class MemoryTTL extends Base {
+class AdapterCacheMemoryTTL extends Base {
     #cache;
 
     /**
@@ -51,4 +51,4 @@ class MemoryTTL extends Base {
     }
 }
 
-module.exports = MemoryTTL;
+module.exports = AdapterCacheMemoryTTL;

ghost/adapter-cache-redis/index.js

@@ -1 +1 @@
-module.exports = require('./lib/adapter-cache-redis');
+module.exports = require('./lib/AdapterCacheRedis');

ghost/adapter-cache-redis/lib/AdapterCacheRedis.js

@@ -4,7 +4,7 @@ const cacheManager = require('cache-manager');
 const redisStore = require('cache-manager-ioredis');
 const calculateSlot = require('cluster-key-slot');
 
-class Redis extends BaseCacheAdapter {
+class AdapterCacheRedis extends BaseCacheAdapter {
     /**
      *
      * @param {Object} config
@@ -155,4 +155,4 @@ class Redis extends BaseCacheAdapter {
     }
 }
 
-module.exports = Redis;
+module.exports = AdapterCacheRedis;

ghost/admin/.eslintrc.js

@@ -27,6 +27,8 @@ module.exports = {
         'plugin:ghost/ember'
     ],
     rules: {
+        'ghost/filenames/match-exported-class': ['off'],
+        'ghost/filenames/match-regex': ['off'],
         'no-shadow': ['error'],
 
         // TODO: migrate away from accessing controller in routes

ghost/announcement-bar/package.json

@@ -79,7 +79,7 @@
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
     "copy-webpack-plugin": "11.0.0",
-    "eslint-plugin-ghost": "2.16.0",
+    "eslint-plugin-ghost": "3.0.0",
     "minimist": "1.2.8",
     "nock": "13.3.0",
     "ora": "5.4.1",

ghost/api-framework/lib/api-framework.js

@@ -8,7 +8,7 @@ module.exports = {
     },
 
     get Frame() {
-        return require('./frame');
+        return require('./Frame');
     },
 
     get pipeline() {

ghost/api-framework/lib/http.js

@@ -1,7 +1,7 @@
 const url = require('url');
 const debug = require('@tryghost/debug')('http');
 
-const Frame = require('./frame');
+const Frame = require('./Frame');
 const headers = require('./headers');
 
 /**

ghost/api-framework/lib/pipeline.js

@@ -3,7 +3,7 @@ const _ = require('lodash');
 const errors = require('@tryghost/errors');
 const {sequence} = require('@tryghost/promise');
 
-const Frame = require('./frame');
+const Frame = require('./Frame');
 const serializers = require('./serializers');
 const validators = require('./validators');
 

ghost/api-version-compatibility-service/index.js

@@ -1 +1 @@
-module.exports = require('./lib/api-version-compatibility-service');
+module.exports = require('./lib/APIVersionCompatibilityService');

ghost/core/.c8rc.json

@@ -6,10 +6,10 @@
     "text-summary",
     "cobertura"
   ],
-  "statements": 59,
+  "statements": 58.8,
   "branches": 84,
   "functions": 50,
-  "lines": 59,
+  "lines": 58.8,
   "include": [
     "core/{*.js,frontend,server,shared}"
   ],

ghost/core/.eslintrc.js

@@ -13,7 +13,9 @@ module.exports = {
         // @TODO: remove this rule once it's turned into "error" in the base plugin
         'no-shadow': 'error',
         'no-var': 'error',
-        'one-var': ['error', 'never']
+        'one-var': ['error', 'never'],
+        'ghost/ghost-custom/ghost-error-usage': [1],
+        'ghost/ghost-custom/no-native-error': [1]
     },
     overrides: [
         {
@@ -76,6 +78,12 @@ module.exports = {
                 ]]
             }
         },
+        {
+            files: ['core/frontend/helpers/**', 'core/frontend/apps/*/lib/helpers/**'],
+            rules: {
+                'ghost/filenames/match-regex': ['off', '^[a-z0-9-.]$', null, true]
+            }
+        },
         /**
          * @TODO: enable these soon
          */

ghost/core/MigratorConfig.js

@@ -1,3 +1,4 @@
+/* eslint-disable ghost/filenames/match-regex */
 const config = require('./core/shared/config');
 const ghostVersion = require('@tryghost/version');
 

ghost/core/core/boot.js

@@ -64,7 +64,7 @@ function notifyServerReady(error) {
   * @param {object} options.config
   */
 async function initDatabase({config}) {
-    const DatabaseStateManager = require('./server/data/db/state-manager');
+    const DatabaseStateManager = require('./server/data/db/DatabaseStateManager');
     const dbStateManager = new DatabaseStateManager({knexMigratorFilePath: config.get('paths:appRoot')});
     await dbStateManager.makeReady();
 
@@ -476,7 +476,7 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
         const rootApp = require('./app')();
 
         if (server) {
-            const GhostServer = require('./server/ghost-server');
+            const GhostServer = require('./server/GhostServer');
             ghostServer = new GhostServer({url: config.getSiteUrl(), env: config.get('env'), serverConfig: config.get('server')});
             await ghostServer.start(rootApp);
             bootLogger.log('server started');

ghost/core/core/frontend/services/admin-auth-assets/index.js

@@ -1,4 +1,4 @@
-const AdminAuthAssetsService = require('./service');
+const AdminAuthAssetsService = require('./AdminAuthAssetsService');
 let adminAuthAssets = new AdminAuthAssetsService();
 
 module.exports = adminAuthAssets;

ghost/core/core/frontend/services/card-assets/index.js

@@ -1,4 +1,4 @@
-const CardAssetService = require('./service');
+const CardAssetService = require('./CardAssetService');
 let cardAssetService = new CardAssetService();
 
 module.exports = cardAssetService;

ghost/core/core/frontend/services/comment-counts-assets/index.js

@@ -1,4 +1,4 @@
-const CommentCountsAssetsService = require('./service');
+const CommentCountsAssetsService = require('./CommentCountsAssetsService');
 let commentCountsAssets = new CommentCountsAssetsService();
 
 module.exports = commentCountsAssets;

ghost/core/core/frontend/services/member-attribution-assets/index.js

@@ -1,4 +1,4 @@
-const MemberAttributionAssetsService = require('./service');
+const MemberAttributionAssetsService = require('./MemberAttributionAssetsService');
 const memberAttributionAssets = new MemberAttributionAssetsService();
 
 module.exports = memberAttributionAssets;

ghost/core/core/frontend/services/routing/index.js

@@ -1,5 +1,5 @@
 const registry = require('./registry');
-const RouterManager = require('./router-manager');
+const RouterManager = require('./RouterManager');
 const routerManager = new RouterManager({registry});
 
 module.exports = {

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

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const BaseMapGenerator = require('./base-generator');
+const BaseMapGenerator = require('./BaseSiteMapGenerator');
 
 class PageMapGenerator extends BaseMapGenerator {
     constructor(opts) {

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

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const BaseMapGenerator = require('./base-generator');
+const BaseMapGenerator = require('./BaseSiteMapGenerator');
 
 class PostMapGenerator extends BaseMapGenerator {
     constructor(opts) {

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

@@ -1,10 +1,10 @@
 const DomainEvents = require('@tryghost/domain-events');
 const {URLResourceUpdatedEvent} = require('@tryghost/dynamic-routing-events');
-const IndexMapGenerator = require('./index-generator');
-const PagesMapGenerator = require('./page-generator');
-const PostsMapGenerator = require('./post-generator');
-const UsersMapGenerator = require('./user-generator');
-const TagsMapGenerator = require('./tag-generator');
+const IndexMapGenerator = require('./SiteMapIndexGenerator');
+const PagesMapGenerator = require('./PageMapGenerator');
+const PostsMapGenerator = require('./PostMapGenerator');
+const UsersMapGenerator = require('./UserMapGenerator');
+const TagsMapGenerator = require('./TagsMapGenerator');
 
 // This uses events from the routing service and the URL service
 const events = require('../../../server/lib/common/events');

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

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const BaseMapGenerator = require('./base-generator');
+const BaseMapGenerator = require('./BaseSiteMapGenerator');
 
 class TagsMapGenerator extends BaseMapGenerator {
     constructor(opts) {

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

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const validator = require('@tryghost/validator');
-const BaseMapGenerator = require('./base-generator');
+const BaseMapGenerator = require('./BaseSiteMapGenerator');
 
 class UserMapGenerator extends BaseMapGenerator {
     constructor(opts) {

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

@@ -1,5 +1,5 @@
 const config = require('../../../shared/config');
-const Manager = require('./manager');
+const Manager = require('./SiteMapManager');
 const manager = new Manager();
 
 // Responsible for handling requests for sitemap files

ghost/core/core/frontend/services/theme-engine/i18n/ThemeI18n.js

@@ -1,6 +1,6 @@
 const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
-const I18n = require('./i18n');
+const I18n = require('./I18n');
 
 class ThemeI18n extends I18n {
     /**

ghost/core/core/frontend/services/theme-engine/i18n/index.js

@@ -1,6 +1,6 @@
 const config = require('../../../../shared/config');
 
-const ThemeI18n = require('./theme-i18n');
+const ThemeI18n = require('./ThemeI18n');
 
 module.exports = new ThemeI18n({basePath: config.getContentPath('themes')});
 module.exports.ThemeI18n = ThemeI18n;

ghost/core/core/frontend/web/routes.js

@@ -3,7 +3,7 @@ const routing = require('../services/routing');
 
 /**
  *
- * @param {import('../services/routing/router-manager').RouterConfig} routerConfig
+ * @param {import('../services/routing/RouterManager').RouterConfig} routerConfig
  * @returns {import('express').Router}
  */
 module.exports = function siteRoutes(routerConfig) {

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

@@ -33,7 +33,7 @@ function SiteRouter(req, res, next) {
 
 /**
  *
- * @param {import('../services/routing/router-manager').RouterConfig} routerConfig
+ * @param {import('../services/routing/RouterManager').RouterConfig} routerConfig
  * @returns {import('express').Application}
  */
 module.exports = function setupSiteApp(routerConfig) {
@@ -172,7 +172,7 @@ module.exports = function setupSiteApp(routerConfig) {
 
 /**
  * see https://github.com/expressjs/express/issues/2596
- * @param {import('../services/routing/router-manager').RouterConfig} routerConfig
+ * @param {import('../services/routing/RouterManager').RouterConfig} routerConfig
  */
 module.exports.reload = (routerConfig) => {
     debug('reloading');

ghost/core/core/server/adapters/cache/Redis.js

@@ -1,3 +1,4 @@
+/* eslint-disable ghost/filenames/match-regex */
 const RedisCache = require('@tryghost/adapter-cache-redis');
 
 module.exports = RedisCache;

ghost/core/core/server/adapters/scheduling/post-scheduling/index.js

@@ -1,7 +1,7 @@
 const Promise = require('bluebird');
 const events = require('../../../lib/common/events');
 const localUtils = require('../utils');
-const PostScheduler = require('./post-scheduler');
+const PostScheduler = require('./PostScheduler');
 const getSchedulerIntegration = require('./scheduler-intergation');
 
 /**

ghost/core/core/server/adapters/scheduling/scheduling-default.js

@@ -1,7 +1,7 @@
 const util = require('util');
 const moment = require('moment');
 const debug = require('@tryghost/debug')('scheduling-default');
-const SchedulingBase = require('./SchedulingBase');
+const SchedulingBase = require('./scheduling-base');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 const request = require('@tryghost/request');

ghost/core/core/server/adapters/sso/DefaultSSOAdapter.js

@@ -1,4 +1,4 @@
-const Base = require('./Base');
+const Base = require('./SSOBase');
 
 module.exports = class DefaultSSOAdapter extends Base {
     constructor() {

ghost/core/core/server/adapters/storage/LocalMediaStorage.js

@@ -10,7 +10,7 @@ const messages = {
     cannotRead: 'Could not read media file: {file}'
 };
 
-class LocalMediaStore extends LocalStorageBase {
+class LocalMediaStorage extends LocalStorageBase {
     constructor() {
         super({
             storagePath: config.getContentPath('media'),
@@ -21,4 +21,4 @@ class LocalMediaStore extends LocalStorageBase {
     }
 }
 
-module.exports = LocalMediaStore;
+module.exports = LocalMediaStorage;

ghost/core/core/server/api/endpoints/authentication.js

@@ -10,7 +10,7 @@ const invitations = require('../../services/invitations');
 const dbBackup = require('../../data/db/backup');
 const apiMail = require('./index').mail;
 const apiSettings = require('./index').settings;
-const UsersService = require('../../services/users');
+const UsersService = require('../../services/Users');
 const userService = new UsersService({dbBackup, models, auth, apiMail, apiSettings});
 const {deleteAllSessions} = require('../../services/auth/session');
 

ghost/core/core/server/api/endpoints/users.js

@@ -7,7 +7,7 @@ const dbBackup = require('../../data/db/backup');
 const auth = require('../../services/auth');
 const apiMail = require('./index').mail;
 const apiSettings = require('./index').settings;
-const UsersService = require('../../services/users');
+const UsersService = require('../../services/Users');
 const userService = new UsersService({dbBackup, models, auth, apiMail, apiSettings});
 const ALLOWED_INCLUDES = ['count.posts', 'permissions', 'roles', 'roles.permissions'];
 const UNSAFE_ATTRS = ['status', 'roles'];

ghost/core/core/server/api/endpoints/utils/validators/input/password_reset.js

@@ -1,3 +1,4 @@
+/* eslint-disable ghost/filenames/match-regex */
 const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const debug = require('@tryghost/debug')('api:endpoints:utils:validators:input:passwordreset');

ghost/core/core/server/data/importer/importers/data/CustomThemeSettingsImporter.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('importer:roles');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const models = require('../../../../models');
 const {activate} = require('../../../../services/themes/activate');
 const {sequence} = require('@tryghost/promise');

ghost/core/core/server/data/importer/importers/data/NewslettersImporter.js

@@ -1,6 +1,6 @@
 const debug = require('@tryghost/debug')('importer:newsletters');
 const _ = require('lodash');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const models = require('../../../../models');
 
 const ignoredColumns = ['sender_email'];

ghost/core/core/server/data/importer/importers/data/PostsImporter.js

@@ -1,7 +1,7 @@
 const debug = require('@tryghost/debug')('importer:posts');
 const _ = require('lodash');
 const uuid = require('uuid');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const mobiledocLib = require('../../../../lib/mobiledoc');
 const validator = require('@tryghost/validator');
 const postsMetaSchema = require('../../../schema').tables.posts_meta;

ghost/core/core/server/data/importer/importers/data/ProductsImporter.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const models = require('../../../../models');
 const debug = require('@tryghost/debug')('importer:products');
 

ghost/core/core/server/data/importer/importers/data/RevueSubscriberImporter.js

@@ -1,5 +1,5 @@
 const debug = require('@tryghost/debug')('importer:revue-subscriber');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 
 const papaparse = require('papaparse');
 const path = require('path');

ghost/core/core/server/data/importer/importers/data/RolesImporter.js

@@ -1,5 +1,5 @@
 const debug = require('@tryghost/debug')('importer:roles');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 
 class RolesImporter extends BaseImporter {
     constructor(allDataFromFile) {

ghost/core/core/server/data/importer/importers/data/SettingsImporter.js

@@ -1,7 +1,7 @@
 const debug = require('@tryghost/debug')('importer:settings');
 const ObjectId = require('bson-objectid').default;
 const _ = require('lodash');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const models = require('../../../../models');
 const defaultSettings = require('../../../schema').defaultSettings;
 const keyGroupMapper = require('../../../../api/endpoints/utils/serializers/input/utils/settings-key-group-mapper');

ghost/core/core/server/data/importer/importers/data/StripePricesImporter.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('importer:stripeprices');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const models = require('../../../../models');
 
 class StripePricesImporter extends BaseImporter {

ghost/core/core/server/data/importer/importers/data/StripeProductsImporter.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('importer:stripeproducts');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const models = require('../../../../models');
 
 class StripeProductsImporter extends BaseImporter {

ghost/core/core/server/data/importer/importers/data/TagsImporter.js

@@ -1,6 +1,6 @@
 const debug = require('@tryghost/debug')('importer:tags');
 const _ = require('lodash');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const models = require('../../../../models');
 const {sequence} = require('@tryghost/promise');
 

ghost/core/core/server/data/importer/importers/data/UsersImporter.js

@@ -1,6 +1,6 @@
 const debug = require('@tryghost/debug')('importer:users');
 const _ = require('lodash');
-const BaseImporter = require('./base');
+const BaseImporter = require('./Base');
 const models = require('../../../../models');
 const limitService = require('../../../../services/limits');
 

ghost/core/core/server/data/importer/importers/data/data-importer.js

@@ -5,17 +5,17 @@ const {IncorrectUsageError} = require('@tryghost/errors');
 const debug = require('@tryghost/debug')('importer:data');
 const {sequence} = require('@tryghost/promise');
 const models = require('../../../../models');
-const PostsImporter = require('./posts');
-const TagsImporter = require('./tags');
-const SettingsImporter = require('./settings');
-const UsersImporter = require('./users');
-const NewslettersImporter = require('./newsletters');
-const ProductsImporter = require('./products');
-const StripeProductsImporter = require('./stripe-products');
-const StripePricesImporter = require('./stripe-prices');
-const CustomThemeSettingsImporter = require('./custom-theme-settings');
-const RevueSubscriberImporter = require('./revue-subscriber');
-const RolesImporter = require('./roles');
+const PostsImporter = require('./PostsImporter');
+const TagsImporter = require('./TagsImporter');
+const SettingsImporter = require('./SettingsImporter');
+const UsersImporter = require('./UsersImporter');
+const NewslettersImporter = require('./NewslettersImporter');
+const ProductsImporter = require('./ProductsImporter');
+const StripeProductsImporter = require('./StripeProductsImporter');
+const StripePricesImporter = require('./StripePricesImporter');
+const CustomThemeSettingsImporter = require('./CustomThemeSettingsImporter');
+const RevueSubscriberImporter = require('./RevueSubscriberImporter');
+const RolesImporter = require('./RolesImporter');
 const {slugify} = require('@tryghost/string/lib');
 
 let importers = {};

ghost/core/core/server/data/migrations/hooks/migrate/afterEach.js

@@ -1,3 +1,4 @@
+/* eslint-disable ghost/filenames/match-regex */
 const Promise = require('bluebird');
 
 module.exports = function afterEach() {

ghost/core/core/server/data/migrations/hooks/migrate/beforeEach.js

@@ -1,3 +1,4 @@
+/* eslint-disable ghost/filenames/match-regex */
 const Promise = require('bluebird');
 
 module.exports = function beforeEach() {

ghost/core/core/server/data/migrations/versions/4.4/02-migrate-members-signup-access.js

@@ -1,6 +1,6 @@
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
-const MembersConfigProvider = require('../../../../services/members/config');
+const MembersConfigProvider = require('../../../../services/members/MembersConfigProvider');
 const settingsCache = require('../../../../../shared/settings-cache');
 const config = require('../../../../../shared/config');
 

ghost/core/core/server/data/schema/fixtures/index.js

@@ -1,4 +1,4 @@
-const FixtureManager = require('./fixture-manager');
+const FixtureManager = require('./FixtureManager');
 const config = require('../../../../shared/config');
 
 const fixturePath = config.get('paths').fixtures;

ghost/core/core/server/lib/image/ImageUtils.js

@@ -1,7 +1,7 @@
-const BlogIcon = require('./blog-icon');
-const CachedImageSizeFromUrl = require('./cached-image-size-from-url');
-const Gravatar = require('./gravatar');
-const ImageSize = require('./image-size');
+const BlogIcon = require('./BlogIcon');
+const CachedImageSizeFromUrl = require('./CachedImageSizeFromUrl');
+const Gravatar = require('./Gravatar');
+const ImageSize = require('./ImageSize');
 
 class ImageUtils {
     constructor({config, urlUtils, settingsCache, storageUtils, storage, validator, request, cacheStore}) {

ghost/core/core/server/lib/image/index.js

@@ -5,7 +5,7 @@ const storageUtils = require('../../adapters/storage/utils');
 const validator = require('@tryghost/validator');
 const config = require('../../../shared/config');
 const settingsCache = require('../../../shared/settings-cache');
-const ImageUtils = require('./image-utils');
+const ImageUtils = require('./ImageUtils');
 
 const adapterManager = require('../../services/adapter-manager');
 

ghost/core/core/server/services/adapter-manager/index.js

@@ -13,8 +13,8 @@ const adapterManager = new AdapterManager({
 });
 
 adapterManager.registerAdapter('storage', require('ghost-storage-base'));
-adapterManager.registerAdapter('scheduling', require('../../adapters/scheduling/SchedulingBase'));
-adapterManager.registerAdapter('sso', require('../../adapters/sso/Base'));
+adapterManager.registerAdapter('scheduling', require('../../adapters/scheduling/scheduling-base'));
+adapterManager.registerAdapter('sso', require('../../adapters/sso/SSOBase'));
 adapterManager.registerAdapter('cache', require('@tryghost/adapter-base-cache'));
 
 module.exports = {

ghost/core/core/server/services/auth/session/express-session.js

@@ -6,7 +6,7 @@ const settingsCache = require('../../../../shared/settings-cache');
 const models = require('../../../models');
 const urlUtils = require('../../../../shared/url-utils');
 
-const SessionStore = require('./store');
+const SessionStore = require('./SessionStore');
 const sessionStore = new SessionStore(models.Session);
 
 let unoExpressSessionMiddleware;

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

@@ -15,8 +15,8 @@ const messages = {
 
 module.exports = class CommentsController {
     /**
-     * @param {import('./service')} service
-     * @param {import('./stats')} stats
+     * @param {import('./CommentsService')} service
+     * @param {import('./CommentsStatsService')} stats
      */
     constructor(service, stats) {
         this.service = service;

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

@@ -25,7 +25,7 @@ class CommentsService {
         /** @private */
         this.contentGating = contentGating;
 
-        const Emails = require('./emails');
+        const Emails = require('./CommentsServiceEmails');
         /** @private */
         this.emails = new Emails({
             config,

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

@@ -1,8 +1,8 @@
 class CommentsServiceWrapper {
     init() {
-        const CommentsService = require('./service');
-        const CommentsController = require('./controller');
-        const CommentsStats = require('./stats');
+        const CommentsService = require('./CommentsService');
+        const CommentsController = require('./CommentsController');
+        const CommentsStats = require('./CommentsStatsService');
 
         const config = require('../../../shared/config');
         const logging = require('@tryghost/logging');

ghost/core/core/server/services/custom-redirects/index.js

@@ -2,7 +2,7 @@ const config = require('../../../shared/config');
 const urlUtils = require('../../../shared/url-utils');
 
 const DynamicRedirectManager = require('@tryghost/express-dynamic-redirects');
-const CustomRedirectsAPI = require('./api');
+const CustomRedirectsAPI = require('./CustomRedirectsAPI');
 const validation = require('./validation');
 const {getBackupRedirectsFilePath} = require('./utils');
 

ghost/core/core/server/services/email-analytics/index.js

@@ -1,3 +1,3 @@
-const EmailAnalyticsServiceWrapper = require('./wrapper');
+const EmailAnalyticsServiceWrapper = require('./EmailAnalyticsServiceWrapper');
 
 module.exports = new EmailAnalyticsServiceWrapper();

ghost/core/core/server/services/email-service/EmailServiceWrapper.js

@@ -1,5 +1,5 @@
 const logging = require('@tryghost/logging');
-const url = require('../../../server/api/endpoints/utils/serializers/output/utils/url');
+const url = require('../../api/endpoints/utils/serializers/output/utils/url');
 
 class EmailServiceWrapper {
     getPostUrl(post) {
@@ -18,7 +18,7 @@ class EmailServiceWrapper {
         const MailgunClient = require('@tryghost/mailgun-client');
         const configService = require('../../../shared/config');
         const settingsCache = require('../../../shared/settings-cache');
-        const settingsHelpers = require('../../services/settings-helpers');
+        const settingsHelpers = require('../settings-helpers');
         const jobsService = require('../jobs');
         const membersService = require('../members');
         const db = require('../../data/db');

ghost/core/core/server/services/email-service/index.js

@@ -1,3 +1,3 @@
-const EmailServiceWrapper = require('./wrapper');
+const EmailServiceWrapper = require('./EmailServiceWrapper');
 
 module.exports = new EmailServiceWrapper();

ghost/core/core/server/services/explore/index.js

@@ -1,4 +1,4 @@
-const ExploreService = require('./service');
+const ExploreService = require('./ExploreService');
 
 const MembersService = require('../members');
 const PostsService = require('../posts/posts-service')();

ghost/core/core/server/services/frontend-data-service/index.js

@@ -1,5 +1,5 @@
 const models = require('../../models');
-const FrontendDataService = require('./frontend-data-service');
+const FrontendDataService = require('./FrontendDataService');
 
 module.exports.init = () => {
     return new FrontendDataService({IntegrationModel: models.Integration});

ghost/core/core/server/services/invites/index.js

@@ -2,7 +2,7 @@ const settingsCache = require('../../../shared/settings-cache');
 const settingsHelpers = require('../settings-helpers');
 const mailService = require('../../services/mail');
 const urlUtils = require('../../../shared/url-utils');
-const Invites = require('./invites');
+const Invites = require('./Invites');
 
 module.exports = new Invites({
     settingsCache,