ghost 5.47.0 → 5.47.1

package/core/built/admin/index.html

@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-ecce94abc3cc85a5281d047aa07403e6.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-a2e163a59a7ec0c8ceb97289113a9994.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-39356907c39237f12c305e1d3ca46c85.js"></script>
-<script src="assets/chunk.604.078e94b787281bfcb588.js"></script>
-<script src="assets/chunk.143.75a36ae8bf1b94136477.js"></script>
-    <script src="assets/ghost-96fca705b542a53a85d10e656a39065d.js"></script>
+<script src="assets/chunk.11.a4f9c30c0891933434bf.js"></script>
+<script src="assets/chunk.143.70ebfe98c846ee93f854.js"></script>
+    <script src="assets/ghost-48e9d3e33a5bb943cd479b941dbfe62e.js"></script>
 </body>
 </html>

package/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;

package/core/frontend/services/card-assets/{service.js → CardAssetService.js}

@@ -32,8 +32,8 @@ class CardAssetService {
         // Include rules take precedence over exclude rules.
         if (_.has(this.config, 'include')) {
             return {
-                'cards.min.css': `css/(${this.config.include.join('|')}).css`,
-                'cards.min.js': `js/(${this.config.include.join('|')}).js`
+                'cards.min.css': `css/@(${this.config.include.join('|')}).css`,
+                'cards.min.js': `js/@(${this.config.include.join('|')}).js`
             };
         }
 

package/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;

package/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;

package/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;

package/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 = {

package/core/frontend/services/sitemap/{page-generator.js → PageMapGenerator.js}

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

package/core/frontend/services/sitemap/{post-generator.js → PostMapGenerator.js}

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

package/core/frontend/services/sitemap/{manager.js → 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');

package/core/frontend/services/sitemap/{tag-generator.js → TagsMapGenerator.js}

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

package/core/frontend/services/sitemap/{user-generator.js → 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) {

package/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

package/core/frontend/services/theme-engine/i18n/{theme-i18n.js → 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 {
     /**

package/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;

package/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) {

package/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');

package/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;

package/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');
 
 /**

package/core/server/adapters/scheduling/{SchedulingDefault.js → 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');

package/core/server/adapters/sso/{Default.js → DefaultSSOAdapter.js}

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

package/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;

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

@@ -3,6 +3,7 @@ const api = require('./index');
 const config = require('../../../shared/config');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
 const web = require('../../web');
 const models = require('../../models');
 const auth = require('../../services/auth');
@@ -10,7 +11,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');
 
@@ -70,8 +71,11 @@ module.exports = {
                     return auth.setup.doSettings(data, api.settings);
                 })
                 .then((user) => {
-                    return auth.setup.sendWelcomeEmail(user.get('email'), api.mail)
-                        .then(() => user);
+                    auth.setup.sendWelcomeEmail(user.get('email'), api.mail)
+                        .catch((err) => {
+                            logging.error(err);
+                        });
+                    return user;
                 });
         }
     },

package/core/server/api/endpoints/invites.js

@@ -109,8 +109,8 @@ module.exports = {
                 invites: frame.data.invites,
                 options: frame.options,
                 user: {
-                    name: frame.user.get('name'),
-                    email: frame.user.get('email')
+                    name: frame.user?.get('name'),
+                    email: frame.user?.get('email')
                 }
             });
         }

package/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'];

package/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');

package/core/server/data/importer/importers/data/{custom-theme-settings.js → 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');

package/core/server/data/importer/importers/data/{newsletters.js → 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'];

package/core/server/data/importer/importers/data/{posts.js → 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;

package/core/server/data/importer/importers/data/{products.js → 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');
 

package/core/server/data/importer/importers/data/{revue-subscriber.js → 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');

package/core/server/data/importer/importers/data/{roles.js → 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) {

package/core/server/data/importer/importers/data/{settings.js → 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');

package/core/server/data/importer/importers/data/{stripe-prices.js → 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 {

package/core/server/data/importer/importers/data/{stripe-products.js → 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 {

package/core/server/data/importer/importers/data/{tags.js → 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');
 

package/core/server/data/importer/importers/data/{users.js → 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');
 

package/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 = {};

package/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() {

package/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() {

package/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');
 

package/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;

package/core/server/lib/image/{image-utils.js → 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}) {

package/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');
 

package/core/server/models/invite.js

@@ -87,12 +87,16 @@ Invite = ghostBookshelf.Model.extend({
                 }
 
                 let allowed = [];
-
-                if (_.some(loadedPermissions.user.roles, {name: 'Owner'}) ||
-                    _.some(loadedPermissions.user.roles, {name: 'Administrator'})) {
-                    allowed = ['Administrator', 'Editor', 'Author', 'Contributor'];
-                } else if (_.some(loadedPermissions.user.roles, {name: 'Editor'})) {
-                    allowed = ['Author', 'Contributor'];
+                if (loadedPermissions.user) {
+                    if (_.some(loadedPermissions.user.roles, {name: 'Owner'}) ||
+                        _.some(loadedPermissions.user.roles, {name: 'Administrator'})) {
+                        allowed = ['Administrator', 'Editor', 'Author', 'Contributor'];
+                    } else if (_.some(loadedPermissions.user.roles, {name: 'Editor'})) {
+                        allowed = ['Author', 'Contributor'];
+                    }
+                }
+                if (loadedPermissions.apiKey) {
+                    allowed = ['Editor', 'Author', 'Contributor'];
                 }
 
                 if (allowed.indexOf(roleToInvite.get('name')) === -1) {

package/core/server/models/post.js

@@ -36,7 +36,7 @@ const messages = {
 };
 
 const MOBILEDOC_REVISIONS_COUNT = 10;
-const POST_REVISIONS_COUNT = 10;
+const POST_REVISIONS_COUNT = 25;
 const POST_REVISIONS_INTERVAL_MS = 10 * 60 * 1000; // 10 minutes
 const ALL_STATUSES = ['published', 'draft', 'scheduled', 'sent'];
 

package/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 = {

package/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;

package/core/server/services/comments/{controller.js → 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;

package/core/server/services/comments/{service.js → 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,

package/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');

package/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');
 

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

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

package/core/server/services/email-service/{wrapper.js → 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');

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

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

package/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')();