ghost 4.19.1 → 4.20.3

package/core/server/services/adapter-manager/options-resolver.js

@@ -0,0 +1,18 @@
+module.exports = function resolveAdapterOptions(name, adapterServiceConfig) {
+    const [adapterType, feature] = name.split(':');
+    const adapterSettings = adapterServiceConfig[adapterType];
+
+    let adapterName;
+    let adapterConfig;
+
+    // CASE: load resource-specific adapter when there is an adapter feature name specified as well as custom feature config
+    if (feature && adapterSettings[feature] && adapterSettings[adapterSettings[feature]]) {
+        adapterName = adapterSettings[feature];
+        adapterConfig = adapterSettings[adapterName];
+    } else {
+        adapterName = adapterSettings.active;
+        adapterConfig = adapterSettings[adapterName];
+    }
+
+    return {adapterType, adapterName, adapterConfig};
+};

package/core/server/services/bulk-email/mailgun.js

@@ -1,6 +1,5 @@
 const _ = require('lodash');
 const {URL} = require('url');
-const mailgun = require('mailgun-js');
 const logging = require('@tryghost/logging');
 const configService = require('../../../shared/config');
 const settingsCache = require('../../../shared/settings-cache');
@@ -8,6 +7,7 @@ const settingsCache = require('../../../shared/settings-cache');
 const BATCH_SIZE = 1000;
 
 function createMailgun(config) {
+    const mailgun = require('mailgun-js');
     const baseUrl = new URL(config.baseUrl);
 
     return mailgun({

package/core/server/services/mega/post-email-serializer.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const juice = require('juice');
 const template = require('./template');
 const settingsCache = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
@@ -20,6 +19,7 @@ const ALLOWED_REPLACEMENTS = ['first_name'];
 const formatHtmlForEmail = function formatHtmlForEmail(html) {
     const juiceOptions = {inlinePseudoElements: true};
 
+    const juice = require('juice');
     let juicedHtml = juice(html, juiceOptions);
 
     // convert juiced HTML to a DOM-like interface for further manipulation
@@ -227,7 +227,7 @@ const serialize = async (postModel, options = {isBrowserPreview: false, apiVersi
     const momentDate = post.published_at ? moment(post.published_at) : moment();
     post.published_at = momentDate.tz(timezone).format('DD MMM YYYY');
 
-    post.authors = post.authors && post.authors.map(author => author.name).join(',');
+    post.authors = post.authors && post.authors.map(author => author.name).join(', ');
     if (post.posts_meta) {
         post.email_subject = post.posts_meta.email_subject;
     }

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

@@ -70,7 +70,6 @@ function createApiInstance(config) {
                         For your security, the link will expire in 24 hours time.
 
                         All the best!
-                        The team at ${siteTitle}
 
                         ---
 
@@ -88,7 +87,6 @@ function createApiInstance(config) {
                         For your security, the link will expire in 24 hours time.
 
                         See you soon!
-                        The team at ${siteTitle}
 
                         ---
 
@@ -122,7 +120,6 @@ function createApiInstance(config) {
                         For your security, the link will expire in 24 hours time.
 
                         See you soon!
-                        The team at ${siteTitle}
 
                         ---
 
@@ -181,6 +178,7 @@ function createApiInstance(config) {
             MemberProductEvent: models.MemberProductEvent,
             MemberAnalyticEvent: models.MemberAnalyticEvent,
             OfferRedemption: models.OfferRedemption,
+            Offer: models.Offer,
             StripeProduct: models.StripeProduct,
             StripePrice: models.StripePrice,
             Product: models.Product,

package/core/server/services/members/emails/signin.js

@@ -134,7 +134,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
                           </tbody>
                         </table>
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 25px;">For your security, the link will expire in 24 hours time.</p>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!<br/>The team at ${siteTitle}</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!</p>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">${url}</p>

package/core/server/services/members/emails/signup.js

@@ -134,7 +134,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
                           </tbody>
                         </table>
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 25px;">For your security, the link will expire in 24 hours time.</p>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!<br/>The team at ${siteTitle}</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!</p>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top: 0; color: #3A464C;">${url}</p>

package/core/server/services/members/emails/subscribe.js

@@ -134,7 +134,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
                           </tbody>
                         </table>
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 25px;">For your security, the link will expire in 24 hours time.</p>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 30px;">All the best!<br/>The team at ${siteTitle}</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 30px;">All the best!</p>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top: 0; color: #3A464C;">${url}</p>

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

@@ -61,7 +61,8 @@ function reconfigureMembersAPI() {
  */
 const fetchImportThreshold = async () => {
     const membersTotal = await membersService.stats.getTotalMembers();
-    const volumeThreshold = _.get(config.get('hostSettings'), 'emailVerification.importThreshold') || Infinity;
+    const configThreshold = _.get(config.get('hostSettings'), 'emailVerification.importThreshold');
+    const volumeThreshold = (configThreshold === undefined) ? Infinity : configThreshold;
     const threshold = Math.max(membersTotal, volumeThreshold);
 
     return threshold;

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

@@ -47,7 +47,7 @@ module.exports = {
                 offersEnabled = labs.isSet('offers');
 
                 if (offersEnabled) {
-                    const offers = await this.api.listOffers();
+                    const offers = await this.api.listOffers({});
                     for (const offer of offers) {
                         redirectManager.addRedirect(`/${offer.code}`, `/#/portal/offers/${offer.id}`, {permanent: false});
                     }

package/core/server/services/route-settings/route-settings.js

@@ -3,7 +3,7 @@ const moment = require('moment-timezone');
 const fs = require('fs-extra');
 const path = require('path');
 const crypto = require('crypto');
-const urlService = require('../../../frontend/services/url');
+const urlService = require('../url');
 
 const debug = require('@tryghost/debug')('services:route-settings');
 const errors = require('@tryghost/errors');

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

@@ -4,6 +4,7 @@
  */
 const events = require('../../lib/common/events');
 const models = require('../../models');
+const labs = require('../../../shared/labs');
 const SettingsCache = require('../../../shared/settings-cache');
 const SettingsBREADService = require('./settings-bread-service');
 const {obfuscatedSetting, isSecretSetting, hideValueIfSecret} = require('./settings-utils');
@@ -14,7 +15,8 @@ const {obfuscatedSetting, isSecretSetting, hideValueIfSecret} = require('./setti
 const getSettingsBREADServiceInstance = () => {
     return new SettingsBREADService({
         SettingsModel: models.Settings,
-        settingsCache: SettingsCache
+        settingsCache: SettingsCache,
+        labsService: labs
     });
 };
 

package/core/server/services/settings/settings-bread-service.js

@@ -14,10 +14,12 @@ class SettingsBREADService {
      * @param {Object} options
      * @param {Object} options.SettingsModel
      * @param {Object} options.settingsCache - SettingsCache instance
+     * @param {Object} options.labsService - labs service instance
      */
-    constructor({SettingsModel, settingsCache}) {
+    constructor({SettingsModel, settingsCache, labsService}) {
         this.SettingsModel = SettingsModel;
         this.settingsCache = settingsCache;
+        this.labs = labsService;
     }
 
     /**
@@ -28,24 +30,7 @@ class SettingsBREADService {
     browse(context) {
         let settings = this.settingsCache.getAll();
 
-        // CASE: no context passed (functional call)
-        if (!context) {
-            return Promise.resolve(settings.filter((setting) => {
-                return setting.group === 'site';
-            }));
-        }
-
-        if (!context.internal) {
-            // CASE: omit core settings unless internal request
-            settings = _.filter(settings, (setting) => {
-                const isCore = setting.group === 'core';
-                return !isCore;
-            });
-            // CASE: omit secret settings unless internal request
-            settings = settings.map(hideValueIfSecret);
-        }
-
-        return settings;
+        return this._formatBrowse(settings, context);
     }
 
     /**
@@ -86,6 +71,12 @@ class SettingsBREADService {
             }));
         }
 
+        // NOTE: Labs flags can exist outside of the DB when they are forced on/off
+        //       so we grab them from the labs service instead as that's source-of-truth
+        if (setting.key === 'labs') {
+            setting.value = JSON.stringify(this.labs.getAll());
+        }
+
         setting = hideValueIfSecret(setting);
 
         return {
@@ -161,7 +152,9 @@ class SettingsBREADService {
             });
         }
 
-        return this.SettingsModel.edit(filteredSettings, options);
+        return this.SettingsModel.edit(filteredSettings, options).then((result) => {
+            return this._formatBrowse(_.keyBy(_.invokeMap(result, 'toJSON'), 'key'), options.context);
+        });
     }
 
     /**
@@ -183,6 +176,35 @@ class SettingsBREADService {
             }
         }
     }
+
+    _formatBrowse(inputSettings, context) {
+        let settings = _.values(inputSettings);
+        // CASE: no context passed (functional call)
+        if (!context) {
+            return Promise.resolve(settings.filter((setting) => {
+                return setting.group === 'site';
+            }));
+        }
+
+        if (!context.internal) {
+            // CASE: omit core settings unless internal request
+            settings = _.filter(settings, (setting) => {
+                const isCore = setting.group === 'core';
+                return !isCore;
+            });
+            // CASE: omit secret settings unless internal request
+            settings = settings.map(hideValueIfSecret);
+        }
+
+        // NOTE: Labs flags can exist outside of the DB when they are forced on/off
+        //       so we grab them from the labs service instead as that's source-of-truth
+        const labsSetting = settings.find(setting => setting.key === 'labs');
+        if (labsSetting) {
+            labsSetting.value = JSON.stringify(this.labs.getAll());
+        }
+
+        return settings;
+    }
 }
 
 module.exports = SettingsBREADService;

package/core/server/services/slack.js

@@ -4,7 +4,7 @@ const logging = require('@tryghost/logging');
 const request = require('@tryghost/request');
 const {blogIcon} = require('../lib/image');
 const urlUtils = require('../../shared/url-utils');
-const urlService = require('../../frontend/services/url');
+const urlService = require('./url');
 const settingsCache = require('../../shared/settings-cache');
 const schema = require('../data/schema').checks;
 const moment = require('moment');

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

@@ -30,7 +30,7 @@ module.exports.loadAndActivate = async (themeName) => {
             logging.warn(validate.getThemeValidationError('activeThemeHasErrors', themeName, checkedTheme));
         }
 
-        activator.activateFromBoot(themeName, loadedTheme, checkedTheme);
+        await activator.activateFromBoot(themeName, loadedTheme, checkedTheme);
     } catch (err) {
         if (err instanceof errors.NotFoundError) {
             // CASE: active theme is missing, we don't want to exit because the admin panel will still work
@@ -56,7 +56,7 @@ module.exports.activate = async (themeName) => {
     // Validate
     const checkedTheme = await validate.checkSafe(themeName, loadedTheme);
     // Activate
-    activator.activateFromAPI(themeName, loadedTheme, checkedTheme);
+    await activator.activateFromAPI(themeName, loadedTheme, checkedTheme);
     // Return the checked theme
     return checkedTheme;
 };

package/core/server/services/themes/activation-bridge.js

@@ -8,27 +8,27 @@ const customThemeSettings = require('../custom-theme-settings');
  * And also adds a little debug statement, which is very handy when debugging theme logic
  */
 module.exports = {
-    activateFromBoot: (themeName, theme, checkedTheme) => {
+    activateFromBoot: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method A on boot)', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
         if (labs.isSet('customThemeSettings')) {
-            customThemeSettings.api.activateTheme(checkedTheme);
+            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         }
         bridge.activateTheme(theme, checkedTheme);
     },
-    activateFromAPI: (themeName, theme, checkedTheme) => {
+    activateFromAPI: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method B on API "activate")', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
         if (labs.isSet('customThemeSettings')) {
-            customThemeSettings.api.activateTheme(checkedTheme);
+            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         }
         bridge.activateTheme(theme, checkedTheme);
     },
-    activateFromAPIOverride: (themeName, theme, checkedTheme) => {
+    activateFromAPIOverride: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method C on API "override")', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
         if (labs.isSet('customThemeSettings')) {
-            customThemeSettings.api.activateTheme(checkedTheme);
+            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         }
         bridge.activateTheme(theme, checkedTheme);
     }

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

@@ -83,7 +83,7 @@ module.exports = {
             // CASE: if this is the active theme, we are overriding
             if (overrideTheme) {
                 debug('setFromZip Theme is active already');
-                activator.activateFromAPIOverride(themeName, loadedTheme, checkedTheme);
+                await activator.activateFromAPIOverride(themeName, loadedTheme, checkedTheme);
             }
 
             // @TODO: unify the name across gscan and Ghost!

package/core/{frontend → server}/services/url/Resources.js

@@ -3,10 +3,10 @@ const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('services:url:resources');
 const Resource = require('./Resource');
 const config = require('../../../shared/config');
-const models = require('../../../server/models');
+const models = require('../../models');
 
 // This listens to all manner of model events to find new content that needs a URL...
-const events = require('../../../server/lib/common/events');
+const events = require('../../lib/common/events');
 
 /**
  * @description At the moment the resources class is directly responsible for data population

package/core/{frontend → server}/services/url/UrlGenerator.js

@@ -68,24 +68,24 @@ class UrlGenerator {
     }
 
     /**
-     * @description Helper function to register listeners for each url generator instance.
-     * @private
+     * @NOTE: currently only used if the permalink setting changes and it's used for this url generator.
+     * @TODO: https://github.com/TryGhost/Ghost/issues/10699
      */
-    _listeners() {
-        /**
-         * @NOTE: currently only used if the permalink setting changes and it's used for this url generator.
-         * @TODO: https://github.com/TryGhost/Ghost/issues/10699
-         */
-        this.router.addListener('updated', () => {
-            const myResources = this.urls.getByGeneratorId(this.uid);
+    regenerateResources() {
+        const myResources = this.urls.getByGeneratorId(this.uid);
 
-            myResources.forEach((object) => {
-                this.urls.removeResourceId(object.resource.data.id);
-                object.resource.release();
-                this._try(object.resource);
-            });
+        myResources.forEach((object) => {
+            this.urls.removeResourceId(object.resource.data.id);
+            object.resource.release();
+            this._try(object.resource);
         });
+    }
 
+    /**
+     * @description Helper function to register listeners for each url generator instance.
+     * @private
+     */
+    _listeners() {
         /**
          * Listen on two events:
          *

package/core/{frontend → server}/services/url/UrlService.js

@@ -9,7 +9,7 @@ const Resources = require('./Resources');
 const urlUtils = require('../../../shared/url-utils');
 
 // This listens to services.themes.api.changed, routing events, and it's own queue events
-const events = require('../../../server/lib/common/events');
+const events = require('../../lib/common/events');
 
 /**
  * The url service class holds all instances in a centralized place.
@@ -35,9 +35,6 @@ class UrlService {
      * @private
      */
     _listeners() {
-        this._onRouterAddedListener = this._onRouterAddedType.bind(this);
-        events.on('router.created', this._onRouterAddedListener);
-
         this._onThemeChangedListener = this._onThemeChangedListener.bind(this);
         events.on('services.themes.api.changed', this._onThemeChangedListener);
 
@@ -77,22 +74,23 @@ class UrlService {
     /**
      * @description Router was created, connect it with a url generator.
      * @param {ExpressRouter} router
-     * @private
      */
-    _onRouterAddedType(router) {
-        // CASE: there are router types which do not generate resource urls
-        //       e.g. static route router
-        //       we are listening on the general `router.created` event - every router throws this event
-        if (!router || !router.getPermalinks()) {
-            return;
-        }
-
-        debug('router.created');
+    onRouterAddedType(router) {
+        debug('Registering route: ', router.name);
 
         let urlGenerator = new UrlGenerator(router, this.queue, this.resources, this.urls, this.urlGenerators.length);
         this.urlGenerators.push(urlGenerator);
     }
 
+    /**
+     * @description Router update handler - regenerates it's resources
+     * @param {ExpressRouter} router
+     */
+    onRouterUpdated(router) {
+        const generator = this.urlGenerators.find(g => g.router.id === router.id);
+        generator.regenerateResources();
+    }
+
     /**
      * @description If the API version in the theme config changes, we have to reset urls and resources.
      * @private
@@ -307,7 +305,6 @@ class UrlService {
         if (!options.keepListeners) {
             this._onQueueStartedListener && this.queue.removeListener('started', this._onQueueStartedListener);
             this._onQueueEndedListener && this.queue.removeListener('ended', this._onQueueEndedListener);
-            this._onRouterAddedListener && events.removeListener('router.created', this._onRouterAddedListener);
             this._onThemeChangedListener && events.removeListener('services.themes.api.changed', this._onThemeChangedListener);
         }
     }

package/core/{frontend → server}/services/url/Urls.js

@@ -5,7 +5,7 @@ const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 
 // This emits its own url added/removed events
-const events = require('../../../server/lib/common/events');
+const events = require('../../lib/common/events');
 
 /**
  * This class keeps track of all urls in the system.

package/core/server/services/xmlrpc.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const xml = require('xml');
 const config = require('../../shared/config');
-const urlService = require('../../frontend/services/url');
+const urlService = require('./url');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');

package/core/server/update-check.js

@@ -1,7 +1,6 @@
 const _ = require('lodash');
 
 const api = require('./api');
-const GhostMailer = require('./services/mail').GhostMailer;
 const config = require('../shared/config');
 const urlUtils = require('./../shared/url-utils');
 const jobsService = require('./services/jobs');
@@ -10,8 +9,6 @@ const request = require('@tryghost/request');
 const ghostVersion = require('@tryghost/version');
 const UpdateCheckService = require('@tryghost/update-check-service');
 
-const ghostMailer = new GhostMailer();
-
 /**
  * Initializes and triggers update check
  *
@@ -25,6 +22,9 @@ module.exports = async () => {
         return;
     }
 
+    const {GhostMailer} = require('./services/mail');
+    const ghostMailer = new GhostMailer();
+
     const updateChecker = new UpdateCheckService({
         api: {
             settings: {

package/core/server/web/admin/controller.js

@@ -1,5 +1,7 @@
 const debug = require('@tryghost/debug')('web:admin:controller');
 const path = require('path');
+const fs = require('fs');
+const crypto = require('crypto');
 const config = require('../../../shared/config');
 const updateCheck = require('../../update-check');
 
@@ -21,6 +23,15 @@ module.exports = function adminController(req, res) {
     const templatePath = path.resolve(config.get('paths').adminViews, defaultTemplate);
     const headers = {};
 
+    // Generate our own ETag header
+    //   `sendFile` by default uses filesize+lastmod date to generate an etag.
+    //   That doesn't work for admin templates because the filesize doesn't change between versions
+    //   and `npm pack` sets a fixed lastmod date for every file meaning the default etag never changes
+    const fileBuffer = fs.readFileSync(templatePath);
+    const hashSum = crypto.createHash('md5');
+    hashSum.update(fileBuffer);
+    headers.ETag = hashSum.digest('hex');
+
     if (config.get('adminFrameProtection')) {
         headers['X-Frame-Options'] = 'sameorigin';
     }

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.19%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%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.20%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%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" />
@@ -41,7 +41,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-0d8f19623e9f077351bce453034daf4d.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-57e46fd3b1145ecf2cbd185a13611f3b.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-0916203b598271a795909e8e0b1c16c2.js"></script>
-                <script src="assets/ghost.min-102753ec485602c8fe80d60a1750bf84.js"></script>
+                <script src="assets/vendor.min-af502ac4142871500fc424f6a5a254ec.js"></script>
+                <script src="assets/ghost.min-07b6a50c54b3e2e190332c28c7255d2f.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.19%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%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.20%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%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" />
@@ -41,7 +41,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-0d8f19623e9f077351bce453034daf4d.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-57e46fd3b1145ecf2cbd185a13611f3b.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-0916203b598271a795909e8e0b1c16c2.js"></script>
-                <script src="assets/ghost.min-102753ec485602c8fe80d60a1750bf84.js"></script>
+                <script src="assets/vendor.min-af502ac4142871500fc424f6a5a254ec.js"></script>
+                <script src="assets/ghost.min-07b6a50c54b3e2e190332c28c7255d2f.js"></script>
             
 </body>
 </html>