ghost 4.27.1 → 4.30.0

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.27%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.30%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-b1e58e098721e467388682a85a7c187d.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-c21fea11c3f431994a8ee7c47a8ed145.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-e433aa7d5620e7837f30e170cd43f84e.js"></script>
-                <script src="assets/ghost.min-2d534cce15c43c646814b26f4beefb78.js"></script>
+                <script src="assets/vendor.min-a2fd1e62ce6da8911fee8e812d8c6ceb.js"></script>
+                <script src="assets/ghost.min-884660873d56fcc3d2a3b9fe94c9f022.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.27%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.30%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-b1e58e098721e467388682a85a7c187d.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-c21fea11c3f431994a8ee7c47a8ed145.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-e433aa7d5620e7837f30e170cd43f84e.js"></script>
-                <script src="assets/ghost.min-2d534cce15c43c646814b26f4beefb78.js"></script>
+                <script src="assets/vendor.min-a2fd1e62ce6da8911fee8e812d8c6ceb.js"></script>
+                <script src="assets/ghost.min-884660873d56fcc3d2a3b9fe94c9f022.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');
 

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

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

@@ -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/labs.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.27.1",
+  "version": "4.30.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -32,7 +32,7 @@
     "test:unit": "c8 --reporter text-summary --reporter cobertura mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/unit' --timeout=2000",
     "test:integration": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/integration' --timeout=5000",
     "test:e2e": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/e2e-api' './test/e2e-frontend' './test/e2e-server' --timeout=10000",
-    "test:regression": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000",
+    "test:regression": "mocha --require=./test/utils/overrides.js --require=./test/utils/snapshots.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000",
     "test:unit:slow": "yarn test:unit --reporter=mocha-slow-test-reporter",
     "test:int:slow": "yarn test:integration --reporter=mocha-slow-test-reporter",
     "test:e2e:slow": "yarn test:e2e --reporter=mocha-slow-test-reporter",
@@ -54,51 +54,52 @@
   },
   "dependencies": {
     "@nexes/nql": "0.6.0",
-    "@sentry/node": "6.16.0",
-    "@tryghost/adapter-manager": "0.2.24",
+    "@sentry/node": "6.16.1",
+    "@tryghost/adapter-manager": "0.2.25",
     "@tryghost/admin-api-schema": "2.6.1",
     "@tryghost/bookshelf-plugins": "0.3.5",
-    "@tryghost/bootstrap-socket": "0.2.14",
+    "@tryghost/bootstrap-socket": "0.2.15",
     "@tryghost/color-utils": "0.1.5",
     "@tryghost/config-url-helpers": "0.1.3",
     "@tryghost/constants": "1.0.0",
     "@tryghost/custom-theme-settings-service": "0.3.1",
     "@tryghost/debug": "0.1.9",
-    "@tryghost/email-analytics-provider-mailgun": "1.0.6",
+    "@tryghost/email-analytics-provider-mailgun": "1.0.7",
     "@tryghost/email-analytics-service": "1.0.5",
-    "@tryghost/errors": "1.0.4",
+    "@tryghost/errors": "1.2.0",
     "@tryghost/express-dynamic-redirects": "0.2.2",
     "@tryghost/helpers": "1.1.54",
-    "@tryghost/image-transform": "1.0.24",
-    "@tryghost/job-manager": "0.8.16",
+    "@tryghost/image-transform": "1.0.25",
+    "@tryghost/job-manager": "0.8.17",
     "@tryghost/kg-card-factory": "3.1.0",
     "@tryghost/kg-default-atoms": "3.1.0",
-    "@tryghost/kg-default-cards": "5.11.5",
+    "@tryghost/kg-default-cards": "5.14.7",
     "@tryghost/kg-markdown-html-renderer": "5.1.0",
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.1",
-    "@tryghost/limit-service": "1.0.6",
-    "@tryghost/logging": "1.0.2",
+    "@tryghost/limit-service": "1.0.7",
+    "@tryghost/logging": "2.0.0",
     "@tryghost/magic-link": "1.0.14",
-    "@tryghost/members-api": "2.8.4",
+    "@tryghost/members-api": "2.8.6",
     "@tryghost/members-csv": "1.2.0",
     "@tryghost/members-importer": "0.3.5",
     "@tryghost/members-offers": "0.10.3",
     "@tryghost/members-ssr": "1.0.16",
     "@tryghost/metrics": "1.0.1",
-    "@tryghost/minifier": "0.1.7",
+    "@tryghost/minifier": "0.1.8",
+    "@tryghost/mw-error-handler": "0.1.1",
     "@tryghost/mw-session-from-token": "0.1.26",
     "@tryghost/nodemailer": "0.3.8",
-    "@tryghost/package-json": "1.0.12",
+    "@tryghost/package-json": "1.0.13",
     "@tryghost/promise": "0.1.13",
     "@tryghost/request": "0.1.10",
     "@tryghost/root-utils": "0.3.7",
     "@tryghost/security": "0.2.13",
-    "@tryghost/session-service": "0.1.34",
+    "@tryghost/session-service": "0.1.35",
     "@tryghost/settings-path-manager": "0.1.2",
     "@tryghost/social-urls": "0.1.27",
     "@tryghost/string": "0.1.21",
     "@tryghost/tpl": "0.1.8",
-    "@tryghost/update-check-service": "0.2.5",
+    "@tryghost/update-check-service": "0.3.0",
     "@tryghost/url-utils": "2.0.4",
     "@tryghost/validator": "0.1.9",
     "@tryghost/version": "0.1.7",
@@ -107,7 +108,7 @@
     "amperize": "0.6.1",
     "analytics-node": "6.0.0",
     "bluebird": "3.7.2",
-    "body-parser": "1.19.0",
+    "body-parser": "1.19.1",
     "bookshelf": "1.2.0",
     "bookshelf-relations": "2.3.0",
     "brute-knex": "4.0.1",
@@ -130,7 +131,7 @@
     "ghost-storage-base": "1.0.0",
     "glob": "7.2.0",
     "got": "9.6.0",
-    "gscan": "4.16.0",
+    "gscan": "4.19.0",
     "html-to-text": "5.1.1",
     "image-size": "1.0.0",
     "intl": "1.2.5",
@@ -143,7 +144,7 @@
     "knex": "0.21.21",
     "knex-migrator": "4.1.3",
     "lodash": "4.17.21",
-    "luxon": "2.1.1",
+    "luxon": "2.2.0",
     "mailgun-js": "0.22.0",
     "metascraper": "5.25.5",
     "metascraper-author": "5.25.5",
@@ -166,7 +167,7 @@
     "path-match": "1.2.4",
     "probe-image-size": "5.0.0",
     "rss": "1.2.2",
-    "sanitize-html": "2.6.0",
+    "sanitize-html": "2.6.1",
     "semver": "7.3.5",
     "stoppable": "1.1.0",
     "tough-cookie": "4.0.0",
@@ -174,16 +175,19 @@
     "xml": "1.0.1"
   },
   "optionalDependencies": {
-    "@tryghost/html-to-mobiledoc": "1.5.0",
+    "@tryghost/html-to-mobiledoc": "1.5.2",
     "sqlite3": "5.0.2"
   },
   "devDependencies": {
+    "@ethanresnick/chai-jest-snapshot": "3.0.0",
     "@lodder/grunt-postcss": "3.1.1",
     "c8": "7.10.0",
+    "chai": "4.3.4",
     "coffeescript": "2.6.1",
     "cssnano": "5.0.12",
     "eslint": "7.32.0",
     "eslint-plugin-ghost": "2.11.0",
+    "expect": "27.4.2",
     "grunt": "1.4.1",
     "grunt-bg-shell": "2.3.3",
     "grunt-contrib-clean": "2.0.0",
@@ -201,7 +205,7 @@
     "mock-knex": "0.4.10",
     "nock": "13.2.1",
     "papaparse": "5.3.1",
-    "postcss": "8.4.4",
+    "postcss": "8.4.5",
     "rewire": "5.0.0",
     "should": "13.2.3",
     "sinon": "11.1.2",
@@ -209,6 +213,7 @@
     "tmp": "0.2.1"
   },
   "resolutions": {
+    "@tryghost/logging": "2.0.0",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   }