ghost 6.0.4 → 6.0.6

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

@@ -74,7 +74,7 @@ const {getDateBoundaries, applyDateFilter} = require('./utils/date-utils');
 /**
  * @typedef {Object} NewsletterSubscriberStats
  * @property {number} total - Total current subscriber count
- * @property {Array<{date: string, value: number}>} deltas - Daily subscription deltas
+ * @property {Array<{date: string, value: number}>} values - Daily subscription cumulative values
  */
 
 class PostsStatsService {
@@ -932,7 +932,7 @@ class PostsStatsService {
      * @param {string} [options.date_from] - Optional start date filter (YYYY-MM-DD)
      * @param {string} [options.date_to] - Optional end date filter (YYYY-MM-DD)
      * @param {string} [options.timezone] - Timezone to use for date interpretation
-     * @returns {Promise<{data: Array<{total: number, deltas: Array<{date: string, value: number}>}>}>} The newsletter subscriber stats
+     * @returns {Promise<{data: Array<{total: number, values: Array<{date: string, value: number}>}>}>} The newsletter subscriber stats with cumulative values
      */
     async getNewsletterSubscriberStats(newsletterId, options = {}) {
         try {
@@ -956,25 +956,42 @@ class PostsStatsService {
             const totalValue = totalResult[0] ? totalResult[0].total : 0;
             const total = parseInt(String(totalValue), 10);
 
-            // Transform raw database results to properly typed objects
-            const deltas = [];
+            // Transform raw database results (daily changes) to cumulative values
+            const values = [];
+            let cumulativeTotal = 0;
+            
+            // First pass: collect all daily changes from database
+            const dailyChanges = [];
             for (const row of rawDeltas) {
                 if (row) {
                     // @ts-ignore
                     const dateValue = row.date || '';
                     // @ts-ignore
-                    const deltaValue = row.value || 0;
-                    deltas.push({
+                    const changeValue = row.value || 0;
+                    dailyChanges.push({
                         date: String(dateValue),
-                        value: parseInt(String(deltaValue), 10)
+                        change: parseInt(String(changeValue), 10)
                     });
                 }
             }
+            
+            // Calculate the starting point by working backwards from the current total
+            const totalChange = dailyChanges.reduce((sum, item) => sum + item.change, 0);
+            cumulativeTotal = total - totalChange;
+            
+            // Second pass: build cumulative values from daily changes
+            for (const dayData of dailyChanges) {
+                cumulativeTotal += dayData.change;
+                values.push({
+                    date: dayData.date,
+                    value: cumulativeTotal
+                });
+            }
 
             return {
                 data: [{
                     total,
-                    deltas
+                    values
                 }]
             };
         } catch (error) {
@@ -982,7 +999,7 @@ class PostsStatsService {
             return {
                 data: [{
                     total: 0,
-                    deltas: []
+                    values: []
                 }]
             };
         }

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

@@ -156,7 +156,7 @@ class StatsService {
         
         // If no newsletterId is provided, we can't get specific stats
         if (!newsletterId) {
-            return {data: [{total: 0, deltas: []}]};
+            return {data: [{total: 0, values: []}]};
         }
         
         const result = await this.posts.getNewsletterSubscriberStats(newsletterId, otherOptions);

package/core/shared/config/defaults.json

@@ -212,7 +212,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.51"
+        "version": "2.52"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",
@@ -229,7 +229,7 @@
     },
     "signupForm": {
         "url": "https://cdn.jsdelivr.net/ghost/signup-form@~{version}/umd/signup-form.min.js",
-        "version": "0.2"
+        "version": "0.3"
     },
     "tenor": {
         "googleApiKey": null,

package/core/shared/labs.js

@@ -46,7 +46,8 @@ const PRIVATE_FEATURES = [
     'urlCache',
     'lexicalIndicators',
     'contentVisibilityAlpha',
-    'emailCustomization'
+    'emailCustomization',
+    'membersSigninOTC'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/ghost.js

@@ -17,7 +17,6 @@ switch (mode) {
 case 'repl':
 case 'timetravel':
 case 'generate-data':
-case 'record-test':
     require('./core/cli/command').run(mode);
     break;
 default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.0.4",
+  "version": "6.0.6",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -70,7 +70,7 @@
     "@faker-js/faker": "7.6.0",
     "@isaacs/ttlcache": "1.4.1",
     "@sentry/node": "7.120.4",
-    "@slack/webhook": "7.0.5",
+    "@slack/webhook": "7.0.6",
     "@tryghost/adapter-base-cache": "0.1.17",
     "@tryghost/admin-api-schema": "4.5.10",
     "@tryghost/api-framework": "1.0.2",
@@ -86,7 +86,7 @@
     "@tryghost/helpers": "1.1.97",
     "@tryghost/html-to-plaintext": "1.0.4",
     "@tryghost/http-cache-utils": "0.1.20",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.4.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.6.tgz",
     "@tryghost/image-transform": "1.4.6",
     "@tryghost/job-manager": "1.0.3",
     "@tryghost/kg-card-factory": "5.1.2",
@@ -161,7 +161,7 @@
     "ghost-storage-base": "1.0.0",
     "glob": "8.1.0",
     "got": "11.8.6",
-    "gscan": "5.0.0",
+    "gscan": "5.1.0",
     "handlebars": "4.7.8",
     "heic-convert": "2.1.0",
     "html-to-text": "5.1.1",
@@ -216,7 +216,7 @@
     "superagent-throttle": "1.0.1",
     "terser": "5.43.1",
     "tiny-glob": "0.2.9",
-    "ua-parser-js": "1.0.40",
+    "ua-parser-js": "1.0.41",
     "xml": "1.0.1"
   },
   "optionalDependencies": {
@@ -232,14 +232,14 @@
     "@types/bookshelf": "1.2.9",
     "@types/common-tags": "1.8.4",
     "@types/jsonwebtoken": "9.0.10",
-    "@types/node": "22.17.2",
+    "@types/node": "22.18.0",
     "@types/node-jose": "1.1.13",
-    "@types/nodemailer": "6.4.18",
+    "@types/nodemailer": "6.4.19",
     "@types/sinon": "17.0.4",
     "@types/supertest": "6.0.3",
     "c8": "10.1.3",
     "cli-progress": "3.12.0",
-    "cssnano": "7.1.0",
+    "cssnano": "7.1.1",
     "detect-indent": "6.1.0",
     "detect-newline": "3.1.0",
     "expect": "29.7.0",
@@ -258,13 +258,13 @@
     "parse-prometheus-text-format": "1.1.1",
     "postcss": "8.5.6",
     "postcss-cli": "11.0.1",
-    "rewire": "6.0.0",
+    "rewire": "8.0.0",
     "should": "13.2.3",
     "sinon": "18.0.1",
     "supertest": "6.3.4",
     "tmp": "0.2.3",
     "toml": "3.0.0",
-    "tsx": "4.20.4",
+    "tsx": "4.20.5",
     "typescript": "5.8.3"
   },
   "resolutions": {
@@ -273,7 +273,7 @@
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.4.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.6.tgz"
   },
   "nx": {
     "targets": {