ghost 4.41.3 → 4.42.0

package/core/server/data/migrations/versions/4.42/2022-03-21-17-17-add.js

@@ -0,0 +1,20 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('newsletters', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    name: {type: 'string', maxlength: 191, nullable: false},
+    description: {type: 'string', maxlength: 2000, nullable: true},
+    sender_name: {type: 'string', maxlength: 191, nullable: false},
+    sender_email: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+    sender_reply_to: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+    default: {type: 'bool', nullable: false, defaultTo: false},
+    status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'active'},
+    recipient_filter: {
+        type: 'text',
+        maxlength: 1000000000,
+        nullable: false,
+        defaultTo: ''
+    },
+    subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: false},
+    sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
+});

package/core/server/data/migrations/versions/4.42/2022-03-30-15-44-add-newsletter-permissions.js

@@ -0,0 +1,28 @@
+const {
+    addPermissionWithRoles,
+    combineTransactionalMigrations
+} = require('../../utils');
+
+module.exports = combineTransactionalMigrations(
+    addPermissionWithRoles({
+        name: 'Browse newsletters',
+        action: 'browse',
+        object: 'newsletter'
+    }, [
+        'Administrator'
+    ]),
+    addPermissionWithRoles({
+        name: 'Add newsletters',
+        action: 'add',
+        object: 'newsletter'
+    }, [
+        'Administrator'
+    ]),
+    addPermissionWithRoles({
+        name: 'Edit newsletters',
+        action: 'edit',
+        object: 'newsletter'
+    }, [
+        'Administrator'
+    ])
+);

package/core/server/data/schema/commands.js

@@ -80,18 +80,18 @@ function dropColumn(tableName, column, transaction = db.knex) {
  */
 async function addUnique(tableName, columns, transaction = db.knex) {
     try {
-        logging.info(`Adding unique constraint for: ${columns} in table ${tableName}`);
+        logging.info(`Adding unique constraint for '${columns}' in table '${tableName}'`);
 
         return await transaction.schema.table(tableName, function (table) {
             table.unique(columns);
         });
     } catch (err) {
         if (err.code === 'SQLITE_ERROR') {
-            logging.warn(`Constraint for: ${columns} already exists for table: ${tableName}`);
+            logging.warn(`Constraint for '${columns}' already exists for table '${tableName}'`);
             return;
         }
         if (err.code === 'ER_DUP_KEYNAME') {
-            logging.warn(`Constraint for: ${columns} already exists for table: ${tableName}`);
+            logging.warn(`Constraint for '${columns}' already exists for table '${tableName}'`);
             return;
         }
         throw err;
@@ -107,18 +107,18 @@ async function addUnique(tableName, columns, transaction = db.knex) {
  */
 async function dropUnique(tableName, columns, transaction = db.knex) {
     try {
-        logging.info(`Dropping unique constraint for: ${columns} in table: ${tableName}`);
+        logging.info(`Dropping unique constraint for '${columns}' in table '${tableName}'`);
 
         return await transaction.schema.table(tableName, function (table) {
             table.dropUnique(columns);
         });
     } catch (err) {
         if (err.code === 'SQLITE_ERROR') {
-            logging.warn(`Constraint for: ${columns} does not exist for table: ${tableName}`);
+            logging.warn(`Constraint for '${columns}' does not exist for table '${tableName}'`);
             return;
         }
         if (err.code === 'ER_CANT_DROP_FIELD_OR_KEY') {
-            logging.warn(`Constraint for: ${columns} does not exist for table: ${tableName}`);
+            logging.warn(`Constraint for '${columns}' does not exist for table '${tableName}'`);
             return;
         }
         throw err;
@@ -164,7 +164,7 @@ async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDele
     if (DatabaseInfo.isSQLite(transaction)) {
         const foreignKeyExists = await hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction});
         if (foreignKeyExists) {
-            logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key already exists`);
+            logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - already exists`);
             return;
         }
     }
@@ -195,7 +195,7 @@ async function addForeign({fromTable, fromColumn, toTable, toColumn, cascadeDele
         }
     } catch (err) {
         if (err.code === 'ER_DUP_KEY' || err.code === 'ER_FK_DUP_KEY' || err.code === 'ER_FK_DUP_NAME') {
-            logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key already exists`);
+            logging.warn(`Skipped adding foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - already exists`);
             return;
         }
         throw err;
@@ -216,7 +216,7 @@ async function dropForeign({fromTable, fromColumn, toTable, toColumn, transactio
     if (DatabaseInfo.isSQLite(transaction)) {
         const foreignKeyExists = await hasForeignSQLite({fromTable, fromColumn, toTable, toColumn, transaction});
         if (!foreignKeyExists) {
-            logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key does not exist`);
+            logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - does not exist`);
             return;
         }
     }
@@ -243,7 +243,7 @@ async function dropForeign({fromTable, fromColumn, toTable, toColumn, transactio
         }
     } catch (err) {
         if (err.code === 'ER_CANT_DROP_FIELD_OR_KEY') {
-            logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - foreign key does not exist`);
+            logging.warn(`Skipped dropping foreign key from ${fromTable}.${fromColumn} to ${toTable}.${toColumn} - does not exist`);
             return;
         }
         throw err;
@@ -280,18 +280,18 @@ async function addPrimaryKey(tableName, columns, transaction = db.knex) {
     if (DatabaseInfo.isSQLite(transaction)) {
         const primaryKeyExists = await hasPrimaryKeySQLite(tableName, transaction);
         if (primaryKeyExists) {
-            logging.warn(`Primary key constraint for: ${columns} already exists for table: ${tableName}`);
+            logging.warn(`Primary key constraint for '${columns}' already exists for table '${tableName}'`);
             return;
         }
     }
     try {
-        logging.info(`Adding primary key constraint for: ${columns} in table ${tableName}`);
+        logging.info(`Adding primary key constraint for '${columns}' in table '${tableName}'`);
         return await transaction.schema.table(tableName, function (table) {
             table.primary(columns);
         });
     } catch (err) {
         if (err.code === 'ER_MULTIPLE_PRI_KEY') {
-            logging.warn(`Primary key constraint for: ${columns} already exists for table: ${tableName}`);
+            logging.warn(`Primary key constraint for '${columns}' already exists for table '${tableName}'`);
             return;
         }
         throw err;

package/core/server/data/schema/schema.js

@@ -711,5 +711,23 @@ module.exports = {
             }
         },
         value: {type: 'text', maxlength: 65535, nullable: true}
+    },
+    newsletters: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        name: {type: 'string', maxlength: 191, nullable: false},
+        description: {type: 'string', maxlength: 2000, nullable: true},
+        sender_name: {type: 'string', maxlength: 191, nullable: false},
+        sender_email: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+        sender_reply_to: {type: 'string', maxlength: 191, nullable: false, validations: {isEmail: true}},
+        default: {type: 'bool', nullable: false, defaultTo: false},
+        status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'active'},
+        recipient_filter: {
+            type: 'text',
+            maxlength: 1000000000,
+            nullable: false,
+            defaultTo: ''
+        },
+        subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: false},
+        sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
     }
 };

package/core/server/models/newsletter.js

@@ -0,0 +1,9 @@
+const ghostBookshelf = require('./base');
+
+const Newsletter = ghostBookshelf.Model.extend({
+    tableName: 'newsletters'
+});
+
+module.exports = {
+    Newsletter: ghostBookshelf.model('Newsletter', Newsletter)
+};

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

@@ -198,48 +198,55 @@ h5,
 h6 {
     margin-top: 0;
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-    line-height: 1.15em;
-    font-weight: 600;
+    line-height: 1.11em;
+    font-weight: 700;
     text-rendering: optimizeLegibility;
 }
 
 h1 {
     margin: 1.5em 0 0.5em 0;
     font-size: 42px;
-    font-weight: 600;
+    font-weight: 700;
 }
 
 h2 {
     margin: 1.5em 0 0.5em 0;
     font-size: 32px;
-    line-height: 1.22em;
 }
 
 h3 {
     margin: 1.5em 0 0.5em 0;
     font-size: 26px;
-    line-height: 1.25em;
 }
 
 h4 {
     margin: 1.8em 0 0.5em 0;
     font-size: 21px;
-    line-height: 1.3em;
+    line-height: 1.2em;
 }
 
 h5 {
     margin: 2em 0 0.5em 0;
     font-size: 19px;
-    line-height: 1.4em;
+    line-height: 1.3em;
 }
 
 h6 {
     margin: 2em 0 0.5em 0;
     font-size: 19px;
-    line-height: 1.4em;
+    line-height: 1.3em;
     font-weight: 700;
 }
 
+h1 strong,
+h2 strong,
+h3 strong,
+h4 strong,
+h5 strong,
+h6 strong {
+    font-weight: 800;
+}
+
 strong {
     font-weight: 700;
 }
@@ -301,6 +308,10 @@ figure blockquote p {
 
 .site-info {
     padding-top: 50px;
+}
+
+.site-info-bordered {
+    padding-top: 50px;
     border-bottom: 1px solid #e5eff5;
 }
 
@@ -322,11 +333,12 @@ figure blockquote p {
     padding-bottom: 10px;
     font-size: 42px;
     line-height: 1.1em;
-    font-weight: 600;
+    font-weight: 700;
     text-align: center;
 }
 .post-title-serif {
     font-family: Georgia, serif;
+    letter-spacing: -0.01em;
 }
 .post-title-left {
     text-align: left;
@@ -388,7 +400,7 @@ figure blockquote p {
     font-family: Georgia, serif;
     font-size: 18px;
     line-height: 1.5em;
-    color: #23323D;
+    color: #15212A;
     padding-bottom: 20px;
     border-bottom: 1px solid #e5eff5;
 }
@@ -397,7 +409,7 @@ figure blockquote p {
     max-width: 600px !important;
     font-size: 17px;
     line-height: 1.5em;
-    color: #23323D;
+    color: #15212A;
     padding-bottom: 20px;
     border-bottom: 1px solid #e5eff5;
 }
@@ -711,7 +723,7 @@ a[data-flickr-embed] img {
 }
 
 .kg-header-card h3 strong {
-    font-weight: 600;
+    font-weight: 700;
 }
 
 .kg-header-card.kg-size-large h3 {
@@ -1148,7 +1160,7 @@ ${ templateSettings.showBadge ? `
 
                                     ${ templateSettings.showHeaderIcon || templateSettings.showHeaderTitle ? `
                                     <tr>
-                                        <td class="site-info" width="100%" align="center">
+                                        <td class="${templateSettings.showHeaderTitle ? `site-info-bordered` : `site-info`}" width="100%" align="center">
                                             <table role="presentation" border="0" cellpadding="0" cellspacing="0">
                                                 ${ templateSettings.showHeaderIcon && site.iconUrl ? `
                                                 <tr>

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

@@ -19,6 +19,7 @@ const VerificationTrigger = require('@tryghost/verification-trigger');
 const DomainEvents = require('@tryghost/domain-events');
 const {LastSeenAtUpdater} = require('@tryghost/members-events-service');
 const events = require('../../lib/common/events');
+const DatabaseInfo = require('@tryghost/database-info');
 
 const messages = {
     noLiveKeysInDevelopment: 'Cannot use live stripe keys in development. Please restart in production mode.',
@@ -37,7 +38,7 @@ const membersConfig = new MembersConfigProvider({
 const membersStats = new MembersStats({
     db: db,
     settingsCache: settingsCache,
-    isSQLite: config.get('database:client') === 'sqlite3'
+    isSQLite: DatabaseInfo.isSQLite(db.knex)
 });
 
 let membersApi;

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

@@ -0,0 +1 @@
+module.exports = require('./service');

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

@@ -0,0 +1,165 @@
+const {DateTime} = require('luxon');
+
+class MembersStatsService {
+    constructor({db}) {
+        this.db = db;
+    }
+
+    /**
+     * Get the current total members grouped by status
+     * @returns {Promise<TotalMembersByStatus>}
+     */
+    async getCount() {
+        const knex = this.db.knex;
+        const rows = await knex('members')
+            .select('status')
+            .select(knex.raw('COUNT(id) AS total'))
+            .groupBy('status');
+        
+        const paidEvent = rows.find(c => c.status === 'paid');
+        const freeEvent = rows.find(c => c.status === 'free');
+        const compedEvent = rows.find(c => c.status === 'comped');
+
+        return {
+            paid: paidEvent ? paidEvent.total : 0,
+            free: freeEvent ? freeEvent.total : 0,
+            comped: compedEvent ? compedEvent.total : 0
+        };
+    }
+
+    /**
+     * 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
+     */
+    async fetchAllStatusDeltas() {
+        const knex = this.db.knex;
+        const rows = await knex('members_status_events')
+            .select(knex.raw('DATE(created_at) as date'))
+            .select(knex.raw(`SUM(
+                CASE WHEN to_status='paid' THEN 1
+                ELSE 0 END
+            ) as paid_subscribed`))
+            .select(knex.raw(`SUM(
+                CASE WHEN from_status='paid' THEN 1
+                ELSE 0 END
+            ) as paid_canceled`))
+            .select(knex.raw(`SUM(
+                CASE WHEN to_status='comped' THEN 1
+                WHEN from_status='comped' THEN -1
+                ELSE 0 END
+            ) as comped_delta`))
+            .select(knex.raw(`SUM(
+                CASE WHEN to_status='free' THEN 1
+                WHEN from_status='free' THEN -1
+                ELSE 0 END
+            ) as free_delta`))
+            .groupByRaw('DATE(created_at)')
+            .orderByRaw('DATE(created_at) DESC');
+        return rows;
+    }
+
+    /**
+     * Returns a list of the total members by status for each day, including the paid deltas paid_subscribed and paid_canceled
+     * @returns {Promise<CountHistory>}
+     */
+    async getCountHistory() {
+        const rows = await this.fetchAllStatusDeltas();
+
+        // Fetch current total amounts and start counting from there
+        const totals = await this.getCount();
+        let {paid, free, comped} = totals;
+
+        // Get today in UTC (default timezone for Luxon)
+        const today = DateTime.local().toISODate();
+
+        const cumulativeResults = [];
+        for (const row of rows) {
+            // Convert JSDates to YYYY-MM-DD (in UTC)
+            const date = DateTime.fromJSDate(row.date).toISODate();
+            if (date > today) {
+                // Skip results that are in the future (fix for invalid events)
+                continue;
+            }
+            cumulativeResults.unshift({
+                date,
+                paid,
+                free,
+                comped,
+
+                // Deltas
+                paid_subscribed: row.paid_subscribed,
+                paid_canceled: row.paid_canceled
+            });
+
+            // 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);
+        }
+
+        // Always make sure we have at least one result
+        if (cumulativeResults.length === 0) {
+            cumulativeResults.push({
+                date: today,
+                paid,
+                free,
+                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
+            }
+        };
+    }
+}
+
+module.exports = MembersStatsService;
+
+/**
+ * @typedef MemberStatusDelta
+ * @type {Object}
+ * @property {Date} date
+ * @property {number} paid_subscribed Paid members that subscribed on this day
+ * @property {number} paid_canceled Paid members that canceled on this day
+ * @property {number} comped_delta Total net comped members on this day
+ * @property {number} free_delta Total net members on this day
+ */
+
+/**
+ * @typedef TotalMembersByStatus
+ * @type {Object}
+ * @property {number} paid Total paid members
+ * @property {number} free Total free members
+ * @property {number} comped Total comped members
+ */
+
+/**
+ * @typedef {Object} TotalMembersByStatusItem
+ * @property {string} date In YYYY-MM-DD format
+ * @property {number} paid Total paid members
+ * @property {number} free Total free members
+ * @property {number} comped Total comped members
+ * @property {number} paid_subscribed Paid members that subscribed on this day
+ * @property {number} paid_canceled Paid members that canceled on this day
+ */
+
+/**
+ * @typedef {Object} CountHistory
+ * @property {TotalMembersByStatusItem[]} 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

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

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

@@ -32,7 +32,9 @@ class WebhooksService {
             const newWebhook = await this.WebhookModel.add(data.webhooks[0], options);
             return newWebhook;
         } catch (error) {
-            if (error.errno === 1452 || (error.code === 'SQLITE_CONSTRAINT' && /SQLITE_CONSTRAINT: FOREIGN KEY constraint failed/.test(error.message))) {
+            if (error.errno === 1452
+                || (error.code === 'SQLITE_CONSTRAINT' && /SQLITE_CONSTRAINT: FOREIGN KEY constraint failed/.test(error.message))
+                || (error.code === 'SQLITE_CONSTRAINT_FOREIGNKEY')) {
                 throw new ValidationError({
                     message: tpl(messages.nonExistingIntegrationIdProvided.message, {
                         key: 'integration_id'

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.41%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.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="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,8 +37,8 @@
     </style>
 
     
-                <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-a73b150c7eecc4641d377cc73fb5eecd.css" title="light">
+                <link rel="stylesheet" href="assets/vendor.min-ba66b98f7c24fa40e061c7ffc94f4e23.css">
+                <link rel="stylesheet" href="assets/ghost.min-c08ce1872f0e09edb63eb13c43606d18.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-9094db77ba3190cb10876f8e42e1d90d.js"></script>
-                <script src="assets/ghost.min-1abf114ca26a71e8e1f09054f3592614.js"></script>
+                <script src="assets/vendor.min-21f79c68a284acb1b70039f3f63e5507.js"></script>
+                <script src="assets/ghost.min-20096eef632760c3a2906e243adbd24b.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.41%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.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="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,8 +37,8 @@
     </style>
 
     
-                <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-a73b150c7eecc4641d377cc73fb5eecd.css" title="light">
+                <link rel="stylesheet" href="assets/vendor.min-ba66b98f7c24fa40e061c7ffc94f4e23.css">
+                <link rel="stylesheet" href="assets/ghost.min-c08ce1872f0e09edb63eb13c43606d18.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-9094db77ba3190cb10876f8e42e1d90d.js"></script>
-                <script src="assets/ghost.min-1abf114ca26a71e8e1f09054f3592614.js"></script>
+                <script src="assets/vendor.min-21f79c68a284acb1b70039f3f63e5507.js"></script>
+                <script src="assets/ghost.min-20096eef632760c3a2906e243adbd24b.js"></script>
             
 </body>
 </html>

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

@@ -113,8 +113,6 @@ module.exports = function apiRoutes() {
 
     router.get('/members/stats/count', mw.authAdminApi, http(api.members.memberStats));
     router.get('/members/stats/mrr', mw.authAdminApi, http(api.members.mrrStats));
-    router.get('/members/stats/subscribers', mw.authAdminApi, http(api.members.subscriberStats));
-    router.get('/members/stats/gross_volume', mw.authAdminApi, http(api.members.grossVolumeStats));
 
     router.get('/members/events', mw.authAdminApi, http(api.members.activityFeed));
 
@@ -139,6 +137,9 @@ module.exports = function apiRoutes() {
 
     router.get('/members/:id/signin_urls', mw.authAdminApi, http(api.memberSigninUrls.read));
 
+    // ## Stats
+    router.get('/stats/member_count', mw.authAdminApi, http(api.stats.memberCountHistory));
+
     // ## Labels
     router.get('/labels', mw.authAdminApi, http(api.labels.browse));
     router.get('/labels/:id', mw.authAdminApi, http(api.labels.read));
@@ -290,6 +291,7 @@ module.exports = function apiRoutes() {
     router.get('/actions', mw.authAdminApi, http(api.actions.browse));
 
     // ## Email Preview
+    // @TODO: rename to email_previews in 5.0
     router.get('/email_preview/posts/:id', mw.authAdminApi, http(api.email_preview.read));
     router.post('/email_preview/posts/:id', mw.authAdminApi, http(api.email_preview.sendTestEmail));
 
@@ -309,5 +311,9 @@ module.exports = function apiRoutes() {
     router.get('/custom_theme_settings', mw.authAdminApi, http(api.customThemeSettings.browse));
     router.put('/custom_theme_settings', mw.authAdminApi, http(api.customThemeSettings.edit));
 
+    router.get('/newsletters', mw.authAdminApi, http(api.newsletters.browse));
+    router.post('/newsletters', mw.authAdminApi, http(api.newsletters.add));
+    router.put('/newsletters/:id', mw.authAdminApi, http(api.newsletters.edit));
+
     return router;
 };

package/core/shared/config/defaults.json

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

package/core/shared/config/env/config.development.json

@@ -0,0 +1,26 @@
+{
+    "url": "http://localhost:2368",
+    "database": {
+        "client": "sqlite3",
+        "connection": {
+            "filename": "content/data/ghost-dev.db"
+        },
+        "debug": false
+    },
+    "paths": {
+        "contentPath": "content/"
+    },
+    "privacy": {
+        "useRpcPing": false,
+        "useUpdateCheck": true
+    },
+    "useMinFiles": false,
+    "caching": {
+        "theme": {
+            "maxAge": 0
+        },
+        "admin": {
+            "maxAge": 0
+        }
+    }
+}