ghost 4.28.0 → 4.31.0

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

@@ -1,5 +1,4 @@
 const config = require('../../../shared/config');
-const logging = require('@tryghost/logging');
 const db = require('../../data/db');
 const settings = require('../../../shared/settings-cache');
 const {EmailAnalyticsService} = require('@tryghost/email-analytics-service');
@@ -9,11 +8,10 @@ const queries = require('./lib/queries');
 
 module.exports = new EmailAnalyticsService({
     config,
-    logging,
     settings,
-    eventProcessor: new EventProcessor({db, logging}),
+    eventProcessor: new EventProcessor({db}),
     providers: [
-        new MailgunProvider({config, settings, logging})
+        new MailgunProvider({config, settings})
     ],
     queries
 });

package/core/server/services/email-analytics/jobs/fetch-latest.js

@@ -28,24 +28,6 @@ if (parentPort) {
     const config = require('../../../../shared/config');
     const db = require('../../../data/db');
 
-    const logging = {
-        info(message) {
-            if (parentPort) {
-                parentPort.postMessage(message);
-            }
-        },
-        warn(message) {
-            if (parentPort) {
-                parentPort.postMessage(message);
-            }
-        },
-        error(message) {
-            if (parentPort) {
-                parentPort.postMessage(message);
-            }
-        }
-    };
-
     const settingsRows = await db.knex('settings')
         .whereIn('key', ['mailgun_api_key', 'mailgun_domain', 'mailgun_base_url']);
 
@@ -69,10 +51,9 @@ if (parentPort) {
     const emailAnalyticsService = new EmailAnalyticsService({
         config,
         settings,
-        logging,
-        eventProcessor: new EventProcessor({db, logging}),
+        eventProcessor: new EventProcessor({db}),
         providers: [
-            new MailgunProvider({config, settings, logging})
+            new MailgunProvider({config, settings})
         ],
         queries
     });

package/core/server/services/integrations/integrations-service.js

@@ -1,4 +1,4 @@
-const {NotFoundError, GhostError} = require('@tryghost/errors');
+const {NotFoundError, InternalServerError} = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 
 const messages = {
@@ -29,7 +29,7 @@ class IntegrationsService {
                     withRelated: ['api_keys', 'webhooks']
                 });
             } catch (err) {
-                throw new GhostError({
+                throw new InternalServerError({
                     err: err
                 });
             }

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

@@ -1,12 +1,10 @@
 const settingsCache = require('../../../shared/settings-cache');
 const mailService = require('../../services/mail');
-const logging = require('@tryghost/logging');
 const urlUtils = require('../../../shared/url-utils');
 const Invites = require('./invites');
 
 module.exports = new Invites({
     settingsCache,
-    logging,
     mailService,
     urlUtils
 });

package/core/server/services/invites/invites.js

@@ -1,5 +1,6 @@
 const security = require('@tryghost/security');
 const tpl = require('@tryghost/tpl');
+const logging = require('@tryghost/logging');
 
 const messages = {
     invitedByName: '{invitedByName} has invited you to join {blogName}',
@@ -10,9 +11,8 @@ const messages = {
 };
 
 class Invites {
-    constructor({settingsCache, logging, mailService, urlUtils}) {
+    constructor({settingsCache, mailService, urlUtils}) {
         this.settingsCache = settingsCache;
-        this.logging = logging;
         this.mailService = mailService;
         this.urlUtils = urlUtils;
     }
@@ -80,7 +80,7 @@ class Invites {
                     });
                     const helpText = tpl(messages.errorSendingEmail.help);
                     err.message = `${errorMessage} ${helpText}`;
-                    this.logging.warn(err.message);
+                    logging.warn(err.message);
                 }
 
                 return Promise.reject(err);

package/core/server/services/jobs/job-service.js

@@ -17,6 +17,6 @@ const workerMessageHandler = ({name, message}) => {
     logging.info(`Worker for job ${name} sent a message: ${message}`);
 };
 
-const jobManager = new JobManager({logging, errorHandler, workerMessageHandler});
+const jobManager = new JobManager({errorHandler, workerMessageHandler});
 
 module.exports = jobManager;

package/core/server/services/mega/template.js

@@ -638,6 +638,116 @@ figure blockquote p {
     font-size: 20px;
 }
 
+.kg-header-card {
+    margin: 0 0 1.5em 0;
+    padding: 110px 35px 110px 35px;
+    text-align: center;
+}
+
+.kg-header-card.kg-size-small {
+    padding-top: 75px;
+    padding-bottom: 75px;
+}
+
+.kg-header-card.kg-size-large {
+    padding-top: 140px;
+    padding-bottom: 140px;
+}
+
+.kg-header-card.kg-align-left {
+    text-align: left;
+}
+
+.kg-header-card.kg-style-invert {
+    background: #15171a;
+    color: #ffffff;
+}
+
+.kg-header-card.kg-style-clear {
+    border-top: 1px solid #e5eff6;
+    border-bottom: 1px solid #e5eff6;
+}
+
+.kg-header-card.kg-style-accent {
+    background: ${templateSettings.accentColor || '#15171a'};
+    color: #ffffff;
+}
+
+.kg-header-card.kg-style-image {
+    background-color: #e7e7eb;
+    background-size: cover;
+    background-position: center center;
+    color: #ffffff;
+}
+
+.kg-header-card h2 {
+    font-size: 3em;
+    font-weight: 700;
+    line-height: 1.1em;
+    margin: 0 0 0.125em;
+}
+
+.kg-header-card h2 strong {
+    font-weight: 800;
+}
+
+.kg-header-card.kg-size-small h2 {
+    font-size: 2.5em;
+}
+
+.kg-header-card.kg-size-large h2 {
+    font-size: 3.5em;
+}
+
+.kg-header-card h3 {
+    font-size: 1.125em;
+    font-weight: 500;
+    line-height: 1.3em;
+    margin: 0;
+}
+
+.kg-header-card h3 strong {
+    font-weight: 600;
+}
+
+.kg-header-card.kg-size-large h3 {
+    font-size: 1.25em;
+}
+
+.kg-header-card.kg-size-small h3 {
+    font-size: 1em;
+}
+
+.kg-header-card-button {
+    margin-top: 1.75em;
+    background: ${templateSettings.accentColor || '#15212A'};
+    border: solid 1px ${templateSettings.accentColor || '#15212A'};
+    border-radius: 5px;
+    box-sizing: border-box;
+    cursor: pointer;
+    display: inline-block;
+    font-size: 14px;
+    font-weight: bold;
+    margin: 0;
+    padding: 8px 16px;
+    text-decoration: none !important;
+    color: #FFFFFF !important;
+}
+
+.kg-size-large .kg-header-card-button {
+    margin-top: 2em;
+}
+
+.kg-size-small .kg-header-card-button {
+    margin-top: 1.5em;
+}
+
+.kg-style-accent .kg-header-card-button {
+    background: #ffffff;
+    color: ${templateSettings.accentColor || '#15212A'} !important;
+}
+
+
 /* -------------------------------------
     HEADER, FOOTER, MAIN
 ------------------------------------- */

package/core/server/services/members/api.js

@@ -207,7 +207,6 @@ function createApiInstance(config) {
             Settings: models.Settings
         },
         stripeAPIService: stripeService.api,
-        logger: logging,
         offersAPI: offersService.api,
         labsService: labsService
     });

package/core/server/services/members/config.js

@@ -1,4 +1,5 @@
 const errors = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
 const {URL} = require('url');
 const crypto = require('crypto');
@@ -15,15 +16,11 @@ class MembersConfigProvider {
      * @param {{get: (key: string) => any}} options.settingsCache
      * @param {{get: (key: string) => any}} options.config
      * @param {any} options.urlUtils
-     * @param {any} options.logging
-     * @param {{original: string}} options.ghostVersion
      */
     constructor(options) {
         this._settingsCache = options.settingsCache;
         this._config = options.config;
         this._urlUtils = options.urlUtils;
-        this._logging = options.logging;
-        this._ghostVersion = options.ghostVersion;
     }
 
     /**
@@ -193,12 +190,12 @@ class MembersConfigProvider {
     getAuthSecret() {
         const hexSecret = this._settingsCache.get('members_email_auth_secret');
         if (!hexSecret) {
-            this._logging.warn('Could not find members_email_auth_secret, using dynamically generated secret');
+            logging.warn('Could not find members_email_auth_secret, using dynamically generated secret');
             return crypto.randomBytes(64);
         }
         const secret = Buffer.from(hexSecret, 'hex');
         if (secret.length < 64) {
-            this._logging.warn('members_email_auth_secret not large enough (64 bytes), using dynamically generated secret');
+            logging.warn('members_email_auth_secret not large enough (64 bytes), using dynamically generated secret');
             return crypto.randomBytes(64);
         }
         return secret;
@@ -236,7 +233,7 @@ class MembersConfigProvider {
         let publicKey = this._settingsCache.get('members_public_key');
 
         if (!privateKey || !publicKey) {
-            this._logging.warn('Could not find members_private_key, using dynamically generated keypair');
+            logging.warn('Could not find members_private_key, using dynamically generated keypair');
             const keypair = createKeypair({bits: 1024});
             privateKey = keypair.private;
             publicKey = keypair.public;

package/core/server/services/members/service.js

@@ -13,7 +13,6 @@ const labsService = require('../../../shared/labs');
 const settingsCache = require('../../../shared/settings-cache');
 const config = require('../../../shared/config');
 const models = require('../../models');
-const ghostVersion = require('@tryghost/version');
 const _ = require('lodash');
 const {GhostMailer} = require('../mail');
 const jobsService = require('../jobs');
@@ -35,9 +34,7 @@ const ghostMailer = new GhostMailer();
 const membersConfig = new MembersConfigProvider({
     config,
     settingsCache,
-    urlUtils,
-    logging,
-    ghostVersion
+    urlUtils
 });
 
 let membersApi;

package/core/server/services/notifications/index.js

@@ -1,10 +1,8 @@
 const settingsCache = require('../../../shared/settings-cache');
-const ghostVersion = require('@tryghost/version');
 const Notifications = require('./notifications');
 const models = require('../../models');
 
 module.exports.notifications = new Notifications({
     settingsCache,
-    ghostVersion: ghostVersion.full,
     SettingsModel: models.Settings
 });

package/core/server/services/notifications/notifications.js

@@ -3,6 +3,7 @@ const semver = require('semver');
 const Promise = require('bluebird');
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
+const ghostVersion = require('@tryghost/version');
 const tpl = require('@tryghost/tpl');
 const ObjectId = require('bson-objectid');
 
@@ -16,12 +17,10 @@ class Notifications {
      *
      * @param {Object} options
      * @param {Object} options.settingsCache - settings cache instance
-     * @param {String} options.ghostVersion - Ghost instance version in "full" format - major.minor.patch
      * @param {Object} options.SettingsModel - Ghost's Setting model instance
      */
-    constructor({settingsCache, ghostVersion, SettingsModel}) {
+    constructor({settingsCache, SettingsModel}) {
         this.settingsCache = settingsCache;
-        this.ghostVersion = ghostVersion;
         this.SettingsModel = SettingsModel;
     }
 
@@ -74,7 +73,7 @@ class Notifications {
     browse({user}) {
         let allNotifications = this.fetchAllNotifications();
         allNotifications = _.orderBy(allNotifications, 'addedAt', 'desc');
-        const blogVersion = this.ghostVersion.match(/^(\d+\.)(\d+\.)(\d+)/);
+        const blogVersion = ghostVersion.full.match(/^(\d+\.)(\d+\.)(\d+)/);
 
         allNotifications = allNotifications.filter((notification) => {
             if (notification.createdAtVersion && !this.wasSeen(notification, user)) {
@@ -128,7 +127,7 @@ class Notifications {
             location: 'bottom',
             status: 'alert',
             id: ObjectId().toHexString(),
-            createdAtVersion: this.ghostVersion
+            createdAtVersion: ghostVersion.full
         };
 
         const overrides = {

package/core/server/services/stripe/index.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const logging = require('@tryghost/logging');
 const StripeAPIService = require('@tryghost/members-stripe-service');
 
 const config = require('../../../shared/config');
@@ -9,7 +8,6 @@ const events = require('../../lib/common/events');
 const {getConfig} = require('./config');
 
 const api = new StripeAPIService({
-    logger: logging,
     config: {}
 });
 

package/core/server/services/twitter-embed.js

@@ -1,4 +1,5 @@
 const {extract} = require('oembed-parser');
+const logging = require('@tryghost/logging');
 const labs = require('../../shared/labs');
 
 /**
@@ -69,7 +70,7 @@ class TwitterOEmbedProvider {
                 oembedData.tweet_data = body.data;
                 oembedData.tweet_data.includes = body.includes;
             } catch (err) {
-                this.dependencies.logging.error(err);
+                logging.error(err);
             }
         }
 

package/core/server/web/admin/app.js

@@ -5,6 +5,8 @@ const config = require('../../../shared/config');
 const constants = require('@tryghost/constants');
 const urlUtils = require('../../../shared/url-utils');
 const shared = require('../shared');
+const errorHandler = require('@tryghost/mw-error-handler');
+const sentry = require('../../../shared/sentry');
 const redirectAdminUrls = require('./middleware/redirect-admin-urls');
 
 module.exports = function setupAdminApp() {
@@ -44,8 +46,8 @@ module.exports = function setupAdminApp() {
     // Finally, routing
     adminApp.get('*', require('./controller'));
 
-    adminApp.use(shared.middleware.errorHandler.pageNotFound);
-    adminApp.use(shared.middleware.errorHandler.handleHTMLResponse);
+    adminApp.use(errorHandler.pageNotFound);
+    adminApp.use(errorHandler.handleHTMLResponse(sentry));
 
     debug('Admin setup end');
 

package/core/server/web/admin/views/default-prod.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.28%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.31%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -41,7 +41,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-4a510859440fff66c8c7b8cbdc157237.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-e628c133ed6b5ec32a1cc3511c2b2978.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-530b041ef90eed6eaabd7c24e1e8a266.js"></script>
-                <script src="assets/ghost.min-0d8c819c49453b69b8fcf64d15f7e8b8.js"></script>
+                <script src="assets/vendor.min-f4bc3ac0c7d33722341d0da4291aa888.js"></script>
+                <script src="assets/ghost.min-7690e7e32d3e53ec5480a234962341a6.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.28%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.31%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -41,7 +41,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-4a510859440fff66c8c7b8cbdc157237.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-e628c133ed6b5ec32a1cc3511c2b2978.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-530b041ef90eed6eaabd7c24e1e8a266.js"></script>
-                <script src="assets/ghost.min-0d8c819c49453b69b8fcf64d15f7e8b8.js"></script>
+                <script src="assets/vendor.min-f4bc3ac0c7d33722341d0da4291aa888.js"></script>
+                <script src="assets/ghost.min-7690e7e32d3e53ec5480a234962341a6.js"></script>
             
 </body>
 </html>

package/core/server/web/api/app.js

@@ -2,7 +2,8 @@ const debug = require('@tryghost/debug')('web:api:default:app');
 const config = require('../../../shared/config');
 const express = require('../../../shared/express');
 const urlUtils = require('../../../shared/url-utils');
-const errorHandler = require('../shared/middleware/error-handler');
+const sentry = require('../../../shared/sentry');
+const errorHandler = require('@tryghost/mw-error-handler');
 
 module.exports = function setupApiApp() {
     debug('Parent API setup start');
@@ -26,7 +27,7 @@ module.exports = function setupApiApp() {
 
     // Error handling for requests to non-existent API versions
     apiApp.use(errorHandler.resourceNotFound);
-    apiApp.use(errorHandler.handleJSONResponse);
+    apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Parent API setup end');
     return apiApp;

package/core/server/web/api/canary/admin/app.js

@@ -4,6 +4,8 @@ const express = require('../../../../../shared/express');
 const bodyParser = require('body-parser');
 const shared = require('../../../shared');
 const apiMw = require('../../middleware');
+const errorHandler = require('@tryghost/mw-error-handler');
+const sentry = require('../../../../../shared/sentry');
 const routes = require('./routes');
 
 module.exports = function setupApiApp() {
@@ -30,8 +32,8 @@ module.exports = function setupApiApp() {
     apiApp.use(routes());
 
     // API error handling
-    apiApp.use(shared.middleware.errorHandler.resourceNotFound);
-    apiApp.use(shared.middleware.errorHandler.handleJSONResponseV2);
+    apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(errorHandler.handleJSONResponseV2(sentry));
 
     debug('Admin API canary setup end');
 

package/core/server/web/api/canary/content/app.js

@@ -2,8 +2,10 @@ const debug = require('@tryghost/debug')('web:api:canary:content:app');
 const boolParser = require('express-query-boolean');
 const bodyParser = require('body-parser');
 const express = require('../../../../../shared/express');
+const sentry = require('../../../../../shared/sentry');
 const shared = require('../../../shared');
 const routes = require('./routes');
+const errorHandler = require('@tryghost/mw-error-handler');
 
 module.exports = function setupApiApp() {
     debug('Content API canary setup start');
@@ -24,8 +26,8 @@ module.exports = function setupApiApp() {
     apiApp.use(routes());
 
     // API error handling
-    apiApp.use(shared.middleware.errorHandler.resourceNotFound);
-    apiApp.use(shared.middleware.errorHandler.handleJSONResponse);
+    apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Content API canary setup end');
 

package/core/server/web/api/v2/admin/app.js

@@ -1,10 +1,12 @@
 const debug = require('@tryghost/debug')('web:v2:admin:app');
 const boolParser = require('express-query-boolean');
 const express = require('../../../../../shared/express');
+const sentry = require('../../../../../shared/sentry');
 const bodyParser = require('body-parser');
 const shared = require('../../../shared');
 const apiMw = require('../../middleware');
 const routes = require('./routes');
+const errorHandler = require('@tryghost/mw-error-handler');
 
 module.exports = function setupApiApp() {
     debug('Admin API v2 setup start');
@@ -30,8 +32,8 @@ module.exports = function setupApiApp() {
     apiApp.use(routes());
 
     // API error handling
-    apiApp.use(shared.middleware.errorHandler.resourceNotFound);
-    apiApp.use(shared.middleware.errorHandler.handleJSONResponseV2);
+    apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(errorHandler.handleJSONResponseV2(sentry));
 
     debug('Admin API v2 setup end');
 

package/core/server/web/api/v2/content/app.js

@@ -2,8 +2,10 @@ const debug = require('@tryghost/debug')('web:api:v2:content:app');
 const boolParser = require('express-query-boolean');
 const bodyParser = require('body-parser');
 const express = require('../../../../../shared/express');
+const sentry = require('../../../../../shared/sentry');
 const shared = require('../../../shared');
 const routes = require('./routes');
+const errorHandler = require('@tryghost/mw-error-handler');
 
 module.exports = function setupApiApp() {
     debug('Content API v2 setup start');
@@ -24,8 +26,8 @@ module.exports = function setupApiApp() {
     apiApp.use(routes());
 
     // API error handling
-    apiApp.use(shared.middleware.errorHandler.resourceNotFound);
-    apiApp.use(shared.middleware.errorHandler.handleJSONResponse);
+    apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Content API v2 setup end');
 

package/core/server/web/api/v3/admin/app.js

@@ -1,10 +1,12 @@
 const debug = require('@tryghost/debug')('web:v3:admin:app');
 const boolParser = require('express-query-boolean');
 const express = require('../../../../../shared/express');
+const sentry = require('../../../../../shared/sentry');
 const bodyParser = require('body-parser');
 const shared = require('../../../shared');
 const apiMw = require('../../middleware');
 const routes = require('./routes');
+const errorHandler = require('@tryghost/mw-error-handler');
 
 module.exports = function setupApiApp() {
     debug('Admin API v3 setup start');
@@ -30,8 +32,8 @@ module.exports = function setupApiApp() {
     apiApp.use(routes());
 
     // API error handling
-    apiApp.use(shared.middleware.errorHandler.resourceNotFound);
-    apiApp.use(shared.middleware.errorHandler.handleJSONResponseV2);
+    apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(errorHandler.handleJSONResponseV2(sentry));
 
     debug('Admin API v3 setup end');
 

package/core/server/web/api/v3/content/app.js

@@ -2,8 +2,10 @@ const debug = require('@tryghost/debug')('web:api:v3:content:app');
 const boolParser = require('express-query-boolean');
 const bodyParser = require('body-parser');
 const express = require('../../../../../shared/express');
+const sentry = require('../../../../../shared/sentry');
 const shared = require('../../../shared');
 const routes = require('./routes');
+const errorHandler = require('@tryghost/mw-error-handler');
 
 module.exports = function setupApiApp() {
     debug('Content API v3 setup start');
@@ -24,8 +26,8 @@ module.exports = function setupApiApp() {
     apiApp.use(routes());
 
     // API error handling
-    apiApp.use(shared.middleware.errorHandler.resourceNotFound);
-    apiApp.use(shared.middleware.errorHandler.handleJSONResponse);
+    apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Content API v3 setup end');