ghost 4.42.1 → 4.43.0

package/core/server/services/stats/lib/members-stats-service.js

@@ -1,4 +1,4 @@
-const {DateTime} = require('luxon');
+const moment = require('moment');
 
 class MembersStatsService {
     constructor({db}) {
@@ -28,8 +28,8 @@ class MembersStatsService {
     }
 
     /**
-     * Get the member deltas by status for all days (from new to old)
-     * @returns {Promise<MemberStatusDelta[]>} The deltas of paid, free and comped users per day, sorted from new to old
+     * Get the member deltas by status for all days, sorted ascending
+     * @returns {Promise<MemberStatusDelta[]>} The deltas of paid, free and comped users per day, sorted ascending
      */
     async fetchAllStatusDeltas() {
         const knex = this.db.knex;
@@ -54,7 +54,7 @@ class MembersStatsService {
                 ELSE 0 END
             ) as free_delta`))
             .groupByRaw('DATE(created_at)')
-            .orderByRaw('DATE(created_at) DESC');
+            .orderByRaw('DATE(created_at)');
         return rows;
     }
 
@@ -69,22 +69,26 @@ class MembersStatsService {
         const totals = await this.getCount();
         let {paid, free, comped} = totals;
 
-        // Get today in UTC (default timezone for Luxon)
-        const today = DateTime.local().toISODate();
+        // Get today in UTC (default timezone)
+        const today = moment().format('YYYY-MM-DD');
 
         const cumulativeResults = [];
-        for (const row of rows) {
+
+        // Loop in reverse order (needed to have correct sorted result)
+        for (let i = rows.length - 1; i >= 0; i -= 1) {
+            const row = rows[i];
+
             // Convert JSDates to YYYY-MM-DD (in UTC)
-            const date = DateTime.fromJSDate(row.date).toISODate();
+            const date = moment(row.date).format('YYYY-MM-DD');
             if (date > today) {
                 // Skip results that are in the future (fix for invalid events)
                 continue;
             }
             cumulativeResults.unshift({
                 date,
-                paid,
-                free,
-                comped,
+                paid: Math.max(0, paid),
+                free: Math.max(0, free),
+                comped: Math.max(0, comped),
 
                 // Deltas
                 paid_subscribed: row.paid_subscribed,
@@ -92,36 +96,28 @@ class MembersStatsService {
             });
 
             // Update current counts
-            paid = Math.max(0, paid - row.paid_subscribed + row.paid_canceled);
-            free = Math.max(0, free - row.free_delta);
-            comped = Math.max(0, comped - row.comped_delta);
+            paid -= row.paid_subscribed - row.paid_canceled;
+            free -= row.free_delta;
+            comped -= row.comped_delta;
         }
 
-        // Always make sure we have at least one result
-        if (cumulativeResults.length === 0) {
-            cumulativeResults.push({
-                date: today,
-                paid,
-                free,
-                comped,
+        // Now also add the oldest day we have left over (this one will be zero, which is also needed as a data point for graphs)
+        const oldestDate = rows.length > 0 ? moment(rows[0].date).add(-1, 'days').format('YYYY-MM-DD') : today;
 
-                // Deltas
-                paid_subscribed: 0,
-                paid_canceled: 0
-            });
-        }
+        cumulativeResults.unshift({
+            date: oldestDate,
+            paid: Math.max(0, paid),
+            free: Math.max(0, free),
+            comped: Math.max(0, comped),
+
+            // Deltas
+            paid_subscribed: 0,
+            paid_canceled: 0
+        });
 
         return {
             data: cumulativeResults,
             meta: {
-                pagination: {
-                    page: 1,
-                    limit: 'all',
-                    pages: 1,
-                    total: cumulativeResults.length,
-                    next: null,
-                    prev: null
-                },
                 totals
             }
         };

package/core/server/services/stats/lib/mrr-stats-service.js

@@ -0,0 +1,154 @@
+const moment = require('moment');
+
+class MrrStatsService {
+    constructor({db}) {
+        this.db = db;
+    }
+
+    /**
+     * Get the current total MRR, grouped by currency (ascending order)
+     * @returns {Promise<MrrByCurrency[]>}
+     */
+    async getCurrentMrr() {
+        const knex = this.db.knex;
+        const rows = await knex('members_stripe_customers_subscriptions')
+            .select(knex.raw(`plan_currency as currency`))
+            .select(knex.raw(`SUM(
+                CASE WHEN plan_interval = 'year' THEN
+                    FLOOR(plan_amount / 12)
+                ELSE 
+                    plan_amount
+                END
+            ) AS mrr`))
+            .whereIn('status', ['active', 'unpaid', 'past_due'])
+            .where('cancel_at_period_end', 0)
+            .groupBy('plan_currency')
+            .orderBy('currency');
+
+        if (rows.length === 0) {
+            // Add a USD placeholder to always have at least one currency
+            rows.push({
+                currency: 'usd',
+                mrr: 0
+            });
+        }
+
+        return rows;
+    }
+
+    /**
+     * Get the MRR deltas for all days (from old to new), grouped by currency (ascending alphabetically)
+     * @returns {Promise<MrrDelta[]>} The deltas sorted from new to old
+     */
+    async fetchAllDeltas() {
+        const knex = this.db.knex;
+        const rows = await knex('members_paid_subscription_events')
+            .select('currency')
+            // In SQLite, DATE(created_at) would map to a string value, while DATE(created_at) would map to a JSDate object in MySQL
+            // That is why we need the cast here (to have some consistency)
+            .select(knex.raw('CAST(DATE(created_at) as CHAR) as date'))
+            .select(knex.raw(`SUM(mrr_delta) as delta`))
+            .groupByRaw('CAST(DATE(created_at) as CHAR), currency')
+            .orderByRaw('CAST(DATE(created_at) as CHAR), currency');
+        return rows;
+    }
+
+    /**
+     * Returns a list of the MRR history for each day and currency, including the current MRR per currency as meta data. 
+     * The respons is in ascending date order, and currencies for the same date are always in ascending order.
+     * @returns {Promise<MrrHistory>}
+     */
+    async getHistory() {
+        // Fetch current total amounts and start counting from there
+        const totals = await this.getCurrentMrr();
+
+        const rows = await this.fetchAllDeltas();
+
+        // Get today in UTC (default timezone)
+        const today = moment().format('YYYY-MM-DD');
+
+        const results = [];
+
+        // Create a map of the totals by currency for fast lookup and editing
+        const currentTotals = {};
+        for (const total of totals) {
+            currentTotals[total.currency] = total.mrr;
+        }
+
+        // Loop in reverse order (needed to have correct sorted result)
+        for (let i = rows.length - 1; i >= 0; i -= 1) {
+            const row = rows[i];
+
+            if (currentTotals[row.currency] === undefined) {
+                // Skip unexpected currencies that are not in the totals
+                continue;
+            }
+
+            // Convert JSDates to YYYY-MM-DD (in UTC)
+            const date = moment(row.date).format('YYYY-MM-DD');
+            
+            if (date > today) {
+                // Skip results that are in the future for some reason
+                continue;
+            }
+
+            results.unshift({
+                date,
+                mrr: Math.max(0, currentTotals[row.currency]),
+                currency: row.currency
+            });
+
+            currentTotals[row.currency] -= row.delta;
+        }
+
+        // Now also add the oldest days we have left over and do not have deltas
+        const oldestDate = rows.length > 0 ? moment(rows[0].date).add(-1, 'days').format('YYYY-MM-DD') : today;
+        
+        // Note that we also need to loop the totals in reverse order because we need to unshift
+        for (let i = totals.length - 1; i >= 0; i -= 1) {
+            const total = totals[i];
+            results.unshift({
+                date: oldestDate,
+                mrr: Math.max(0, currentTotals[total.currency]),
+                currency: total.currency
+            });
+        }
+        
+        return {
+            data: results,
+            meta: {
+                totals
+            }
+        };
+    }
+}
+
+module.exports = MrrStatsService;
+
+/**
+ * @typedef MrrByCurrency
+ * @type {Object}
+ * @property {number} mrr
+ * @property {string} currency
+ */
+
+/**
+ * @typedef MrrDelta
+ * @type {Object}
+ * @property {Date} date
+ * @property {string} currency
+ * @property {number} delta MRR change on this day
+ */
+
+/**
+ * @typedef {Object} MrrRecord
+ * @property {string} date In YYYY-MM-DD format
+ * @property {string} currency
+ * @property {number} mrr MRR on this day
+ */
+
+/**
+ * @typedef {Object} MrrHistory
+ * @property {MrrRecord[]} data List of the total members by status for each day, including the paid deltas paid_subscribed and paid_canceled
+ * @property {Object} meta
+ */

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

@@ -1,6 +1,8 @@
 const db = require('../../data/db');
 const MemberStatsService = require('./lib/members-stats-service');
+const MrrStatsService = require('./lib/mrr-stats-service');
 
 module.exports = {
-    members: new MemberStatsService({db})
+    members: new MemberStatsService({db}),
+    mrr: new MrrStatsService({db})
 };

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

@@ -12,6 +12,7 @@ const {getConfig} = require('./config');
 async function configureApi() {
     const cfg = getConfig(settings, config, urlUtils);
     if (cfg) {
+        cfg.testEnv = process.env.NODE_ENV.startsWith('test');
         await module.exports.configure(cfg);
         return true;
     }

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.42%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.43%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-ba66b98f7c24fa40e061c7ffc94f4e23.css">
-                <link rel="stylesheet" href="assets/ghost.min-ce35ef1b76d9a943ab912c076773b132.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-38f3c38c0c6a1864f57079b068a0b0ce.css" title="light">
             
 
     
@@ -57,7 +57,7 @@
 
 
                 <script src="assets/vendor.min-21f79c68a284acb1b70039f3f63e5507.js"></script>
-                <script src="assets/ghost.min-20096eef632760c3a2906e243adbd24b.js"></script>
+                <script src="assets/ghost.min-2a278873d60d6a13a4c05a396e5bed5e.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.42%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.43%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-ba66b98f7c24fa40e061c7ffc94f4e23.css">
-                <link rel="stylesheet" href="assets/ghost.min-ce35ef1b76d9a943ab912c076773b132.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-38f3c38c0c6a1864f57079b068a0b0ce.css" title="light">
             
 
     
@@ -57,7 +57,7 @@
 
 
                 <script src="assets/vendor.min-21f79c68a284acb1b70039f3f63e5507.js"></script>
-                <script src="assets/ghost.min-20096eef632760c3a2906e243adbd24b.js"></script>
+                <script src="assets/ghost.min-2a278873d60d6a13a4c05a396e5bed5e.js"></script>
             
 </body>
 </html>

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

@@ -139,6 +139,7 @@ module.exports = function apiRoutes() {
 
     // ## Stats
     router.get('/stats/member_count', mw.authAdminApi, http(api.stats.memberCountHistory));
+    router.get('/stats/mrr', mw.authAdminApi, http(api.stats.mrr));
 
     // ## Labels
     router.get('/labels', mw.authAdminApi, http(api.labels.browse));

package/core/shared/config/defaults.json

@@ -128,8 +128,8 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~1.18.0/umd/portal.min.js",
-        "version": "1.18"
+        "url": "https://unpkg.com/@tryghost/portal@~1.19.0/umd/portal.min.js",
+        "version": "1.19"
     },
     "tenor": {
         "publicReadOnlyApiKey": null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.42.1",
+  "version": "4.43.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -55,22 +55,22 @@
     "cli": "^1.17.0"
   },
   "dependencies": {
-    "@sentry/node": "6.19.3",
+    "@sentry/node": "6.19.6",
     "@tryghost/adapter-manager": "0.2.28",
-    "@tryghost/admin-api-schema": "2.12.1",
-    "@tryghost/bookshelf-plugins": "0.3.15",
+    "@tryghost/admin-api-schema": "2.13.0",
+    "@tryghost/bookshelf-plugins": "0.3.18",
     "@tryghost/bootstrap-socket": "0.2.17",
     "@tryghost/color-utils": "0.1.12",
     "@tryghost/config-url-helpers": "0.1.5",
     "@tryghost/constants": "1.0.2",
     "@tryghost/custom-theme-settings-service": "0.3.2",
-    "@tryghost/database-info": "0.3.0",
+    "@tryghost/database-info": "0.3.1",
     "@tryghost/debug": "0.1.14",
     "@tryghost/domain-events": "0.1.9",
     "@tryghost/email-analytics-provider-mailgun": "1.0.8",
     "@tryghost/email-analytics-service": "1.0.6",
-    "@tryghost/errors": "1.2.7",
-    "@tryghost/express-dynamic-redirects": "0.2.7",
+    "@tryghost/errors": "1.2.10",
+    "@tryghost/express-dynamic-redirects": "0.2.8",
     "@tryghost/helpers": "1.1.62",
     "@tryghost/image-transform": "1.0.29",
     "@tryghost/job-manager": "0.8.21",
@@ -80,24 +80,24 @@
     "@tryghost/kg-markdown-html-renderer": "5.1.5",
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.5",
     "@tryghost/limit-service": "1.0.10",
-    "@tryghost/logging": "2.1.2",
+    "@tryghost/logging": "2.1.5",
     "@tryghost/magic-link": "1.0.21",
     "@tryghost/member-events": "0.4.1",
-    "@tryghost/members-api": "5.4.1",
-    "@tryghost/members-events-service": "0.3.2",
-    "@tryghost/members-importer": "0.5.6",
+    "@tryghost/members-api": "5.6.1",
+    "@tryghost/members-events-service": "0.3.3",
+    "@tryghost/members-importer": "0.5.7",
     "@tryghost/members-offers": "0.10.9",
     "@tryghost/members-ssr": "1.0.23",
-    "@tryghost/members-stripe-service": "0.9.2",
+    "@tryghost/members-stripe-service": "0.9.4",
     "@tryghost/metrics": "1.0.8",
     "@tryghost/minifier": "0.1.12",
-    "@tryghost/mw-error-handler": "0.1.7",
+    "@tryghost/mw-error-handler": "0.2.0",
     "@tryghost/mw-session-from-token": "0.1.28",
-    "@tryghost/nodemailer": "0.3.17",
+    "@tryghost/nodemailer": "0.3.20",
     "@tryghost/nql": "0.9.1",
     "@tryghost/package-json": "1.0.18",
     "@tryghost/promise": "0.1.15",
-    "@tryghost/request": "0.1.21",
+    "@tryghost/request": "0.1.24",
     "@tryghost/root-utils": "0.3.12",
     "@tryghost/security": "0.2.15",
     "@tryghost/session-service": "0.1.38",
@@ -107,7 +107,7 @@
     "@tryghost/tpl": "0.1.14",
     "@tryghost/update-check-service": "0.3.2",
     "@tryghost/url-utils": "2.1.0",
-    "@tryghost/validator": "0.1.19",
+    "@tryghost/validator": "0.1.22",
     "@tryghost/verification-trigger": "0.1.6",
     "@tryghost/version": "0.1.12",
     "@tryghost/vhost-middleware": "1.0.22",
@@ -115,7 +115,7 @@
     "amperize": "0.6.1",
     "analytics-node": "6.0.0",
     "bluebird": "3.7.2",
-    "body-parser": "1.19.2",
+    "body-parser": "1.20.0",
     "bookshelf": "1.2.0",
     "bookshelf-relations": "2.4.0",
     "brute-knex": "4.0.1",
@@ -148,20 +148,20 @@
     "jsonwebtoken": "8.5.1",
     "juice": "8.0.0",
     "keypair": "1.0.4",
-    "knex": "1.0.4",
-    "knex-migrator": "4.2.5",
+    "knex": "1.0.5",
+    "knex-migrator": "4.2.6",
     "lodash": "4.17.21",
     "luxon": "2.3.1",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.28.2",
-    "metascraper-author": "5.28.2",
-    "metascraper-description": "5.28.2",
-    "metascraper-image": "5.28.2",
-    "metascraper-logo": "5.28.2",
-    "metascraper-logo-favicon": "5.28.5",
-    "metascraper-publisher": "5.28.2",
-    "metascraper-title": "5.28.2",
-    "metascraper-url": "5.28.2",
+    "metascraper": "5.29.0",
+    "metascraper-author": "5.29.0",
+    "metascraper-description": "5.29.0",
+    "metascraper-image": "5.29.0",
+    "metascraper-logo": "5.29.0",
+    "metascraper-logo-favicon": "5.29.0",
+    "metascraper-publisher": "5.29.0",
+    "metascraper-title": "5.29.0",
+    "metascraper-url": "5.29.0",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.4",
@@ -175,7 +175,7 @@
     "probe-image-size": "7.2.3",
     "rss": "1.2.2",
     "sanitize-html": "2.7.0",
-    "semver": "7.3.5",
+    "semver": "7.3.6",
     "stoppable": "1.1.0",
     "tough-cookie": "4.0.0",
     "uuid": "8.3.2",
@@ -187,11 +187,11 @@
   },
   "devDependencies": {
     "@lodder/grunt-postcss": "3.1.1",
-    "@playwright/test": "1.20.1",
-    "@tryghost/express-test": "0.8.0",
+    "@playwright/test": "1.20.2",
+    "@tryghost/express-test": "0.8.3",
     "c8": "7.11.0",
     "coffeescript": "2.6.1",
-    "cssnano": "5.1.6",
+    "cssnano": "5.1.7",
     "eslint": "8.12.0",
     "eslint-plugin-ghost": "2.13.0",
     "grunt": "1.4.1",
@@ -219,7 +219,7 @@
     "tmp": "0.2.1"
   },
   "resolutions": {
-    "@tryghost/logging": "2.1.2",
+    "@tryghost/logging": "2.1.5",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   }