npm - ghost - Versions diffs - 4.29.0 → 4.32.0 - Mend

ghost 4.29.0 → 4.32.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (79) hide show

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

@@ -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 CHANGED Viewed

@@ -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/emails/signin.js CHANGED Viewed

@@ -99,7 +99,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
     }
     </style>
   </head>
-  <body class="" style="background-color: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+  <body style="background-color: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
     <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
       <tr>
         <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>

package/core/server/services/members/emails/signup-paid.js CHANGED Viewed

@@ -99,7 +99,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
     }
     </style>
   </head>
-  <body class="" style="background-color: #FFFFFF; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+  <body style="background-color: #FFFFFF; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
     <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;">
       <tr>
         <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>

package/core/server/services/members/emails/signup.js CHANGED Viewed

@@ -99,7 +99,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
     }
     </style>
   </head>
-  <body class="" style="background-color: #FFFFFF; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+  <body style="background-color: #FFFFFF; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
     <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;">
       <tr>
         <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>

package/core/server/services/members/emails/subscribe.js CHANGED Viewed

@@ -99,7 +99,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
     }
     </style>
   </head>
-  <body class="" style="background-color: #FFFFFF; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+  <body style="background-color: #FFFFFF; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
     <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #FFFFFF;">
       <tr>
         <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>

package/core/server/services/members/emails/updateEmail.js CHANGED Viewed

@@ -92,7 +92,7 @@ module.exports = ({email, url}) => `
     }
     </style>
   </head>
-  <body class="" style="background-color: #F4F8FB; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+  <body style="background-color: #F4F8FB; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
     <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #F4F8FB;">
       <tr>
         <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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.29%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.32%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-578a1b7e68d1f7ae0003ebe421b7c182.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-c3f7cbabcc1a69476534453c6c747ee3.css" title="light">
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
-                <script src="assets/vendor.min-c450359ad46217cd48c00b277ae54a09.js"></script>
-                <script src="assets/ghost.min-ba8ef5d16b8a6f9072564a368154df72.js"></script>
+                <script src="assets/vendor.min-992a9b07f7d0a67b5a4afd91319edf8b.js"></script>
+                <script src="assets/ghost.min-2b20489c79323b165909749382adc158.js"></script>
 </body>
 </html>

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

@@ -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.29%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.32%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-578a1b7e68d1f7ae0003ebe421b7c182.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-c3f7cbabcc1a69476534453c6c747ee3.css" title="light">
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
-                <script src="assets/vendor.min-c450359ad46217cd48c00b277ae54a09.js"></script>
-                <script src="assets/ghost.min-ba8ef5d16b8a6f9072564a368154df72.js"></script>
+                <script src="assets/vendor.min-992a9b07f7d0a67b5a4afd91319edf8b.js"></script>
+                <script src="assets/ghost.min-2b20489c79323b165909749382adc158.js"></script>
 </body>
 </html>

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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');

package/core/server/web/members/app.js CHANGED Viewed

@@ -4,10 +4,12 @@ const cors = require('cors');
 const bodyParser = require('body-parser');
 const express = require('../../../shared/express');
 const urlUtils = require('../../../shared/url-utils');
+const sentry = require('../../../shared/sentry');
 const membersService = require('../../services/members');
 const middleware = membersService.middleware;
 const shared = require('../shared');
 const labs = require('../../../shared/labs');
+const errorHandler = require('@tryghost/mw-error-handler');
 module.exports = function setupMembersApp() {
     debug('Members App setup start');
@@ -46,12 +48,12 @@ module.exports = function setupMembersApp() {
     membersApp.post('/api/events', labs.enabledMiddleware('membersActivity'), middleware.loadMemberSession, (req, res, next) => membersService.api.middleware.createEvents(req, res, next));
     // API error handling
-    membersApp.use('/api', shared.middleware.errorHandler.resourceNotFound);
-    membersApp.use('/api', shared.middleware.errorHandler.handleJSONResponseV2);
+    membersApp.use('/api', errorHandler.resourceNotFound);
+    membersApp.use('/api', errorHandler.handleJSONResponseV2(sentry));
     // Webhook error handling
-    membersApp.use('/webhooks', shared.middleware.errorHandler.resourceNotFound);
-    membersApp.use('/webhooks', shared.middleware.errorHandler.handleJSONResponseV2);
+    membersApp.use('/webhooks', errorHandler.resourceNotFound);
+    membersApp.use('/webhooks', errorHandler.handleJSONResponseV2(sentry));
     debug('Members App setup end');

package/core/server/web/shared/middleware/index.js CHANGED Viewed

@@ -11,10 +11,6 @@ module.exports = {
         return require('./cache-control');
     },
-    get errorHandler() {
-        return require('./error-handler');
-    },
     get prettyUrls() {
         return require('./pretty-urls');
     },

package/core/shared/config/overrides.json CHANGED Viewed

@@ -32,7 +32,17 @@
         },
         "media": {
             "extensions": [".mp4",".webm", ".ogv", ".mp3", ".wav", ".ogg"],
-            "contentTypes": ["video/mp4", "video/webm", "video/ogg", "audio/mpeg", "audio/vnd.wav", "audio/ogg"]
+            "contentTypes": [
+                "video/mp4",
+                "video/webm",
+                "video/ogg",
+                "audio/mpeg",
+                "audio/vnd.wav",
+                "audio/wave",
+                "audio/wav",
+                "audio/x-wav",
+                "audio/ogg"
+            ]
         },
         "thumbnails": {
             "extensions": [".jpg", ".jpeg", ".gif", ".png", ".svg", ".svgz", ".ico", ".webp"],

package/core/shared/labs.js CHANGED Viewed

@@ -18,12 +18,16 @@ const GA_FEATURES = [
     'customThemeSettings',
     'nftCard',
     'calloutCard',
+    'videoCard',
     'accordionCard',
     'productCard',
     'richTwitterNewsletters',
     'audioCard',
     'mediaAPI',
-    'filesAPI'
+    'membersAutoLogin',
+    'filesAPI',
+    'fileCard',
+    'headerCard'
 ];
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -38,12 +42,8 @@ const ALPHA_FEATURES = [
     'membersActivity',
     'cardSettingsPanel',
     'urlCache',
-    'membersAutoLogin',
-    'fileCard',
-    'videoCard',
     'beforeAfterCard',
-    'tweetGridCard',
-    'headerCard'
+    'tweetGridCard'
 ];
 module.exports.GA_KEYS = [...GA_FEATURES];