ghost 4.15.0 → 4.17.1

package/core/frontend/helpers/navigation.js

@@ -1,10 +1,19 @@
 // ### Navigation Helper
 // `{{navigation}}`
 // Outputs navigation menu of static urls
+const {SafeString, templates, hbs} = require('../services/rendering');
 
-const {SafeString, i18n, errors, templates, hbs} = require('../services/proxy');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const {slugify} = require('@tryghost/string');
 const _ = require('lodash');
+
+const messages = {
+    invalidData: 'navigation data is not an object or is a function',
+    valuesMustBeDefined: 'All values must be defined for label, url and current',
+    valuesMustBeString: 'Invalid value, Url and Label must be strings'
+};
+
 const createFrame = hbs.handlebars.createFrame;
 
 module.exports = function navigation(options) {
@@ -25,7 +34,7 @@ module.exports = function navigation(options) {
 
     if (!_.isObject(navigationData) || _.isFunction(navigationData)) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.navigation.invalidData')
+            message: tpl(messages.invalidData)
         });
     }
 
@@ -33,7 +42,7 @@ module.exports = function navigation(options) {
         return (_.isUndefined(e.label) || _.isUndefined(e.url));
     }).length > 0) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.navigation.valuesMustBeDefined')
+            message: tpl(messages.valuesMustBeDefined)
         });
     }
 
@@ -43,7 +52,7 @@ module.exports = function navigation(options) {
             (!_.isNull(e.url) && !_.isString(e.url)));
     }).length > 0) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.navigation.valuesMustBeString')
+            message: tpl(messages.valuesMustBeString)
         });
     }
 

package/core/frontend/helpers/pagination.js

@@ -1,9 +1,19 @@
 // ### Pagination Helper
 // `{{pagination}}`
 // Outputs previous and next buttons, along with info about the current page
+const {templates, hbs} = require('../services/rendering');
 
-const {errors, i18n, templates, hbs} = require('../services/proxy');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const _ = require('lodash');
+
+const messages = {
+    invalidData: 'The {{pagination}} helper was used outside of a paginated context. See https://ghost.org/docs/themes/helpers/pagination/.',
+    valuesMustBeDefined: 'All values must be defined for page, pages, limit and total',
+    nextPrevValuesMustBeNumeric: 'Invalid value, Next/Prev must be a number',
+    valuesMustBeNumeric: 'Invalid value, check page, pages, limit and total are numbers'
+};
+
 const createFrame = hbs.handlebars.createFrame;
 
 module.exports = function pagination(options) {
@@ -14,7 +24,7 @@ module.exports = function pagination(options) {
     if (!_.isObject(this.pagination) || _.isFunction(this.pagination)) {
         throw new errors.IncorrectUsageError({
             level: 'normal',
-            message: i18n.t('warnings.helpers.pagination.invalidData'),
+            message: tpl(messages.invalidData),
             help: 'https://ghost.org/docs/themes/helpers/pagination/'
         });
     }
@@ -22,20 +32,20 @@ module.exports = function pagination(options) {
     if (_.isUndefined(this.pagination.page) || _.isUndefined(this.pagination.pages) ||
         _.isUndefined(this.pagination.total) || _.isUndefined(this.pagination.limit)) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.pagination.valuesMustBeDefined')
+            message: tpl(messages.valuesMustBeDefined)
         });
     }
 
     if ((!_.isNull(this.pagination.next) && !_.isNumber(this.pagination.next)) ||
         (!_.isNull(this.pagination.prev) && !_.isNumber(this.pagination.prev))) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.pagination.nextPrevValuesMustBeNumeric')
+            message: tpl(messages.nextPrevValuesMustBeNumeric)
         });
     }
 
     if (!_.isNumber(this.pagination.page) || !_.isNumber(this.pagination.pages) ||
         !_.isNumber(this.pagination.total) || !_.isNumber(this.pagination.limit)) {
-        throw new errors.IncorrectUsageError({message: i18n.t('warnings.helpers.pagination.valuesMustBeNumeric')});
+        throw new errors.IncorrectUsageError({message: tpl(messages.valuesMustBeNumeric)});
     }
 
     // CASE: The pagination helper should have access to the pagination properties at the top level.

package/core/frontend/helpers/plural.js

@@ -9,15 +9,21 @@
 // The 2nd argument is the string that will be output if the variable's value is 0
 // The 3rd argument is the string that will be output if the variable's value is 1
 // The 4th argument is the string that will be output if the variable's value is 2+
+const {SafeString} = require('../services/rendering');
 
-const {errors, i18n, SafeString} = require('../services/proxy');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const isUndefined = require('lodash/isUndefined');
 
+const messages = {
+    valuesMustBeDefined: 'All values must be defined for empty, singular and plural'
+};
+
 module.exports = function plural(number, options) {
     if (isUndefined(options.hash) || isUndefined(options.hash.empty) ||
         isUndefined(options.hash.singular) || isUndefined(options.hash.plural)) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.plural.valuesMustBeDefined')
+            message: tpl(messages.valuesMustBeDefined)
         });
     }
 

package/core/frontend/helpers/post_class.js

@@ -2,7 +2,7 @@
 // Usage: `{{post_class}}`
 //
 // Output classes for the body element
-const {SafeString} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
 
 // We use the name post_class to match the helper for consistency:
 module.exports = function post_class() { // eslint-disable-line camelcase

package/core/frontend/helpers/prev_post.js

@@ -2,12 +2,19 @@
 //  Example usages
 // `{{#prev_post}}<a href ="{{url}}>previous post</a>{{/prev_post}}'
 // `{{#next_post}}<a href ="{{url absolute="true">next post</a>{{/next_post}}'
+const {api, checks} = require('../services/proxy');
+const {hbs} = require('../services/rendering');
 
-const {logging, i18n, api, hbs, checks} = require('../services/proxy');
+const logging = require('@tryghost/logging');
+const tpl = require('@tryghost/tpl');
 const get = require('lodash/get');
 const Promise = require('bluebird');
 const moment = require('moment');
 
+const messages = {
+    mustBeCalledAsBlock: 'The {{{helperName}}} helper must be called as a block. E.g. {{#{helperName}}}...{{/{helperName}}}'
+};
+
 const createFrame = hbs.handlebars.createFrame;
 
 const buildApiOptions = function buildApiOptions(options, post) {
@@ -78,7 +85,7 @@ module.exports = function prevNext(options) {
 
     // Guard against incorrect usage of the helpers
     if (!options.fn || !options.inverse) {
-        data.error = i18n.t('warnings.helpers.mustBeCalledAsBlock', {helperName: options.name});
+        data.error = tpl(messages.mustBeCalledAsBlock, {helperName: options.name});
         logging.warn(data.error);
         return Promise.resolve();
     }

package/core/frontend/helpers/price.js

@@ -10,10 +10,15 @@
 //
 // Returns amount equal to the dominant denomintation of the currency.
 // For example, if 2100 is passed, it will return 21.
-const isNumber = require('lodash/isNumber');
-const {errors, i18n} = require('../services/proxy');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const _ = require('lodash');
 
+const messages = {
+    attrIsRequired: 'Attribute is required e.g. {{price plan.amount}}',
+    attrMustBeNumeric: 'Attribute value should be a number'
+};
+
 function formatter({amount, currency, numberFormat = 'short', currencyFormat = 'symbol', locale}) {
     const formatterOptions = {
         style: 'currency',
@@ -77,20 +82,20 @@ module.exports = function price(planOrAmount, options) {
     // CASE: if no amount is passed, e.g. `{{price}}` we throw an error
     if (arguments.length < 2) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.price.attrIsRequired')
+            message: tpl(messages.attrIsRequired)
         });
     }
 
     // CASE: if amount is passed, but it is undefined we throw an error
     if (amount === undefined) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.price.attrIsRequired')
+            message: tpl(messages.attrIsRequired)
         });
     }
 
-    if (!isNumber(amount)) {
+    if (!_.isNumber(amount)) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.price.attrMustBeNumeric')
+            message: tpl(messages.attrMustBeNumeric)
         });
     }
 

package/core/frontend/helpers/products.js

@@ -3,10 +3,11 @@
 //
 // Returns a string of the products with access to the post.
 // By default, products are separated by commas.
+const {labs} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
 
 const nql = require('@nexes/nql');
 const isString = require('lodash/isString');
-const {SafeString, labs} = require('../services/proxy');
 
 function products(options = {}) {
     options = options || {};

package/core/frontend/helpers/reading_time.js

@@ -10,8 +10,10 @@
 //
 // Returns estimated reading time for post
 
-const {SafeString, checks} = require('../services/proxy');
-const calculateReadingTime = require('@tryghost/helpers').readingTime;
+const {checks} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
+
+const {readingTime: calculateReadingTime} = require('@tryghost/helpers');
 
 module.exports = function reading_time(options) {// eslint-disable-line camelcase
     options = options || {};

package/core/frontend/helpers/t.js

@@ -10,7 +10,7 @@
 // because often other helpers need that (t) returns a string to be able to work as subexpression; e.g.:
 // {{tags prefix=(t " on ")}}
 
-const {themeI18n} = require('../services/proxy');
+const {themeI18n} = require('../services/rendering');
 
 module.exports = function t(text, options) {
     const bindings = {};

package/core/frontend/helpers/tags.js

@@ -5,7 +5,9 @@
 // By default, tags are separated by commas.
 //
 // Note that the standard {{#each tags}} implementation is unaffected by this helper
-const {urlService, SafeString, escapeExpression, templates} = require('../services/proxy');
+const {urlService} = require('../services/proxy');
+const {SafeString, escapeExpression, templates} = require('../services/rendering');
+
 const isString = require('lodash/isString');
 const ghostHelperUtils = require('@tryghost/helpers').utils;
 

package/core/frontend/helpers/title.js

@@ -3,7 +3,7 @@
 //
 // Overrides the standard behaviour of `{[title}}` to ensure the content is correctly escaped
 
-const {SafeString, escapeExpression} = require('../services/proxy');
+const {SafeString, escapeExpression} = require('../services/rendering');
 
 module.exports = function title() {
     return new SafeString(escapeExpression(this.title || ''));

package/core/frontend/helpers/twitter_url.js

@@ -2,7 +2,8 @@
 // Usage: `{{twitter_url}}` or `{{twitter_url author.twitter}}`
 //
 // Output a url for a twitter username
-const {socialUrls, localUtils} = require('../services/proxy');
+const {socialUrls} = require('../services/proxy');
+const {localUtils} = require('../services/rendering');
 
 // We use the name twitter_url to match the helper for consistency:
 module.exports = function twitter_url(username, options) { // eslint-disable-line camelcase

package/core/frontend/helpers/url.js

@@ -4,7 +4,9 @@
 // Returns the URL for the current object scope i.e. If inside a post scope will return post permalink
 // `absolute` flag outputs absolute URL, else URL is relative
 
-const {SafeString, metaData} = require('../services/proxy');
+const {metaData} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
+
 const {getMetaDataUrl} = metaData;
 
 module.exports = function url(options) {

package/core/frontend/services/proxy.js

@@ -1,74 +1,51 @@
-// This file defines everything that helpers "require"
-// With the exception of modules like lodash, Bluebird
-// We can later refactor to enforce this something like we did in apps
-const hbs = require('./theme-engine/engine');
-const errors = require('@tryghost/errors');
-
-const i18n = require('../../shared/i18n');
-const logging = require('@tryghost/logging');
+// This file contains everything that the helpers and frontend apps require from the core of Ghost
 const settingsCache = require('../../shared/settings-cache');
 const config = require('../../shared/config');
 
-// Direct requires:
-// - lodash
-// - bluebird
-// - downsize
-// - moment-timezone
-// - jsonpath
+// Require from the rendering framework
+const {SafeString} = require('./rendering');
 
 module.exports = {
-    hbs: hbs,
-    SafeString: hbs.SafeString,
-    escapeExpression: hbs.escapeExpression,
-
-    // TODO: Expose less of the API to make this safe
-    api: require('../../server/api'),
-
-    // TODO: Only expose "get"
-    settingsCache: settingsCache,
-
-    // These 3 are kind of core and required all the time
-    errors,
-    i18n,
-    logging,
-
-    // Theme i18n is separate to common i18n
-    themeI18n: require('./theme-engine/i18n'),
-
-    // This is used to detect if "isPost" is true in prevNext.
+    /**
+     * Section two: data manipulation
+     * Stuff that modifies API data (SDK layer)
+     */
+    metaData: require('../meta'),
+    socialUrls: require('@tryghost/social-urls'),
+    blogIcon: require('../../server/lib/image').blogIcon,
+    // Used by router service and {{get}} helper to prepare data for optimal usage in themes
+    prepareContextResource(data) {
+        (Array.isArray(data) ? data : [data]).forEach((resource) => {
+            // feature_image_caption contains HTML, making it a SafeString spares theme devs from triple-curlies
+            if (resource.feature_image_caption) {
+                resource.feature_image_caption = new SafeString(resource.feature_image_caption);
+            }
+        });
+    },
+    // This is used to decide e.g. if a JSON object is a Post, Page, Tag etc
     checks: require('../../server/data/schema').checks,
 
-    // Config!
-    // Keys used:
+    /**
+     * Section three: Core API
+     * Parts of Ghost core that the frontend currently needs
+     */
+
+    // Config! Keys used:
     // isPrivacyDisabled & referrerPolicy used in ghost_head
     config: {
         get: config.get.bind(config),
         isPrivacyDisabled: config.isPrivacyDisabled.bind(config)
     },
 
-    // Labs utils for enabling/disabling helpers
-    labs: require('../../shared/labs'),
-
-    // Things required from data/meta
-    metaData: require('../meta'),
+    // TODO: Only expose "get"
+    settingsCache: settingsCache,
 
-    // The local template thing, should this be merged with the channels one?
-    templates: require('./theme-engine/handlebars/template'),
+    // TODO: Expose less of the API to make this safe
+    api: require('../../server/api'),
 
-    // Various utils, needs cleaning up / simplifying
-    socialUrls: require('@tryghost/social-urls'),
-    blogIcon: require('../../server/lib/image').blogIcon,
+    // Labs utils for enabling/disabling helpers
+    labs: require('../../shared/labs'),
+    // URGH... Yuk (unhelpful comment :D)
     urlService: require('./url'),
-    urlUtils: require('../../shared/url-utils'),
-    localUtils: require('./theme-engine/handlebars/utils'),
-
-    // Used by router service and {{get}} helper to prepare data for optimal usage in themes
-    prepareContextResource(data) {
-        (Array.isArray(data) ? data : [data]).forEach((resource) => {
-            // feature_image_caption contains HTML, making it a SafeString spares theme devs from triple-curlies
-            if (resource.feature_image_caption) {
-                resource.feature_image_caption = new hbs.SafeString(resource.feature_image_caption);
-            }
-        });
-    }
+    urlUtils: require('../../shared/url-utils')
 };

package/core/frontend/services/rendering.js

@@ -0,0 +1,24 @@
+/**
+ * This is a loose concept of a frontend rendering framework
+ * Note: everything here gets deep-required from the theme-engine
+ * This indicates that the theme engine is a set of services, rather than a single service
+ * and could do with a refactor.
+ *
+ * This at least keeps the deep requires in a single place.
+ */
+
+const hbs = require('./theme-engine/engine');
+
+module.exports = {
+    hbs: hbs,
+    SafeString: hbs.SafeString,
+    escapeExpression: hbs.escapeExpression,
+    // The local template thing, should this be merged with the channels one?
+    templates: require('./theme-engine/handlebars/template'),
+
+    // Theme i18n is separate to common i18n
+    themeI18n: require('./theme-engine/i18n'),
+
+    // TODO: these need a more sensible home
+    localUtils: require('./theme-engine/handlebars/utils')
+};

package/core/frontend/services/routing/controllers/channel.js

@@ -1,11 +1,15 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('services:routing:controllers:channel');
-const i18n = require('../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const security = require('@tryghost/security');
 const themeEngine = require('../../theme-engine');
 const helpers = require('../helpers');
 
+const messages = {
+    pageNotFound: 'Page not found.'
+};
+
 /**
  * @description Channel controller.
  *
@@ -51,7 +55,7 @@ module.exports = function channelController(req, res, next) {
             // CASE: requested page is greater than number of pages we have
             if (pathOptions.page > result.meta.pagination.pages) {
                 return next(new errors.NotFoundError({
-                    message: i18n.t('errors.errors.pageNotFound')
+                    message: tpl(messages.pageNotFound)
                 }));
             }
 

package/core/frontend/services/routing/controllers/collection.js

@@ -1,12 +1,16 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('services:routing:controllers:collection');
-const {i18n} = require('../../proxy');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const security = require('@tryghost/security');
 const urlService = require('../../url');
 const themeEngine = require('../../theme-engine');
 const helpers = require('../helpers');
 
+const messages = {
+    pageNotFound: 'Page not found.'
+};
+
 /**
  * @description Collection controller.
  * @param {Object} req
@@ -50,7 +54,7 @@ module.exports = function collectionController(req, res, next) {
             // CASE: requested page is greater than number of pages we have
             if (pathOptions.page > result.meta.pagination.pages) {
                 return next(new errors.NotFoundError({
-                    message: i18n.t('errors.errors.pageNotFound')
+                    message: tpl(messages.pageNotFound)
                 }));
             }
 

package/core/frontend/services/routing/middlewares/page-param.js

@@ -1,7 +1,11 @@
-const i18n = require('../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const urlUtils = require('../../../../shared/url-utils');
 
+const messages = {
+    pageNotFound: 'Page not found.'
+};
+
 /**
  * @description Middleware, which validates and interprets the page param e.g. /page/1
  * @param {Object} req
@@ -21,7 +25,7 @@ module.exports = function handlePageParam(req, res, next, page) {
         return urlUtils.redirect301(res, req.originalUrl.replace(pageRegex, '/'));
     } else if (page < 1 || isNaN(page)) {
         return next(new errors.NotFoundError({
-            message: i18n.t('errors.errors.pageNotFound')
+            message: tpl(messages.pageNotFound)
         }));
     } else {
         req.params.page = page;

package/core/frontend/services/theme-engine/middleware.js

@@ -5,6 +5,7 @@ const {api} = require('../proxy');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const settingsCache = require('../../../shared/settings-cache');
+const customThemeSettingsCache = require('../../../shared/custom-theme-settings-cache');
 const labs = require('../../../shared/labs');
 const activeTheme = require('./active');
 const preview = require('./preview');
@@ -86,12 +87,9 @@ async function getProductAndPricesData() {
     }
 }
 
-function getSiteData(req) {
+function getSiteData() {
     let siteData = settingsCache.getPublic();
 
-    // @TODO: it would be nicer if this was proper middleware somehow...
-    siteData = preview.handle(req, siteData);
-
     // theme-only computed property added to @site
     if (settingsCache.get('members_signup_access') === 'none') {
         const escapedUrl = encodeURIComponent(urlUtils.urlFor({relativeUrl: '/rss/'}, true));
@@ -107,13 +105,14 @@ async function updateGlobalTemplateOptions(req, res, next) {
     // Static information, same for every request unless the settings change
     // @TODO: bind this once and then update based on events?
     // @TODO: decouple theme layer from settings cache using the Content API
-    const siteData = getSiteData(req);
+    const siteData = getSiteData();
     const labsData = labs.getAll();
 
     const themeData = {
         posts_per_page: activeTheme.get().config('posts_per_page'),
         image_sizes: activeTheme.get().config('image_sizes')
     };
+    const themeSettingsData = customThemeSettingsCache.getAll();
     const productData = await getProductAndPricesData();
     const priceData = calculateLegacyPriceData(productData);
 
@@ -136,7 +135,8 @@ async function updateGlobalTemplateOptions(req, res, next) {
                 config: themeData,
                 price: priceData,
                 product,
-                products
+                products,
+                custom: themeSettingsData
             }
         });
     }
@@ -154,10 +154,26 @@ function updateLocalTemplateData(req, res, next) {
 
 function updateLocalTemplateOptions(req, res, next) {
     const localTemplateOptions = hbs.getLocalTemplateOptions(res.locals);
+
+    // adjust @site.url for http/https based on the incoming request
     const siteData = {
         url: urlUtils.urlFor('home', {secure: req.secure, trailingSlash: false}, true)
     };
 
+    // @TODO: it would be nicer if this was proper middleware somehow...
+    const previewData = preview.handle(req, Object.keys(customThemeSettingsCache.getAll()));
+
+    // strip custom off of preview data so it doesn't get merged into @site
+    const customThemeSettingsPreviewData = previewData.custom;
+    delete previewData.custom;
+    let customData = {};
+    if (labs.isSet('customThemeSettings')) {
+        customData = customThemeSettingsPreviewData;
+    }
+
+    // update site data with any preview values from the request
+    Object.assign(siteData, previewData);
+
     const member = req.member ? {
         uuid: req.member.uuid,
         email: req.member.email,
@@ -176,6 +192,7 @@ function updateLocalTemplateOptions(req, res, next) {
         data: {
             member: member,
             site: siteData,
+            custom: customData,
             // @deprecated: a gscan warning for @blog was added before 3.0 which replaced it with @site
             blog: siteData
         }

package/core/frontend/services/theme-engine/preview.js

@@ -14,34 +14,57 @@ function decodeValue(value) {
     return value;
 }
 
-function getPreviewData(previewHeader, siteData) {
+function getPreviewData(previewHeader, customThemeSettingKeys = []) {
     // Keep the string shorter with short codes for certain parameters
     const supportedSettings = {
         c: 'accent_color',
         icon: 'icon',
         logo: 'logo',
-        cover: 'cover_image'
+        cover: 'cover_image',
+        custom: 'custom',
+        d: 'description'
     };
 
     let opts = new URLSearchParams(previewHeader);
 
+    const previewData = {};
+
     opts.forEach((value, key) => {
         value = decodeValue(value);
         if (supportedSettings[key]) {
-            _.set(siteData, supportedSettings[key], value);
+            _.set(previewData, supportedSettings[key], value);
         }
     });
 
-    siteData._preview = previewHeader;
+    if (previewData.custom) {
+        try {
+            const custom = {};
+            const previewCustom = JSON.parse(previewData.custom);
+
+            if (typeof previewCustom === 'object') {
+                customThemeSettingKeys.forEach((key) => {
+                    custom[key] = previewCustom[key];
+                });
+            }
 
-    return siteData;
+            previewData.custom = custom;
+        } catch (e) {
+            previewData.custom = {};
+        }
+    }
+
+    previewData._preview = previewHeader;
+
+    return previewData;
 }
 
 module.exports._PREVIEW_HEADER_NAME = PREVIEW_HEADER_NAME;
-module.exports.handle = (req, siteData) => {
+module.exports.handle = (req, customThemeSettingKeys) => {
+    let previewData = {};
+
     if (req && req.header(PREVIEW_HEADER_NAME)) {
-        siteData = getPreviewData(req.header(PREVIEW_HEADER_NAME), siteData);
+        previewData = getPreviewData(req.header(PREVIEW_HEADER_NAME), customThemeSettingKeys);
     }
 
-    return siteData;
+    return previewData;
 };