ghost 4.20.4 → 4.21.0

package/core/frontend/apps/amp/lib/helpers/amp_content.js

@@ -8,7 +8,7 @@
 // there if available. The cacheId is a combination of `updated_at` and the `slug`.
 const Promise = require('bluebird');
 
-const moment = require('moment');
+const {DateTime, Interval} = require('luxon');
 const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 
@@ -119,14 +119,26 @@ function getAmperizeHTML(html, post) {
     }
 
     let Amperize = require('amperize');
-    let startedAtMoment = moment();
 
     amperize = amperize || new Amperize();
 
-    if (!amperizeCache[post.id] || moment(new Date(amperizeCache[post.id].updated_at)).diff(new Date(post.updated_at)) < 0) {
+    const startedAtMoment = DateTime.now();
+
+    let cacheDateTime;
+    let postDateTime;
+
+    if (amperizeCache[post.id]) {
+        const {updated_at: ampCacheUpdatedAt} = amperizeCache[post.id];
+        const {updated_at: postUpdatedAt} = post;
+
+        cacheDateTime = DateTime.fromJSDate(new Date(ampCacheUpdatedAt));
+        postDateTime = DateTime.fromJSDate(new Date(postUpdatedAt));
+    }
+
+    if (!amperizeCache[post.id] || cacheDateTime.diff(postDateTime).valueOf() < 0) {
         return new Promise((resolve) => {
             amperize.parse(html, (err, res) => {
-                logging.info('amp.parse', post.url, moment().diff(startedAtMoment, 'ms') + 'ms');
+                logging.info('amp.parse', post.url, Interval.fromDateTimes(startedAtMoment, DateTime.now()).length('milliseconds') + 'ms');
 
                 if (err) {
                     if (err.src) {

package/core/frontend/meta/title.js

@@ -1,9 +1,16 @@
 const _ = require('lodash');
 const settingsCache = require('../../shared/settings-cache');
 
+function optionalString(test, string) {
+    if (test) {
+        return string;
+    }
+    return '';
+}
+
 function getTitle(data, root, options = {}) {
     const context = root ? root.context : null;
-    const siteTitle = settingsCache.get('title');
+    const siteTitle = settingsCache.get('title') || '';
     const pagination = root ? root.pagination : null;
 
     // options.property = null/'og'/'twitter'
@@ -16,6 +23,9 @@ function getTitle(data, root, options = {}) {
         pageString = _.has(options.hash, 'page') ? options.hash.page.replace('%', pagination.page) : ' (Page ' + pagination.page + ')';
     }
 
+    const dashSiteTitle = optionalString(siteTitle, ' - ' + siteTitle);
+    const dashSiteTitlePage = optionalString(siteTitle || pageString, ' -' + optionalString(siteTitle, ' ' + siteTitle) + pageString);
+
     // If there's a specific meta title
     if (data.meta_title) {
         title = data.meta_title;
@@ -28,16 +38,16 @@ function getTitle(data, root, options = {}) {
         }
     // Author title, paged
     } else if (_.includes(context, 'author') && data.author && _.includes(context, 'paged')) {
-        title = data.author.name + ' - ' + siteTitle + pageString;
+        title = data.author.name + dashSiteTitlePage;
     // Author title, index
     } else if (_.includes(context, 'author') && data.author) {
-        title = data.author.name + ' - ' + siteTitle;
+        title = data.author.name + dashSiteTitle;
     // Tag title, paged
     } else if (_.includes(context, 'tag') && data.tag && _.includes(context, 'paged')) {
-        title = data.tag.meta_title || data.tag.name + ' - ' + siteTitle + pageString;
+        title = data.tag.meta_title || data.tag.name + dashSiteTitlePage;
     // Tag title, index
     } else if (_.includes(context, 'tag') && data.tag) {
-        title = data.tag[optionsPropertyName] || data.tag.meta_title || data.tag.name + ' - ' + siteTitle;
+        title = data.tag[optionsPropertyName] || data.tag.meta_title || data.tag.name + dashSiteTitle;
     // Post title
     } else if (_.includes(context, 'post') && data.post) {
         title = data.post[optionsPropertyName] || data.post.meta_title || data.post.title;

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

@@ -59,8 +59,7 @@ module.exports = {
         permissions: true,
         validation: {},
         async query(frame) {
-            frame.options.withRelated = ['labels', 'stripeSubscriptions', 'stripeSubscriptions.customer', 'stripeSubscriptions.stripePrice', 'stripeSubscriptions.stripePrice.stripeProduct'];
-            const page = await membersService.api.members.list(frame.options);
+            const page = await membersService.api.memberBREADService.browse(frame.options);
 
             return page;
         }
@@ -84,7 +83,7 @@ module.exports = {
         },
         permissions: true,
         async query(frame) {
-            let member = await membersService.api.memberBREADService.read(frame.data, frame.options);
+            const member = await membersService.api.memberBREADService.read(frame.data, frame.options);
 
             if (!member) {
                 throw new errors.NotFoundError({
@@ -115,72 +114,9 @@ module.exports = {
         },
         permissions: true,
         async query(frame) {
-            let member;
-            frame.options.withRelated = ['stripeSubscriptions', 'products', 'labels', 'stripeSubscriptions.stripePrice', 'stripeSubscriptions.stripePrice.stripeProduct'];
-            if (!labsService.isSet('multipleProducts')) {
-                delete frame.data.products;
-            }
-            try {
-                if (!membersService.config.isStripeConnected()
-                    && (frame.data.members[0].stripe_customer_id || frame.data.members[0].comped)) {
-                    const property = frame.data.members[0].comped ? 'comped' : 'stripe_customer_id';
-
-                    throw new errors.ValidationError({
-                        message: tpl(messages.stripeNotConnected.message),
-                        context: tpl(messages.stripeNotConnected.context),
-                        help: tpl(messages.stripeNotConnected.help),
-                        property
-                    });
-                }
-
-                member = await membersService.api.members.create(frame.data.members[0], frame.options);
-
-                if (frame.data.members[0].stripe_customer_id) {
-                    await membersService.api.members.linkStripeCustomer({
-                        customer_id: frame.data.members[0].stripe_customer_id,
-                        member_id: member.id
-                    }, frame.options);
-                }
-
-                if (!labsService.isSet('multipleProducts')) {
-                    if (frame.data.members[0].comped) {
-                        await membersService.api.members.setComplimentarySubscription(member);
-                    }
-                }
-
-                if (frame.options.send_email) {
-                    await membersService.api.sendEmailWithMagicLink({email: member.get('email'), requestedType: frame.options.email_type});
-                }
-
-                return member;
-            } catch (error) {
-                if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
-                    throw new errors.ValidationError({
-                        message: tpl(messages.memberAlreadyExists.message),
-                        context: tpl(messages.memberAlreadyExists.context, {
-                            action: 'add'
-                        })
-                    });
-                }
-
-                // NOTE: failed to link Stripe customer/plan/subscription or have thrown custom Stripe connection error.
-                //       It's a bit ugly doing regex matching to detect errors, but it's the easiest way that works without
-                //       introducing additional logic/data format into current error handling
-                const isStripeLinkingError = error.message && (error.message.match(/customer|plan|subscription/g));
-                if (member && isStripeLinkingError) {
-                    if (error.message.indexOf('customer') && error.code === 'resource_missing') {
-                        error.message = `Member not imported. ${error.message}`;
-                        error.context = tpl(messages.stripeCustomerNotFound.context);
-                        error.help = tpl(messages.stripeCustomerNotFound.help);
-                    }
+            const member = await membersService.api.memberBREADService.add(frame.data.members[0], frame.options);
 
-                    await membersService.api.members.destroy({
-                        id: member.get('id')
-                    }, frame.options);
-                }
-
-                throw error;
-            }
+            return member;
         }
     },
 
@@ -199,42 +135,9 @@ module.exports = {
         },
         permissions: true,
         async query(frame) {
-            if (!labsService.isSet('multipleProducts')) {
-                delete frame.data.products;
-            }
-            try {
-                frame.options.withRelated = ['stripeSubscriptions', 'products', 'labels', 'stripeSubscriptions.stripePrice', 'stripeSubscriptions.stripePrice.stripeProduct'];
-                const member = await membersService.api.members.update(frame.data.members[0], frame.options);
-
-                const hasCompedSubscription = !!member.related('stripeSubscriptions').find(sub => sub.get('plan_nickname') === 'Complimentary' && sub.get('status') === 'active');
-
-                if (!labsService.isSet('multipleProducts')) {
-                    if (typeof frame.data.members[0].comped === 'boolean') {
-                        if (frame.data.members[0].comped && !hasCompedSubscription) {
-                            await membersService.api.members.setComplimentarySubscription(member);
-                        } else if (!(frame.data.members[0].comped) && hasCompedSubscription) {
-                            await membersService.api.members.cancelComplimentarySubscription(member);
-                        }
-
-                        await member.load(['stripeSubscriptions', 'products', 'stripeSubscriptions.stripePrice', 'stripeSubscriptions.stripePrice.stripeProduct']);
-                    }
-                }
-
-                await member.load(['stripeSubscriptions.customer', 'stripeSubscriptions.stripePrice', 'stripeSubscriptions.stripePrice.stripeProduct']);
-
-                return member;
-            } catch (error) {
-                if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
-                    throw new errors.ValidationError({
-                        message: tpl(messages.memberAlreadyExists.message),
-                        context: tpl(messages.memberAlreadyExists.context, {
-                            action: 'edit'
-                        })
-                    });
-                }
+            const member = await membersService.api.memberBREADService.edit(frame.data.members[0], frame.options);
 
-                throw error;
-            }
+            return member;
         }
     },
 

package/core/server/api/canary/membersStripeConnect.js

@@ -1,7 +1,4 @@
 const membersService = require('../../services/members');
-const config = require('../../../shared/config');
-const urlUtils = require('../../../shared/url-utils');
-const {BadRequestError} = require('@tryghost/errors');
 
 module.exports = {
     docName: 'members_stripe_connect',
@@ -18,13 +15,6 @@ module.exports = {
             }
         },
         query(frame) {
-            const siteUrl = urlUtils.getSiteUrl();
-            const productionMode = config.get('env') === 'production';
-            const siteUrlUsingSSL = /^https/.test(siteUrl);
-            const cannotConnectToStripe = productionMode && !siteUrlUsingSSL;
-            if (cannotConnectToStripe) {
-                throw new BadRequestError('Cannot connect to stripe unless site is using https://');
-            }
             // This is something you have to do if you want to use the "framework" with access to the raw req/res
             frame.response = async function (req, res) {
                 function setSessionProp(prop, val) {

package/core/server/api/canary/utils/serializers/output/images.js

@@ -8,6 +8,10 @@ module.exports = {
         return frame.response = {
             images: [{
                 url: mapper.mapImage(path),
+                // NOTE: ref field is here to have reference point on the client
+                //       for example when substituting existing images in the mobiledoc
+                //       this field would serve as an identifier to find images to replace
+                //       once the response is back. Think of it as ID on the client's side.
                 ref: frame.data.ref || null
             }]
         };

package/core/server/api/v2/utils/serializers/output/images.js

@@ -8,6 +8,10 @@ module.exports = {
         return frame.response = {
             images: [{
                 url: mapper.mapImage(path),
+                // NOTE: ref field is here to have reference point on the client
+                //       for example when substituting existing images in the mobiledoc
+                //       this field would serve as an identifier to find images to replace
+                //       once the response is back. Think of it as ID on the client's side.
                 ref: frame.data.ref || null
             }]
         };

package/core/server/api/v3/utils/serializers/output/images.js

@@ -8,6 +8,10 @@ module.exports = {
         return frame.response = {
             images: [{
                 url: mapper.mapImage(path),
+                // NOTE: ref field is here to have reference point on the client
+                //       for example when substituting existing images in the mobiledoc
+                //       this field would serve as an identifier to find images to replace
+                //       once the response is back. Think of it as ID on the client's side.
                 ref: frame.data.ref || null
             }]
         };

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

@@ -80,7 +80,7 @@ function createApiInstance(config) {
                     return `
                         Hey there!
 
-                        Thanks for signing up for ${siteTitle} — use this link to complete the sign up process and be automatically signed in:
+                        Tap the link below to complete the signup process for ${siteTitle}, and be automatically signed in:
 
                         ${url}
 

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

@@ -107,7 +107,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
           <div class="content" style="box-sizing: border-box; display: block; margin: 0 auto; max-width: 600px; padding: 30px 20px;">
 
             <!-- START CENTERED WHITE CONTAINER -->
-            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Thanks for signing up for ${siteTitle}!</span>
+            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Complete signup for ${siteTitle}!</span>
             <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;">
 
               <!-- START MAIN CONTENT AREA -->
@@ -117,7 +117,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
                     <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;">
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Hey there!</p>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 32px;">Thanks for signing up for ${siteTitle} — use this link to complete the sign up process and be automatically signed in:</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 32px;">Tap the link below to complete the signup process for ${siteTitle}, and be automatically signed in:</p>
                         <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
                           <tbody>
                             <tr>

package/core/server/services/members/stripe-connect.js

@@ -4,6 +4,9 @@ const {Buffer} = require('buffer');
 const {randomBytes} = require('crypto');
 const {URL} = require('url');
 
+const config = require('../../../shared/config');
+const urlUtils = require('../../../shared/url-utils');
+
 const messages = {
     incorrectState: 'State did not match.'
 };
@@ -24,6 +27,7 @@ const redirectURI = 'https://stripe.ghost.org';
  * @returns {Promise<URL>}
  */
 async function getStripeConnectOAuthUrl(setSessionProp, mode = 'live') {
+    checkCanConnect();
     const randomState = randomBytes(16).toString('hex');
     const state = Buffer.from(JSON.stringify({
         mode,
@@ -71,6 +75,16 @@ async function getStripeConnectTokenData(encodedData, getSessionProp) {
     };
 }
 
+function checkCanConnect() {
+    const siteUrl = urlUtils.getSiteUrl();
+    const productionMode = config.get('env') === 'production';
+    const siteUrlUsingSSL = /^https/.test(siteUrl);
+    const cannotConnectToStripe = productionMode && !siteUrlUsingSSL;
+    if (cannotConnectToStripe) {
+        throw new errors.BadRequestError('Cannot connect to stripe unless site is using https://');
+    }
+}
+
 module.exports = {
     getStripeConnectOAuthUrl,
     getStripeConnectTokenData,

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.20%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.21%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-57e46fd3b1145ecf2cbd185a13611f3b.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-5abc69c04ad1d5301a857e01009b9c05.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-af502ac4142871500fc424f6a5a254ec.js"></script>
-                <script src="assets/ghost.min-07b6a50c54b3e2e190332c28c7255d2f.js"></script>
+                <script src="assets/vendor.min-c6ef90bfd7eff256e10b85583bfe9a74.js"></script>
+                <script src="assets/ghost.min-6c546c322127ae6d1d1b0ddbf34be75b.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.20%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.21%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-57e46fd3b1145ecf2cbd185a13611f3b.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-5abc69c04ad1d5301a857e01009b9c05.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-af502ac4142871500fc424f6a5a254ec.js"></script>
-                <script src="assets/ghost.min-07b6a50c54b3e2e190332c28c7255d2f.js"></script>
+                <script src="assets/vendor.min-c6ef90bfd7eff256e10b85583bfe9a74.js"></script>
+                <script src="assets/ghost.min-6c546c322127ae6d1d1b0ddbf34be75b.js"></script>
             
 </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.20.4",
+  "version": "4.21.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -49,7 +49,7 @@
     "fix": "yarn fix:client && yarn fix:server"
   },
   "engines": {
-    "node": "^12.22.1 || ^14.16.1",
+    "node": "^12.22.1 || ^14.17.0 || ^16.13.0",
     "cli": "^1.17.0"
   },
   "dependencies": {
@@ -64,22 +64,22 @@
     "@tryghost/constants": "0.1.12",
     "@tryghost/custom-theme-settings-service": "0.3.1",
     "@tryghost/debug": "0.1.9",
-    "@tryghost/email-analytics-provider-mailgun": "1.0.4",
-    "@tryghost/email-analytics-service": "1.0.3",
+    "@tryghost/email-analytics-provider-mailgun": "1.0.5",
+    "@tryghost/email-analytics-service": "1.0.4",
     "@tryghost/errors": "0.2.17",
     "@tryghost/express-dynamic-redirects": "0.2.1",
     "@tryghost/helpers": "1.1.52",
     "@tryghost/image-transform": "1.0.17",
     "@tryghost/job-manager": "0.8.11",
-    "@tryghost/kg-card-factory": "3.0.4",
-    "@tryghost/kg-default-atoms": "3.0.0",
-    "@tryghost/kg-default-cards": "5.0.7",
-    "@tryghost/kg-markdown-html-renderer": "5.0.5",
-    "@tryghost/kg-mobiledoc-html-renderer": "5.1.1",
+    "@tryghost/kg-card-factory": "3.1.0",
+    "@tryghost/kg-default-atoms": "3.1.0",
+    "@tryghost/kg-default-cards": "5.1.0",
+    "@tryghost/kg-markdown-html-renderer": "5.1.0",
+    "@tryghost/kg-mobiledoc-html-renderer": "5.2.0",
     "@tryghost/limit-service": "0.6.5",
-    "@tryghost/logging": "0.2.2",
+    "@tryghost/logging": "1.0.0",
     "@tryghost/magic-link": "1.0.14",
-    "@tryghost/members-api": "2.4.1",
+    "@tryghost/members-api": "2.6.0",
     "@tryghost/members-csv": "1.1.8",
     "@tryghost/members-importer": "0.3.4",
     "@tryghost/members-offers": "0.10.1",
@@ -96,7 +96,7 @@
     "@tryghost/social-urls": "0.1.26",
     "@tryghost/string": "0.1.20",
     "@tryghost/tpl": "0.1.8",
-    "@tryghost/update-check-service": "0.2.4",
+    "@tryghost/update-check-service": "0.2.5",
     "@tryghost/url-utils": "2.0.2",
     "@tryghost/validator": "0.1.8",
     "@tryghost/version": "0.1.7",
@@ -107,7 +107,7 @@
     "bluebird": "3.7.2",
     "body-parser": "1.19.0",
     "bookshelf": "1.2.0",
-    "bookshelf-relations": "2.2.0",
+    "bookshelf-relations": "2.3.0",
     "brute-knex": "4.0.1",
     "bson-objectid": "2.0.1",
     "bthreads": "0.5.1",
@@ -128,7 +128,7 @@
     "ghost-storage-base": "0.0.6",
     "glob": "7.2.0",
     "got": "9.6.0",
-    "gscan": "4.9.3",
+    "gscan": "4.10.0",
     "html-to-text": "5.1.1",
     "image-size": "1.0.0",
     "intl": "1.2.5",
@@ -139,19 +139,19 @@
     "juice": "8.0.0",
     "keypair": "1.0.4",
     "knex": "0.21.21",
-    "knex-migrator": "4.0.5",
+    "knex-migrator": "4.1.0",
     "lodash": "4.17.21",
     "luxon": "2.0.2",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.24.9",
-    "metascraper-author": "5.24.9",
-    "metascraper-description": "5.24.9",
-    "metascraper-image": "5.24.9",
-    "metascraper-logo": "5.24.9",
-    "metascraper-logo-favicon": "5.24.9",
-    "metascraper-publisher": "5.24.9",
-    "metascraper-title": "5.24.9",
-    "metascraper-url": "5.24.9",
+    "metascraper": "5.25.0",
+    "metascraper-author": "5.25.0",
+    "metascraper-description": "5.25.0",
+    "metascraper-image": "5.25.0",
+    "metascraper-logo": "5.25.0",
+    "metascraper-logo-favicon": "5.25.0",
+    "metascraper-publisher": "5.25.0",
+    "metascraper-title": "5.25.0",
+    "metascraper-url": "5.25.0",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.3",