ghost 4.38.1 → 4.40.0

package/core/server/services/auth/setup.js

@@ -3,6 +3,7 @@ const config = require('../../../shared/config');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
+const moment = require('moment');
 const models = require('../../models');
 const mail = require('../mail');
 
@@ -16,6 +17,11 @@ const messages = {
     failedThemeInstall: 'Theme {themeName} didn\'t install because of the error: {error}'
 };
 
+const postSetupFixtures = {
+    'coming-soon': '{"version":"0.3.1","atoms":[],"cards":[],"markups":[["a",["href","#/portal/"]]],"sections":[[1,"p",[[0,[],0,"This is {{site.title}}, a brand new site by {{author.name}} that\'s just getting started. Things will be up and running here shortly, but you can "],[0,[0],1,"subscribe"],[0,[],0," in the meantime if you\'d like to stay up to date and receive emails when new content is published!"]]]],"ghostVersion":"4.0"}',
+    about: '{"version":"0.3.1","atoms":[],"cards":[["hr",{}]],"markups":[["a",["href","https://ghost.org"]]],"sections":[[1,"p",[[0,[],0,"{{site.title}} is an independent publication launched in {{date}} by {{author.name}}. If you subscribe today, you\'ll get full access to the website as well as email newsletters about new content when it\'s available. Your subscription makes this site possible, and allows {{site.title}} to continue to exist. Thank you!"]]],[1,"h3",[[0,[],0,"Access all areas"]]],[1,"p",[[0,[],0,"By signing up, you\'ll get access to the full archive of everything that\'s been published before and everything that\'s still to come. Your very own private library."]]],[1,"h3",[[0,[],0,"Fresh content, delivered"]]],[1,"p",[[0,[],0,"Stay up to date with new content sent straight to your inbox! No more worrying about whether you missed something because of a pesky algorithm or news feed."]]],[1,"h3",[[0,[],0,"Meet people like you"]]],[1,"p",[[0,[],0,"Join a community of other subscribers who share the same interests."]]],[10,0],[1,"h3",[[0,[],0,"Start your own thing"]]],[1,"p",[[0,[],0,"Enjoying the experience? Get started for free and set up your very own subscription business using "],[0,[0],1,"Ghost"],[0,[],0,", the same platform that powers this website."]]]],"ghostVersion":"4.0"}'
+};
+
 /**
  * Returns setup status
  *
@@ -110,14 +116,15 @@ async function doProduct(data, productsAPI) {
         return user;
     }
     try {
-        const page = await productsAPI.browse({limit: 1});
+        const page = await productsAPI.browse({limit: 'all'});
+
+        const product = page.products.find(p => p.slug === 'default-product');
 
-        const [product] = page.products;
         if (!product) {
             return data;
         }
 
-        productsAPI.edit({products: [{name: blogTitle.trim()}]}, {context: context.context, id: product.id});
+        await productsAPI.edit({products: [{name: blogTitle.trim()}]}, {context: context.context, id: product.id});
     } catch (e) {
         return data;
     }
@@ -125,6 +132,22 @@ async function doProduct(data, productsAPI) {
     return data;
 }
 
+async function doFixtures(data) {
+    const date = moment().format('MMMM YYYY');
+
+    _.each(postSetupFixtures, async (mobiledoc, key) => {
+        // Using very simple find and replace because we control the fixtures
+        mobiledoc = mobiledoc.replace(/{{site.title}}/g, data.userData.blogTitle);
+        mobiledoc = mobiledoc.replace(/{{author.name}}/g, data.userData.name);
+        mobiledoc = mobiledoc.replace(/{{date}}/, date);
+
+        const post = await models.Post.findOne({slug: key});
+        await models.Post.edit({mobiledoc}, {id: post.id});
+    });
+
+    return data;
+}
+
 function sendWelcomeEmail(email, mailAPI) {
     if (config.get('sendWelcomeEmail')) {
         const data = {
@@ -185,14 +208,6 @@ async function installTheme(data, api) {
     } catch (error) {
         //Fallback to Casper by doing nothing as the theme setting update is the last step
         logging.warn(tpl(messages.failedThemeInstall, {themeName, error: error.message}));
-
-        await api.notifications.add({
-            notifications: [{
-                custom: true, //avoids update-check from deleting the notification
-                type: 'warn',
-                message: 'The installation of the theme you have selected wasn\'t successful.'
-            }]
-        }, {context: {internal: true}});
     }
 
     return data;
@@ -204,6 +219,7 @@ module.exports = {
     setupUser: setupUser,
     doSettings: doSettings,
     doProduct: doProduct,
-    sendWelcomeEmail: sendWelcomeEmail,
-    installTheme: installTheme
+    installTheme: installTheme,
+    doFixtures: doFixtures,
+    sendWelcomeEmail: sendWelcomeEmail
 };

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

@@ -249,14 +249,14 @@ const retryFailedEmail = async (emailModel) => {
 async function handleUnsubscribeRequest(req) {
     if (!req.url) {
         throw new errors.BadRequestError({
-            message: 'Unsubscribe failed! Could not find member'
+            message: 'Email address not found.'
         });
     }
 
     const {query} = url.parse(req.url, true);
     if (!query || !query.uuid) {
         throw new errors.BadRequestError({
-            message: (query.preview ? 'Unsubscribe preview' : 'Unsubscribe failed! Could not find member')
+            message: (query.preview ? 'Unsubscribe preview' : 'Email address not found.')
         });
     }
 
@@ -266,7 +266,7 @@ async function handleUnsubscribeRequest(req) {
 
     if (!member) {
         throw new errors.BadRequestError({
-            message: 'Unsubscribe failed! Could not find member'
+            message: 'Email address not found.'
         });
     }
 
@@ -276,7 +276,7 @@ async function handleUnsubscribeRequest(req) {
     } catch (err) {
         throw new errors.InternalServerError({
             err,
-            message: 'Failed to unsubscribe member'
+            message: 'Failed to unsubscribe this email address'
         });
     }
 }

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

@@ -263,6 +263,7 @@ code {
 
 pre {
     white-space: pre-wrap;
+    overflow: auto;
     background: #15212A;
     padding: 15px;
     border-radius: 3px;
@@ -1216,7 +1217,7 @@ ${ templateSettings.showBadge ? `
 
                                     ${ templateSettings.showBadge ? `
                                     <tr>
-                                        <td class="footer-powered"><a href="https://ghost.org/"><img src="https://static.ghost.org/v4.0.0/images/powered.png" border="0" width="142" height="30" class="gh-powered" alt="Publish with Ghost"></a></td>
+                                        <td class="footer-powered"><a href="https://ghost.org/"><img src="https://static.ghost.org/v4.0.0/images/powered.png" border="0" width="142" height="30" class="gh-powered" alt="Powered by Ghost"></a></td>
                                     </tr>
                                     ` : '' }
                                 </table>

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

@@ -177,6 +177,7 @@ function createApiInstance(config) {
             StripeCustomer: models.MemberStripeCustomer,
             StripeCustomerSubscription: models.StripeCustomerSubscription,
             Member: models.Member,
+            MemberCancelEvent: models.MemberCancelEvent,
             MemberSubscribeEvent: models.MemberSubscribeEvent,
             MemberPaidSubscriptionEvent: models.MemberPaidSubscriptionEvent,
             MemberLoginEvent: models.MemberLoginEvent,

package/core/server/services/members/content-gating.js

@@ -1,4 +1,4 @@
-const nql = require('@nexes/nql');
+const nql = require('@tryghost/nql');
 
 // @ts-check
 /** @typedef { boolean } AccessFlag */

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

@@ -112,6 +112,7 @@ const getPortalProductPrices = async function () {
             benefits: product.benefits,
             active: product.active,
             type: product.type,
+            visibility: product.visibility,
             prices: productPrices
         };
     }).filter((product) => {

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

@@ -1,4 +1,4 @@
-const nql = require('@nexes/nql');
+const nql = require('@tryghost/nql');
 const {BadRequestError} = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 

package/core/server/services/themes/validate.js

@@ -28,20 +28,20 @@ const check = async function check(theme, isZip) {
         debug('zip mode');
         checkedTheme = await gscan.checkZip(theme, {
             keepExtractedDir: true,
-            checkVersion: 'canary',
+            checkVersion: 'v4',
             labs: labs.getAll()
         });
     } else {
         debug('non-zip mode');
         checkedTheme = await gscan.check(theme.path, {
-            checkVersion: 'canary',
+            checkVersion: 'v4',
             labs: labs.getAll()
         });
     }
 
     checkedTheme = gscan.format(checkedTheme, {
         onlyFatalErrors: config.get('env') === 'production',
-        checkVersion: 'canary'
+        checkVersion: 'v4'
     });
 
     debug('End: Check');

package/core/server/services/url/UrlGenerator.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const nql = require('@nexes/nql');
+const nql = require('@tryghost/nql');
 const debug = require('@tryghost/debug')('services:url:generator');
 const localUtils = require('../../../shared/url-utils');
 

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

@@ -41,6 +41,8 @@ class WebhooksService {
                     help: messages.nonExistingIntegrationIdProvided.help
                 });
             }
+
+            throw error;
         }
     }
 }

package/core/server/views/maintenance.html

@@ -44,7 +44,7 @@ body {
     flex-direction: column;
     justify-content: center;
     max-width: 500px;
-    min-height: 500px;
+    min-height: 360px;
     margin: 0 0 4vmin;
     padding: 40px;
     text-align: center;
@@ -63,7 +63,7 @@ h1 {
     letter-spacing: -0.02em;
 }
 p {
-    margin: 0 0 40px;
+    margin: 0;
     opacity: 0.7;
     font-weight: 400;
 }

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.38%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%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.40%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%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" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-f4c59dd57a2136df8b0a34f87c099034.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-77b93478f83b0def6ddc5a4f23ce963e.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-c814d3c4b3f543c4cd5ef3aacd0fc645.js"></script>
-                <script src="assets/ghost.min-6386b02480494a69c3bfe66206754836.js"></script>
+                <script src="assets/vendor.min-ed945ad80ea22f1d3ffeec6d5ae63aee.js"></script>
+                <script src="assets/ghost.min-88c665c3ba304b4f220d08b8bcf9d246.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.38%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%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.40%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%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" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-f4c59dd57a2136df8b0a34f87c099034.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-77b93478f83b0def6ddc5a4f23ce963e.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-c814d3c4b3f543c4cd5ef3aacd0fc645.js"></script>
-                <script src="assets/ghost.min-6386b02480494a69c3bfe66206754836.js"></script>
+                <script src="assets/vendor.min-ed945ad80ea22f1d3ffeec6d5ae63aee.js"></script>
+                <script src="assets/ghost.min-88c665c3ba304b4f220d08b8bcf9d246.js"></script>
             
 </body>
 </html>

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

@@ -25,9 +25,6 @@ module.exports = function setupApiApp() {
     apiApp.lazyUse(urlUtils.getVersionPath({version: 'canary', type: 'content'}), require('./canary/content/app'));
     apiApp.lazyUse(urlUtils.getVersionPath({version: 'canary', type: 'admin'}), require('./canary/admin/app'));
 
-    apiApp.lazyUse('/content/', require('./canary/content/app'));
-    apiApp.lazyUse('/admin/', require('./canary/admin/app'));
-
     // Error handling for requests to non-existent API versions
     apiApp.use(errorHandler.resourceNotFound);
     apiApp.use(errorHandler.handleJSONResponse(sentry));

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

@@ -29,6 +29,8 @@ const notImplemented = function (req, res, next) {
         users: ['GET'],
         themes: ['POST', 'PUT'],
         members: ['GET', 'PUT', 'DELETE', 'POST'],
+        tiers: ['GET', 'PUT', 'POST'],
+        offers: ['GET', 'PUT', 'POST'],
         config: ['GET'],
         schedules: ['PUT'],
         files: ['POST'],

package/core/server/web/parent/backend.js

@@ -1,5 +1,6 @@
 const debug = require('@tryghost/debug')('web:backend');
 const express = require('../../../shared/express');
+const {BASE_API_PATH} = require('../../../shared/url-utils');
 
 /**
  *
@@ -11,7 +12,7 @@ module.exports = () => {
     // Wrap the admin and API apps into a single express app for use with vhost
     const backendApp = express('backend');
 
-    backendApp.lazyUse('/ghost/api', require('../api'));
+    backendApp.lazyUse(BASE_API_PATH, require('../api'));
     backendApp.lazyUse('/ghost/oauth', require('../oauth'));
     backendApp.lazyUse('/ghost/.well-known', require('../well-known'));
 

package/core/server/web/shared/middleware/uncapitalise.js

@@ -27,7 +27,8 @@ const uncapitalise = (req, res, next) => {
     let decodedURI;
 
     const isSignupOrReset = pathToTest.match(/^(.*\/ghost\/(signup|reset)\/)/i);
-    const isAPI = pathToTest.match(/^(.*\/ghost\/api(\/(v[\d.]+|canary))?\/.*?\/)/i);
+    const isAPIRegExp = new RegExp(`^(.*${urlUtils.BASE_API_PATH}(/(v[\\d.]+|canary))?/.*?/)`, 'i');
+    const isAPI = pathToTest.match(isAPIRegExp);
 
     if (isSignupOrReset) {
         pathToTest = isSignupOrReset[1];

package/core/shared/config/defaults.json

@@ -128,8 +128,8 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~1.15.0/umd/portal.min.js",
-        "version": "1.15"
+        "url": "https://unpkg.com/@tryghost/portal@~1.17.0/umd/portal.min.js",
+        "version": "1.17"
     },
     "tenor": {
         "publicReadOnlyApiKey": null,

package/core/shared/config/overrides.json

@@ -79,11 +79,15 @@
     },
     "api": {
         "versions": {
-            "all": ["v2", "v3", "v4", "canary"],
+            "all": ["v2", "v3", "v4", "v5", "canary"],
             "default": "v4",
             "canary": {
-                "admin": "canary/admin",
-                "content": "canary/content"
+                "admin": "admin",
+                "content": "content"
+            },
+            "v5": {
+                "admin": "admin",
+                "content": "content"
             },
             "v4": {
                 "admin": "v4/admin",

package/core/shared/labs.js

@@ -15,13 +15,18 @@ const messages = {
 
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
 const GA_FEATURES = [
+    'multipleProducts',
+    'tierWelcomePages',
+    'tierName',
+    'selectablePortalLinks',
+    'membersTableStatus',
+    'improvedOnboarding'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
 const BETA_FEATURES = [
-    'activitypub',
-    'multipleProducts'
+    'activitypub'
 ];
 
 const ALPHA_FEATURES = [
@@ -30,14 +35,7 @@ const ALPHA_FEATURES = [
     'urlCache',
     'beforeAfterCard',
     'tweetGridCard',
-    'membersActivityFeed',
-    'improvedOnboarding',
-    'tierWelcomePages',
-    'tierName',
-    'membersTableStatus',
-    'membersLastSeenFilter',
-    'membersContainsFilters',
-    'selectablePortalLinks'
+    'membersActivityFeed'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/core/shared/url-utils.js

@@ -1,6 +1,8 @@
 const UrlUtils = require('@tryghost/url-utils');
 const config = require('./config');
 
+const BASE_API_PATH = '/ghost/api';
+
 const urlUtils = new UrlUtils({
     getSubdir: config.getSubdir,
     getSiteUrl: config.getSiteUrl,
@@ -9,7 +11,8 @@ const urlUtils = new UrlUtils({
     defaultApiVersion: config.get('api:versions:default'),
     slugs: config.get('slugs').protected,
     redirectCacheMaxAge: config.get('caching:301:maxAge'),
-    baseApiPath: '/ghost/api'
+    baseApiPath: BASE_API_PATH
 });
 
 module.exports = urlUtils;
+module.exports.BASE_API_PATH = BASE_API_PATH;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.38.1",
+  "version": "4.40.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -29,7 +29,8 @@
     "test": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js --timeout=60000",
     "test:all": "yarn test:unit && yarn test:integration && yarn test:e2e && yarn lint",
     "test:debug": "DEBUG=ghost:test* yarn test",
-    "test:unit": "c8 mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/unit' --timeout=2000",
+    "test:unit": "c8 yarn test:unit:base",
+    "test:unit:base": "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",
@@ -54,13 +55,12 @@
     "cli": "^1.17.0"
   },
   "dependencies": {
-    "@nexes/nql": "0.6.0",
-    "@sentry/node": "6.18.1",
+    "@sentry/node": "6.18.2",
     "@tryghost/adapter-manager": "0.2.28",
-    "@tryghost/admin-api-schema": "2.10.0",
-    "@tryghost/bookshelf-plugins": "0.3.10",
+    "@tryghost/admin-api-schema": "2.12.0",
+    "@tryghost/bookshelf-plugins": "0.3.11",
     "@tryghost/bootstrap-socket": "0.2.17",
-    "@tryghost/color-utils": "0.1.8",
+    "@tryghost/color-utils": "0.1.10",
     "@tryghost/config-url-helpers": "0.1.5",
     "@tryghost/constants": "1.0.2",
     "@tryghost/custom-theme-settings-service": "0.3.1",
@@ -69,9 +69,9 @@
     "@tryghost/domain-events": "0.1.8",
     "@tryghost/email-analytics-provider-mailgun": "1.0.7",
     "@tryghost/email-analytics-service": "1.0.5",
-    "@tryghost/errors": "1.2.3",
+    "@tryghost/errors": "1.2.5",
     "@tryghost/express-dynamic-redirects": "0.2.6",
-    "@tryghost/helpers": "1.1.57",
+    "@tryghost/helpers": "1.1.59",
     "@tryghost/image-transform": "1.0.28",
     "@tryghost/job-manager": "0.8.20",
     "@tryghost/kg-card-factory": "3.1.2",
@@ -81,22 +81,23 @@
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.4",
     "@tryghost/limit-service": "1.0.10",
     "@tryghost/logging": "2.0.4",
-    "@tryghost/magic-link": "1.0.20",
+    "@tryghost/magic-link": "1.0.21",
     "@tryghost/member-events": "0.4.0",
-    "@tryghost/members-api": "5.0.4",
+    "@tryghost/members-api": "5.4.0",
     "@tryghost/members-events-service": "0.3.1",
     "@tryghost/members-importer": "0.5.3",
-    "@tryghost/members-offers": "0.10.8",
+    "@tryghost/members-offers": "0.10.9",
     "@tryghost/members-ssr": "1.0.22",
-    "@tryghost/members-stripe-service": "0.8.4",
+    "@tryghost/members-stripe-service": "0.9.1",
     "@tryghost/metrics": "1.0.6",
     "@tryghost/minifier": "0.1.11",
-    "@tryghost/mw-error-handler": "0.1.3",
+    "@tryghost/mw-error-handler": "0.1.4",
     "@tryghost/mw-session-from-token": "0.1.28",
-    "@tryghost/nodemailer": "0.3.13",
+    "@tryghost/nodemailer": "0.3.14",
+    "@tryghost/nql": "0.9.0",
     "@tryghost/package-json": "1.0.16",
     "@tryghost/promise": "0.1.15",
-    "@tryghost/request": "0.1.16",
+    "@tryghost/request": "0.1.17",
     "@tryghost/root-utils": "0.3.11",
     "@tryghost/security": "0.2.15",
     "@tryghost/session-service": "0.1.38",
@@ -105,8 +106,8 @@
     "@tryghost/string": "0.1.23",
     "@tryghost/tpl": "0.1.12",
     "@tryghost/update-check-service": "0.3.1",
-    "@tryghost/url-utils": "2.0.7",
-    "@tryghost/validator": "0.1.14",
+    "@tryghost/url-utils": "2.0.8",
+    "@tryghost/validator": "0.1.15",
     "@tryghost/verification-trigger": "0.1.5",
     "@tryghost/version": "0.1.11",
     "@tryghost/vhost-middleware": "1.0.22",
@@ -116,9 +117,9 @@
     "bluebird": "3.7.2",
     "body-parser": "1.19.2",
     "bookshelf": "1.2.0",
-    "bookshelf-relations": "2.3.0",
+    "bookshelf-relations": "2.4.0",
     "brute-knex": "4.0.1",
-    "bson-objectid": "2.0.2",
+    "bson-objectid": "2.0.3",
     "bthreads": "0.5.1",
     "cheerio": "0.22.0",
     "compression": "1.7.4",
@@ -148,19 +149,19 @@
     "juice": "8.0.0",
     "keypair": "1.0.4",
     "knex": "0.21.21",
-    "knex-migrator": "4.2.2",
+    "knex-migrator": "4.2.3",
     "lodash": "4.17.21",
     "luxon": "2.3.1",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.25.8",
-    "metascraper-author": "5.25.8",
-    "metascraper-description": "5.25.8",
-    "metascraper-image": "5.25.8",
-    "metascraper-logo": "5.25.8",
-    "metascraper-logo-favicon": "5.25.8",
-    "metascraper-publisher": "5.25.8",
-    "metascraper-title": "5.25.8",
-    "metascraper-url": "5.25.8",
+    "metascraper": "5.26.0",
+    "metascraper-author": "5.26.0",
+    "metascraper-description": "5.26.0",
+    "metascraper-image": "5.26.0",
+    "metascraper-logo": "5.26.0",
+    "metascraper-logo-favicon": "5.26.0",
+    "metascraper-publisher": "5.26.0",
+    "metascraper-title": "5.26.0",
+    "metascraper-url": "5.26.0",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.4",
@@ -171,7 +172,7 @@
     "passport": "0.5.2",
     "passport-google-oauth": "2.0.0",
     "path-match": "1.2.4",
-    "probe-image-size": "5.0.0",
+    "probe-image-size": "7.2.3",
     "rss": "1.2.2",
     "sanitize-html": "2.7.0",
     "semver": "7.3.5",
@@ -187,11 +188,11 @@
   "devDependencies": {
     "@lodder/grunt-postcss": "3.1.1",
     "@playwright/test": "1.19.2",
-    "@tryghost/express-test": "0.6.0",
+    "@tryghost/express-test": "0.6.1",
     "c8": "7.11.0",
     "coffeescript": "2.6.1",
-    "cssnano": "5.1.0",
-    "eslint": "8.10.0",
+    "cssnano": "5.1.2",
+    "eslint": "8.11.0",
     "eslint-plugin-ghost": "2.13.0",
     "grunt": "1.4.1",
     "grunt-bg-shell": "2.3.3",
@@ -205,12 +206,12 @@
     "grunt-subgrunt": "1.3.0",
     "grunt-update-submodules": "0.4.1",
     "jwks-rsa": "2.0.5",
-    "mocha": "9.2.1",
+    "mocha": "9.2.2",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "0.4.10",
     "nock": "13.2.4",
     "papaparse": "5.3.1",
-    "postcss": "8.4.7",
+    "postcss": "8.4.8",
     "rewire": "6.0.0",
     "should": "13.2.3",
     "sinon": "13.0.1",