ghost 4.41.3 → 4.42.0

package/core/built/assets/{vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css → vendor.min-ba66b98f7c24fa40e061c7ffc94f4e23.css}

@@ -1202,6 +1202,220 @@ ol .occluded-content {
   height: 0;
 }
 
+:root {
+  /* The named -duration and -delay variables will be lowered to near zero when using the setupPromiseModals test helper  */
+  --epm-animation-backdrop-in-duration: 0.3s;
+  --epm-animation-backdrop-out-duration: 0.18s;
+  --epm-animation-modal-in-duration: 0.3s;
+  --epm-animation-modal-out-duration: 0.18s;
+  --epm-animation-backdrop-in-delay: 0s;
+  --epm-animation-backdrop-out-delay: 0s;
+  --epm-animation-modal-in-delay: 0s;
+  --epm-animation-modal-out-delay: 0s;
+  --epm-animation-backdrop-in: var(--epm-animation-backdrop-in-duration) ease var(--epm-animation-backdrop-in-delay) forwards epm-backdrop-in;
+  --epm-animation-backdrop-out: var(--epm-animation-backdrop-out-duration) ease var(--epm-animation-backdrop-out-delay) forwards epm-backdrop-out;
+  --epm-animation-modal-in: var(--epm-animation-modal-in-duration) ease-out var(--epm-animation-modal-in-delay) forwards epm-modal-in;
+  --epm-animation-modal-out: var(--epm-animation-modal-out-duration) ease-out var(--epm-animation-modal-out-delay) forwards epm-modal-out;
+  --epm-backdrop-background: #2d3748CD;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  :root {
+  --epm-animation-backdrop-in-duration: 0s;
+  --epm-animation-backdrop-out-duration: 0s;
+  --epm-animation-modal-in-duration: 0s;
+  --epm-animation-modal-out-duration: 0s;
+  --epm-animation-backdrop-in-delay: 0s;
+  --epm-animation-backdrop-out-delay: 0s;
+  --epm-animation-modal-in-delay: 0s;
+  --epm-animation-modal-out-delay: 0s;
+  }
+}
+
+.epm-scrolling-disabled {
+  overflow: hidden;
+}
+
+.epm-backdrop,
+.epm-modal-container {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.epm-backdrop {
+  background-color: #2d3748CD;
+  background-color: var(--epm-backdrop-background);
+  opacity: 0;
+  -webkit-animation: 0.3s ease 0s forwards epm-backdrop-in;
+          animation: 0.3s ease 0s forwards epm-backdrop-in;
+  -webkit-animation: var(--epm-animation-backdrop-in);
+          animation: var(--epm-animation-backdrop-in);
+  -webkit-animation-delay: 0s;
+          animation-delay: 0s;
+  -webkit-animation-delay: var(--epm-animation-backdrop-in-delay);
+          animation-delay: var(--epm-animation-backdrop-in-delay);
+  -webkit-animation-duration: 0.3s;
+          animation-duration: 0.3s;
+  -webkit-animation-duration: var(--epm-animation-backdrop-in-duration);
+          animation-duration: var(--epm-animation-backdrop-in-duration);
+}
+
+.epm-modal-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: auto;
+}
+
+.epm-animating .epm-modal-container {
+  overflow: unset;
+}
+
+.epm-modal {
+  margin: auto;
+  transform: translate(0, -30vh) scale(1.1);
+  opacity: 0;
+  -webkit-animation: 0.3s ease-out 0s forwards epm-modal-in;
+          animation: 0.3s ease-out 0s forwards epm-modal-in;
+  -webkit-animation: var(--epm-animation-modal-in);
+          animation: var(--epm-animation-modal-in);
+  -webkit-animation-delay: 0s;
+          animation-delay: 0s;
+  -webkit-animation-delay: var(--epm-animation-modal-in-delay);
+          animation-delay: var(--epm-animation-modal-in-delay);
+  -webkit-animation-duration: 0.3s;
+          animation-duration: 0.3s;
+  -webkit-animation-duration: var(--epm-animation-modal-in-duration);
+          animation-duration: var(--epm-animation-modal-in-duration);
+  -webkit-overflow-scrolling: touch; /* momentum-based scrolling for Safari on iOS */
+}
+
+.epm-backdrop.epm-out {
+  opacity: 1;
+  -webkit-animation: 0.18s ease 0s forwards epm-backdrop-out;
+          animation: 0.18s ease 0s forwards epm-backdrop-out;
+  -webkit-animation: var(--epm-animation-backdrop-out);
+          animation: var(--epm-animation-backdrop-out);
+  -webkit-animation-delay: 0s;
+          animation-delay: 0s;
+  -webkit-animation-delay: var(--epm-animation-backdrop-out-delay);
+          animation-delay: var(--epm-animation-backdrop-out-delay);
+  -webkit-animation-duration: 0.18s;
+          animation-duration: 0.18s;
+  -webkit-animation-duration: var(--epm-animation-backdrop-out-duration);
+          animation-duration: var(--epm-animation-backdrop-out-duration);
+  pointer-events: none;
+}
+
+.epm-modal.epm-out {
+  transform: translate(0, 0) scale(1);
+  opacity: 1;
+  -webkit-animation: 0.18s ease-out 0s forwards epm-modal-out;
+          animation: 0.18s ease-out 0s forwards epm-modal-out;
+  -webkit-animation: var(--epm-animation-modal-out);
+          animation: var(--epm-animation-modal-out);
+  -webkit-animation-delay: 0s;
+          animation-delay: 0s;
+  -webkit-animation-delay: var(--epm-animation-modal-out-delay);
+          animation-delay: var(--epm-animation-modal-out-delay);
+  -webkit-animation-duration: 0.18s;
+          animation-duration: 0.18s;
+  -webkit-animation-duration: var(--epm-animation-modal-out-duration);
+          animation-duration: var(--epm-animation-modal-out-duration);
+  pointer-events: none;
+}
+
+@-webkit-keyframes epm-backdrop-in {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes epm-backdrop-in {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@-webkit-keyframes epm-backdrop-out {
+  0% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+@keyframes epm-backdrop-out {
+  0% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+@-webkit-keyframes epm-modal-in {
+  0% {
+    transform: translate(0, -30vh) scale(1.1);
+    opacity: 0;
+  }
+  72% {
+    transform: translate(0, 0) scale(0.99);
+    opacity: 1;
+  }
+  100% {
+    transform: translate(0, 0) scale(1);
+    opacity: 1;
+  }
+}
+
+@keyframes epm-modal-in {
+  0% {
+    transform: translate(0, -30vh) scale(1.1);
+    opacity: 0;
+  }
+  72% {
+    transform: translate(0, 0) scale(0.99);
+    opacity: 1;
+  }
+  100% {
+    transform: translate(0, 0) scale(1);
+    opacity: 1;
+  }
+}
+
+@-webkit-keyframes epm-modal-out {
+  0% {
+    transform: translate(0, 0) scale(1);
+    opacity: 1;
+  }
+  100% {
+    transform: translate(0, -10vh) scale(0.8);
+    opacity: 0;
+  }
+}
+
+@keyframes epm-modal-out {
+  0% {
+    transform: translate(0, 0) scale(1);
+    opacity: 1;
+  }
+  100% {
+    transform: translate(0, -10vh) scale(0.8);
+    opacity: 0;
+  }
+}
+
 .ember-tooltip-base {
   display: none;
   height: 0;

package/core/frontend/helpers/price.js

@@ -58,6 +58,7 @@ module.exports = function price(planOrAmount, options) {
     }
     options = options || {};
     options.hash = options.hash || {};
+    // NOTE: potentially breaking place once site.lang is removed in favor of site.locale
     const {currency, numberFormat = 'short', currencyFormat = 'symbol', locale = _.get(options, 'data.site.lang', 'en')} = options.hash;
     if (plan) {
         return formatter({

package/core/server/api/canary/email-preview.js

@@ -12,7 +12,8 @@ const emailPreview = new mega.EmailPreview({
 });
 
 module.exports = {
-    docName: 'email_preview',
+    // @TODO make the route match the resource name in 5.0
+    docName: 'email_previews',
 
     read: {
         options: [

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

@@ -158,7 +158,7 @@ module.exports = {
     },
 
     get emails() {
-        return shared.pipeline(require('./email'), localUtils);
+        return shared.pipeline(require('./emails'), localUtils);
     },
 
     get site() {
@@ -169,6 +169,10 @@ module.exports = {
         return shared.pipeline(require('./snippets'), localUtils);
     },
 
+    get stats() {
+        return shared.pipeline(require('./stats'), localUtils);
+    },
+
     get customThemeSettings() {
         return shared.pipeline(require('./custom-theme-settings'), localUtils);
     },
@@ -177,6 +181,10 @@ module.exports = {
         return require('./utils/serializers');
     },
 
+    get newsletters() {
+        return shared.pipeline(require('./newsletters'), localUtils);
+    },
+
     /**
      * Content API Controllers
      *

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

@@ -452,51 +452,6 @@ module.exports = {
             };
         }
     },
-    subscriberStats: {
-        permissions: {
-            method: 'browse'
-        },
-        async query() {
-            const statsData = await membersService.api.events.getSubscriptions();
-            const totalSubscriptions = (_.last(statsData) && _.last(statsData).subscribed) || 0;
-            statsData.forEach((d) => {
-                d.date = moment(d.date).format('YYYY-MM-DD');
-            });
-            return {
-                resource: 'subscribers',
-                total: totalSubscriptions,
-                data: statsData.map((d) => {
-                    return Object.assign({}, {
-                        date: moment(d.date).format('YYYY-MM-DD'),
-                        value: d.subscribed
-                    });
-                })
-            };
-        }
-    },
-    grossVolumeStats: {
-        permissions: {
-            method: 'browse'
-        },
-        async query() {
-            const volumeData = await membersService.api.events.getVolume();
-            const volumeStats = Object.keys(volumeData).map((curr) => {
-                return {
-                    currency: curr,
-                    data: volumeData[curr].map((d) => {
-                        return Object.assign({}, {
-                            date: moment(d.date).format('YYYY-MM-DD'),
-                            value: d.volume
-                        });
-                    })
-                };
-            });
-            return {
-                resource: 'gross-volume',
-                data: volumeStats
-            };
-        }
-    },
 
     activityFeed: {
         options: [

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

@@ -0,0 +1,45 @@
+const models = require('../../models');
+
+module.exports = {
+    docName: 'newsletters',
+
+    browse: {
+        options: [
+            'filter',
+            'fields',
+            'limit',
+            'order',
+            'page'
+        ],
+        permissions: true,
+        query(frame) {
+            return models.Newsletter.findPage(frame.options);
+        }
+    },
+
+    add: {
+        statusCode: 201,
+        permissions: true,
+        async query(frame) {
+            return models.Newsletter.add(frame.data.newsletters[0], frame.options);
+        }
+    },
+
+    edit: {
+        headers: {},
+        options: [
+            'id'
+        ],
+        validation: {
+            options: {
+                id: {
+                    required: true
+                }
+            }
+        },
+        permissions: true,
+        async query(frame) {
+            return models.Newsletter.edit(frame.data.newsletters[0], frame.options);
+        }
+    }
+};

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

@@ -0,0 +1,14 @@
+const statsService = require('../../services/stats');
+
+module.exports = {
+    docName: 'stats',
+    memberCountHistory: {
+        permissions: {
+            docName: 'members',
+            method: 'browse'
+        },
+        async query() {
+            return await statsService.members.getCountHistory();
+        }
+    }
+};

package/core/server/api/canary/utils/serializers/output/email-previews.js

@@ -0,0 +1,7 @@
+module.exports = {
+    // @TODO remove for 5.0
+    // This should be a default serializer, not a passthrough, as per the read endpoint
+    sendTestEmail(data, apiConfig, frame) {
+        frame.response = data;
+    }
+};

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

@@ -41,10 +41,6 @@ module.exports = {
         return require('./schedules');
     },
 
-    get webhooks() {
-        return require('./webhooks');
-    },
-
     get posts() {
         return require('./posts');
     },
@@ -73,14 +69,6 @@ module.exports = {
         return require('./tiers');
     },
 
-    get member_signin_urls() {
-        return require('./member-signin-urls');
-    },
-
-    get identities() {
-        return require('./identities');
-    },
-
     get images() {
         return require('./images');
     },
@@ -121,16 +109,8 @@ module.exports = {
         return require('./site');
     },
 
-    get email_preview() {
-        return require('./email-preview');
-    },
-
-    get emails() {
-        return require('./emails');
-    },
-
-    get snippets() {
-        return require('./snippets');
+    get email_previews() {
+        return require('./email-previews');
     },
 
     get custom_theme_settings() {

package/core/server/api/canary/utils/serializers/output/mappers/index.js

@@ -7,6 +7,7 @@ module.exports = {
     pages: require('./pages'),
     posts: require('./posts'),
     settings: require('./settings'),
+    snippets: require('./snippets'),
     tags: require('./tags'),
     users: require('./users')
 };

package/core/server/api/canary/utils/serializers/output/mappers/snippets.js

@@ -0,0 +1,36 @@
+/**
+ * @param {import('bookshelf').Model} snippet
+ * @param {Frame} frame
+ *
+ * @returns {SerializedSnippet}
+ */
+module.exports = (snippet, frame) => {
+    const json = snippet.toJSON(frame.options);
+
+    return {
+        id: json.id,
+        name: json.name,
+        // @ts-ignore
+        mobiledoc: json.mobiledoc,
+        created_at: json.created_at,
+        updated_at: json.updated_at,
+        created_by: json.created_by,
+        updated_by: json.updated_by
+    };
+};
+
+/**
+ * @typedef {Object} SerializedSnippet
+ * @prop {string} id
+ * @prop {string=} name
+ * @prop {string=} mobiledoc
+ * @prop {string} created_at
+ * @prop {string} updated_at
+ * @prop {string} created_by
+ * @prop {string} updated_by
+ */
+
+/**
+ * @typedef {Object<string, any>} Frame
+ * @prop {Object} options
+ */

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

@@ -20,8 +20,6 @@ module.exports = {
     importCSV: createSerializer('importCSV', passthrough),
     memberStats: createSerializer('memberStats', passthrough),
     mrrStats: createSerializer('mrrStats', passthrough),
-    subscriberStats: createSerializer('subscriberStats', passthrough),
-    grossVolumeStats: createSerializer('grossVolumeStats', passthrough),
     activityFeed: createSerializer('activityFeed', passthrough)
 };
 

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

@@ -1,8 +1,8 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:oembed');
 
 module.exports = {
-    all(res, apiConfig, frame) {
+    all(data, apiConfig, frame) {
         debug('all');
-        frame.response = res;
+        frame.response = data;
     }
 };

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

@@ -1,5 +1,5 @@
 module.exports = {
-    all(response, apiConfig, frame) {
-        frame.response = response;
+    all(data, apiConfig, frame) {
+        frame.response = data;
     }
 };

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

@@ -1,5 +1,5 @@
 module.exports = {
-    all(model, apiConfig, frame) {
-        frame.response = model;
+    all(data, apiConfig, frame) {
+        frame.response = data;
     }
 };

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

@@ -1,9 +1,9 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:slack');
 
 module.exports = {
-    all(themes, apiConfig, frame) {
+    all(data, apiConfig, frame) {
         debug('all');
 
-        frame.response = themes;
+        frame.response = data;
     }
 };

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

@@ -1,9 +1,9 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:themes');
 
 module.exports = {
-    all(themes, apiConfig, frame) {
+    all(data, apiConfig, frame) {
         debug('all');
 
-        frame.response = themes;
+        frame.response = data;
     }
 };

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

@@ -1,34 +1,11 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:users');
 const tpl = require('@tryghost/tpl');
-const mappers = require('./mappers');
 
 const messages = {
     pwdChangedSuccessfully: 'Password changed successfully.'
 };
 
 module.exports = {
-    browse(models, apiConfig, frame) {
-        debug('browse');
-
-        frame.response = {
-            users: models.data.map(model => mappers.users(model, frame)),
-            meta: models.meta
-        };
-    },
-
-    read(model, apiConfig, frame) {
-        debug('read');
-
-        frame.response = {
-            users: [mappers.users(model, frame)]
-        };
-    },
-
-    edit() {
-        debug('edit');
-        this.read(...arguments);
-    },
-
     destroy(filename, apiConfig, frame) {
         debug('destroy');
 

package/core/server/api/shared/serializers/handle.js

@@ -67,6 +67,19 @@ module.exports.input = (apiConfig, apiSerializers, frame) => {
     return sequence(tasks);
 };
 
+const getBestMatchSerializer = function (apiSerializers, docName, method) {
+    if (apiSerializers[docName] && apiSerializers[docName][method]) {
+        debug(`Calling ${docName}.${method}`);
+        return apiSerializers[docName][method].bind(apiSerializers[docName]);
+    } else if (apiSerializers[docName] && apiSerializers[docName].all) {
+        debug(`Calling ${docName}.all`);
+        return apiSerializers[docName].all.bind(apiSerializers[docName]);
+    }
+
+    debug(`Returning as-is`);
+    return false;
+};
+
 /**
  * @description Shared output serialization handler.
  *
@@ -101,33 +114,19 @@ module.exports.output = (response = {}, apiConfig, apiSerializers, frame) => {
         });
     }
 
-    // CASE: custom serializer exists
-    if (apiSerializers[apiConfig.docName]) {
-        if (apiSerializers[apiConfig.docName].all) {
-            tasks.push(function serialiseCustomAll() {
-                return apiSerializers[apiConfig.docName].all(response, apiConfig, frame);
-            });
-        }
+    const customSerializer = getBestMatchSerializer(apiSerializers, apiConfig.docName, apiConfig.method);
+    const defaultSerializer = getBestMatchSerializer(apiSerializers, 'default', apiConfig.method);
 
-        if (apiSerializers[apiConfig.docName][apiConfig.method]) {
-            tasks.push(function serialiseCustomMethod() {
-                return apiSerializers[apiConfig.docName][apiConfig.method](response, apiConfig, frame);
-            });
-        }
-
-    // CASE: Fall back to default serializer
-    } else if (apiSerializers.default) {
-        if (apiSerializers.default.all) {
-            tasks.push(function serializeDefaultAll() {
-                return apiSerializers.default.all(response, apiConfig, frame);
-            });
-        }
-
-        if (apiSerializers.default[apiConfig.method]) {
-            tasks.push(function serializeDefaultMethod() {
-                return apiSerializers.default[apiConfig.method](response, apiConfig, frame);
-            });
-        }
+    if (customSerializer) {
+        // CASE: custom serializer exists
+        tasks.push(function doCustomSerializer() {
+            return customSerializer(response, apiConfig, frame);
+        });
+    } else if (defaultSerializer) {
+        // CASE: Fall back to default serializer
+        tasks.push(function doDefaultSerializer() {
+            return defaultSerializer(response, apiConfig, frame);
+        });
     }
 
     if (apiSerializers.all && apiSerializers.all.after) {

package/core/server/data/exporter/table-lists.js

@@ -15,6 +15,7 @@ const BACKUP_TABLES = [
     'members_stripe_customers_subscriptions',
     'migrations',
     'migrations_lock',
+    'newsletters',
     'oauth',
     'permissions',
     'permissions_roles',

package/core/server/data/migrations/utils.js

@@ -178,7 +178,7 @@ function addPermissionToRole(config) {
                 return;
             }
 
-            logging.warn(`Adding permission(${config.permission}) to role(${config.role})`);
+            logging.info(`Adding permission(${config.permission}) to role(${config.role})`);
             await connection('permissions_roles').insert({
                 id: ObjectId().toHexString(),
                 permission_id: permission.id,