ghost 4.15.0 → 4.17.1

package/core/frontend/apps/amp/lib/helpers/amp_analytics.js

@@ -2,8 +2,8 @@
 // Usage: `{{amp_analytics}}`
 //
 // Outputs inline scripts used for analytics
-
-const {SafeString, settingsCache} = require('../../../../services/proxy');
+const {settingsCache} = require('../../../../services/proxy');
+const {SafeString} = require('../../../../services/rendering');
 
 function ampComponents() {
     let components = [];

package/core/frontend/apps/amp/lib/helpers/amp_components.js

@@ -8,7 +8,8 @@
 // By default supported AMP HTML tags (no additional script tag necessary):
 // amp-img, amp-ad, amp-embed, amp-video and amp-pixel.
 // (less) dirty requires
-const {SafeString, settingsCache} = require('../../../../services/proxy');
+const {settingsCache} = require('../../../../services/proxy');
+const {SafeString} = require('../../../../services/rendering');
 
 function ampComponents() {
     let components = [];

package/core/frontend/apps/amp/lib/helpers/amp_content.js

@@ -9,7 +9,11 @@
 const Promise = require('bluebird');
 
 const moment = require('moment');
-const {SafeString, logging, errors} = require('../../../../services/proxy');
+const errors = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
+
+const {SafeString} = require('../../../../services/rendering');
+
 const amperizeCache = {};
 let allowedAMPTags = [];
 let allowedAMPAttributes = {};

package/core/frontend/apps/amp/lib/helpers/amp_style.js

@@ -1,4 +1,4 @@
-const {SafeString, escapeExpression} = require('../../../../services/proxy');
+const {SafeString, escapeExpression} = require('../../../../services/rendering');
 
 module.exports = function amp_style(options) { // eslint-disable-line camelcase
     if (options.data.site.accent_color) {

package/core/frontend/apps/amp/lib/router.js

@@ -2,14 +2,18 @@ const path = require('path');
 const express = require('../../../../shared/express');
 const ampRouter = express.Router('amp');
 
-// Dirty requires
-const {i18n} = require('../../../services/proxy');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+// Dirty requires
 const urlService = require('../../../services/url');
 const helpers = require('../../../services/routing/helpers');
 const templateName = 'amp';
 
+const messages = {
+    pageNotFound: 'Page not found.'
+};
+
 function _renderer(req, res, next) {
     res.routerOptions = {
         type: 'custom',
@@ -23,7 +27,7 @@ function _renderer(req, res, next) {
 
     // CASE: we only support amp pages for posts that are not static pages
     if (!data.post || data.post.page) {
-        return next(new errors.NotFoundError({message: i18n.t('errors.errors.pageNotFound')}));
+        return next(new errors.NotFoundError({message: tpl(messages.pageNotFound)}));
     }
 
     // Render Call
@@ -61,7 +65,7 @@ function getPostData(req, res, next) {
 
     if (!permalinks) {
         return next(new errors.NotFoundError({
-            message: i18n.t('errors.errors.pageNotFound')
+            message: tpl(messages.pageNotFound)
         }));
     }
 

package/core/frontend/apps/private-blogging/index.js

@@ -1,11 +1,19 @@
-const {i18n} = require('../../services/proxy');
-const urlUtils = require('../../../shared/url-utils');
+const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
+const urlUtils = require('../../../shared/url-utils');
 const middleware = require('./lib/middleware');
 const router = require('./lib/router');
 const registerHelpers = require('./lib/helpers');
 
+const messages = {
+    urlCannotContainPrivateSubdir: {
+        error: 'private subdirectory not allowed',
+        description: 'Your site url in config.js cannot contain a subdirectory called private.',
+        help: 'Please rename the subdirectory before restarting'
+    }
+};
+
 // routeKeywords.private: 'private'
 const PRIVATE_KEYWORD = 'private';
 
@@ -17,9 +25,9 @@ let checkSubdir = function checkSubdir() {
 
         if (paths.pop() === PRIVATE_KEYWORD) {
             logging.error(new errors.GhostError({
-                message: i18n.t('errors.config.urlCannotContainPrivateSubdir.error'),
-                context: i18n.t('errors.config.urlCannotContainPrivateSubdir.description'),
-                help: i18n.t('errors.config.urlCannotContainPrivateSubdir.help')
+                message: tpl(messages.urlCannotContainPrivateSubdir.error),
+                context: tpl(messages.urlCannotContainPrivateSubdir.description),
+                help: tpl(messages.urlCannotContainPrivateSubdir.help)
             }));
 
             // @TODO: why

package/core/frontend/apps/private-blogging/lib/helpers/input_password.js

@@ -4,7 +4,7 @@
 // Password input used on private.hbs for password-protected blogs
 
 // (less) dirty requires
-const {SafeString, templates} = require('../../../../services/proxy');
+const {SafeString, templates} = require('../../../../services/rendering');
 
 // We use the name input_password to match the helper for consistency:
 module.exports = function input_password(options) { // eslint-disable-line camelcase

package/core/frontend/apps/private-blogging/lib/middleware.js

@@ -5,12 +5,17 @@ const path = require('path');
 const config = require('../../../../shared/config');
 const urlUtils = require('../../../../shared/url-utils');
 const constants = require('@tryghost/constants');
-const {i18n} = require('../../../services/proxy');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const settingsCache = require('../../../../shared/settings-cache');
 // routeKeywords.private: 'private'
 const privateRoute = '/private/';
 
+const messages = {
+    pageNotFound: 'Page not found.',
+    wrongPassword: 'Wrong password'
+};
+
 function verifySessionHash(salt, hash) {
     if (!salt || !hash) {
         return false;
@@ -95,7 +100,7 @@ const privateBlogging = {
             // CASE: RSS is disabled for private blogging e.g. they create overhead
             if (req.path.match(/\/rss\/$/)) {
                 return next(new errors.NotFoundError({
-                    message: i18n.t('errors.errors.pageNotFound')
+                    message: tpl(messages.pageNotFound)
                 }));
             }
 
@@ -156,7 +161,7 @@ const privateBlogging = {
             return res.redirect(urlUtils.urlFor({relativeUrl: forward}));
         } else {
             res.error = {
-                message: i18n.t('errors.middleware.privateblogging.wrongPassword')
+                message: tpl(messages.wrongPassword)
             };
             return next();
         }

package/core/frontend/helpers/asset.js

@@ -2,16 +2,24 @@
 // Usage: `{{asset "css/screen.css"}}`
 //
 // Returns the path to the specified asset.
-const {SafeString, metaData, errors, i18n} = require('../services/proxy');
+const {metaData} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
+
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const get = require('lodash/get');
 const {getAssetUrl} = metaData;
 
+const messages = {
+    pathIsRequired: 'The {{asset}} helper must be passed a path'
+};
+
 module.exports = function asset(path, options) {
     const hasMinFile = get(options, 'hash.hasMinFile');
 
     if (!path) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.asset.pathIsRequired')
+            message: tpl(messages.pathIsRequired)
         });
     }
 

package/core/frontend/helpers/author.js

@@ -9,16 +9,18 @@
 //
 // Block helper: `{{#author}}{{/author}}`
 // This is the default handlebars behaviour of dropping into the author object scope
-const {urlService, SafeString, escapeExpression, hbs, templates} = require('../services/proxy');
-const buildInHelpers = hbs.handlebars.helpers;
+const {urlService} = require('../services/proxy');
+const {SafeString, escapeExpression, hbs, templates} = require('../services/rendering');
 const isString = require('lodash/isString');
 
+const builtInHelpers = hbs.handlebars.helpers;
+
 /**
  * @deprecated: single authors was superceded by multiple authors in Ghost 1.22.0
  */
 module.exports = function author(options) {
     if (options.fn) {
-        return buildInHelpers.with.call(this, this.author, options);
+        return builtInHelpers.with.call(this, this.author, options);
     }
 
     const autolink = isString(options.hash.autolink) && options.hash.autolink === 'false' ? false : true;

package/core/frontend/helpers/authors.js

@@ -6,9 +6,10 @@
 // By default, authors are separated by commas.
 //
 // Note that the standard {{#each authors}} implementation is unaffected by this helper.
+const {urlService} = require('../services/proxy');
+const {SafeString, escapeExpression, templates} = require('../services/rendering');
 const isString = require('lodash/isString');
-const {SafeString, escapeExpression, templates, urlService} = require('../services/proxy');
-const ghostHelperUtils = require('@tryghost/helpers').utils;
+const {utils} = require('@tryghost/helpers');
 
 module.exports = function authors(options = {}) {
     options.hash = options.hash || {};
@@ -38,7 +39,7 @@ module.exports = function authors(options = {}) {
             }) : escapeExpression(author.name);
         }
 
-        return ghostHelperUtils.visibility.filter(authorsList, visibility, processAuthor);
+        return utils.visibility.filter(authorsList, visibility, processAuthor);
     }
 
     if (this.authors && this.authors.length) {

package/core/frontend/helpers/body_class.js

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

package/core/frontend/helpers/cancel_link.js

@@ -5,14 +5,21 @@
 // Outputs cancel/renew links to manage subscription renewal after the subscription period ends.
 //
 // Defaults to class="cancel-subscription-link" errorClass="cancel-subscription-error" cancelLabel="Cancel subscription" continueLabel="Continue subscription"
+const {labs} = require('../services/proxy');
+const {templates} = require('../services/rendering');
 
-const {templates, errors, i18n, labs} = require('../services/proxy');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    invalidData: 'The {{cancel_link}} helper was used outside of a subscription context. See https://ghost.org/docs/themes/members/#cancel-links.'
+};
 
 function cancel_link(options) { // eslint-disable-line camelcase
     let truncateOptions = (options || {}).hash || {};
 
     if (this.id === undefined || this.cancel_at_period_end === undefined) {
-        throw new errors.IncorrectUsageError({message: i18n.t('warnings.helpers.cancel_link.invalidData')});
+        throw new errors.IncorrectUsageError({message: tpl(messages.invalidData)});
     }
 
     const data = {

package/core/frontend/helpers/concat.js

@@ -1,4 +1,4 @@
-const {SafeString} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
 
 module.exports = function concat(...args) {
     const options = args.pop();

package/core/frontend/helpers/content.js

@@ -10,7 +10,7 @@
 //
 // Dev flag feature: In case of restricted content access for member-only posts, shows CTA box
 
-const {templates, hbs, SafeString} = require('../services/proxy');
+const {templates, hbs, SafeString} = require('../services/rendering');
 const downsize = require('downsize');
 const _ = require('lodash');
 const createFrame = hbs.handlebars.createFrame;

package/core/frontend/helpers/date.js

@@ -3,7 +3,7 @@
 //
 // Formats a date using moment-timezone.js. Formats published_at by default but will also take a date as a parameter
 
-const {SafeString} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
 const moment = require('moment-timezone');
 const _ = require('lodash');
 

package/core/frontend/helpers/encode.js

@@ -4,7 +4,7 @@
 //
 // Returns URI encoded string
 
-const {SafeString} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
 
 module.exports = function encode(string, options) {
     const uri = string || options;

package/core/frontend/helpers/excerpt.js

@@ -5,7 +5,8 @@
 //
 // Defaults to words="50"
 
-const {SafeString, metaData} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
+const {metaData} = require('../services/proxy');
 const _ = require('lodash');
 const getMetaDataExcerpt = metaData.getMetaDataExcerpt;
 

package/core/frontend/helpers/facebook_url.js

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

package/core/frontend/helpers/foreach.js

@@ -2,14 +2,23 @@
 // Usage: `{{#foreach data}}{{/foreach}}`
 //
 // Block helper designed for looping through posts
+const {checks} = require('../services/proxy');
+const {hbs} = require('../services/rendering');
+
 const _ = require('lodash');
-const {logging, i18n, hbs, checks} = require('../services/proxy');
+const logging = require('@tryghost/logging');
+const tpl = require('@tryghost/tpl');
+
 const {Utils: hbsUtils, handlebars: {createFrame}} = hbs;
 const ghostHelperUtils = require('@tryghost/helpers').utils;
 
+const messages = {
+    iteratorNeeded: 'Need to pass an iterator to {{#foreach}}'
+};
+
 module.exports = function foreach(items, options) {
     if (!options) {
-        logging.warn(i18n.t('warnings.helpers.foreach.iteratorNeeded'));
+        logging.warn(tpl(messages.iteratorNeeded));
     }
 
     if (hbsUtils.isFunction(items)) {

package/core/frontend/helpers/get.js

@@ -1,11 +1,22 @@
 // # Get Helper
 // Usage: `{{#get "posts" limit="5"}}`, `{{#get "tags" limit="all"}}`
 // Fetches data from the API
-const {config, logging, errors, i18n, hbs, api, prepareContextResource} = require('../services/proxy');
+const {config, api, prepareContextResource} = require('../services/proxy');
+const {hbs} = require('../services/rendering');
+
+const logging = require('@tryghost/logging');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
 const _ = require('lodash');
 const Promise = require('bluebird');
 const jsonpath = require('jsonpath');
 
+const messages = {
+    mustBeCalledAsBlock: 'The {{{helperName}}} helper must be called as a block. E.g. {{#{helperName}}}...{{/{helperName}}}',
+    invalidResource: 'Invalid resource given to get helper'
+};
+
 const createFrame = hbs.handlebars.createFrame;
 
 const RESOURCES = {
@@ -121,13 +132,13 @@ module.exports = function get(resource, options) {
     let returnedRowsCount;
 
     if (!options.fn) {
-        data.error = i18n.t('warnings.helpers.mustBeCalledAsBlock', {helperName: 'get'});
+        data.error = tpl(messages.mustBeCalledAsBlock, {helperName: 'get'});
         logging.warn(data.error);
         return Promise.resolve();
     }
 
     if (!RESOURCES[resource]) {
-        data.error = i18n.t('warnings.helpers.get.invalidResource');
+        data.error = tpl(messages.invalidResource);
         logging.warn(data.error);
         return Promise.resolve(options.inverse(self, {data: data}));
     }

package/core/frontend/helpers/ghost_foot.js

@@ -2,7 +2,8 @@
 // Usage: `{{ghost_foot}}`
 //
 // Outputs scripts and other assets at the bottom of a Ghost theme
-const {SafeString, settingsCache} = require('../services/proxy');
+const {settingsCache} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
 const _ = require('lodash');
 
 // We use the name ghost_foot to match the helper for consistency:

package/core/frontend/helpers/ghost_head.js

@@ -2,7 +2,10 @@
 // Usage: `{{ghost_head}}`
 //
 // Outputs scripts and other assets at the top of a Ghost theme
-const {metaData, escapeExpression, SafeString, logging, settingsCache, config, blogIcon, urlUtils} = require('../services/proxy');
+const {metaData, settingsCache, config, blogIcon, urlUtils, labs} = require('../services/proxy');
+const {escapeExpression, SafeString} = require('../services/rendering');
+
+const logging = require('@tryghost/logging');
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('ghost_head');
 const templateStyles = require('./tpl/styles');
@@ -176,6 +179,12 @@ module.exports = function ghost_head(options) { // eslint-disable-line camelcase
             head.push('<meta name="generator" content="Ghost ' +
                 escapeExpression(safeVersion) + '" />');
 
+            // Ghost analytics tag
+            if (labs.isSet('membersActivity')) {
+                const postId = (dataRoot && dataRoot.post) ? dataRoot.post.id : '';
+                head.push(writeMetaTag('ghost-analytics-id', postId, 'name'));
+            }
+
             head.push('<link rel="alternate" type="application/rss+xml" title="' +
                 escapeExpression(meta.site.title) + '" href="' +
                 escapeExpression(meta.rssUrl) + '" />');

package/core/frontend/helpers/has.js

@@ -4,9 +4,14 @@
 //
 // Checks if a post has a particular property
 
-const {logging, i18n} = require('../services/proxy');
+const logging = require('@tryghost/logging');
+const tpl = require('@tryghost/tpl');
 const _ = require('lodash');
-const validAttrs = ['tag', 'author', 'slug','visibility', 'id', 'number', 'index', 'any', 'all'];
+const validAttrs = ['tag', 'author', 'slug', 'visibility', 'id', 'number', 'index', 'any', 'all'];
+
+const messages = {
+    invalidAttribute: 'Invalid or no attribute given to has helper'
+};
 
 function handleCount(ctxAttr, data) {
     if (!data || !_.isFinite(data.length)) {
@@ -155,7 +160,7 @@ module.exports = function has(options) {
     let result;
 
     if (_.isEmpty(attrs)) {
-        logging.warn(i18n.t('warnings.helpers.has.invalidAttribute'));
+        logging.warn(tpl(messages.invalidAttribute));
         return;
     }
 

package/core/frontend/helpers/img_url.js

@@ -6,24 +6,30 @@
 //
 // Returns the URL for the current object scope i.e. If inside a post scope will return image permalink
 // `absolute` flag outputs absolute URL, else URL is relative.
+const {urlUtils} = require('../services/proxy');
 
 const url = require('url');
 const _ = require('lodash');
-const {urlUtils, logging, i18n} = require('../services/proxy');
+const logging = require('@tryghost/logging');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    attrIsRequired: 'Attribute is required e.g. {{img_url feature_image}}'
+};
 
 const STATIC_IMAGE_URL_PREFIX = `${urlUtils.STATIC_IMAGE_URL_PREFIX}`;
 
 module.exports = function imgUrl(requestedImageUrl, options) {
     // CASE: if no url is passed, e.g. `{{img_url}}` we show a warning
     if (arguments.length < 2) {
-        logging.warn(i18n.t('warnings.helpers.img_url.attrIsRequired'));
+        logging.warn(tpl(messages.attrIsRequired));
         return;
     }
 
     // CASE: if url is passed, but it is undefined, then the attribute was
     // an unknown value, e.g. {{img_url feature_img}} and we also show a warning
     if (requestedImageUrl === undefined) {
-        logging.warn(i18n.t('warnings.helpers.img_url.attrIsRequired'));
+        logging.warn(tpl(messages.attrIsRequired));
         return;
     }
 

package/core/frontend/helpers/is.js

@@ -1,16 +1,21 @@
 // # Is Helper
 // Usage: `{{#is "paged"}}`, `{{#is "index, paged"}}`
 // Checks whether we're in a given context.
-const {logging, i18n} = require('../services/proxy');
+const logging = require('@tryghost/logging');
+const tpl = require('@tryghost/tpl');
 const _ = require('lodash');
 
+const messages = {
+    invalidAttribute: 'Invalid or no attribute given to is helper'
+};
+
 module.exports = function is(context, options) {
     options = options || {};
 
     const currentContext = options.data.root.context;
 
     if (!_.isString(context)) {
-        logging.warn(i18n.t('warnings.helpers.is.invalidAttribute'));
+        logging.warn(tpl(messages.invalidAttribute));
         return;
     }
 

package/core/frontend/helpers/lang.js

@@ -12,7 +12,7 @@
 // Language tags in HTML and XML
 // https://www.w3.org/International/articles/language-tags/
 
-const {SafeString} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
 
 module.exports = function lang(options) {
     const locale = options.data.site.locale;

package/core/frontend/helpers/link.js

@@ -1,8 +1,17 @@
 // # link helper
+const {config} = require('../services/proxy');
+const {SafeString, localUtils} = require('../services/rendering');
+
 const _ = require('lodash');
-const {config, SafeString, errors, i18n, localUtils} = require('../services/proxy');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
 const {buildLinkClasses} = localUtils;
 
+const messages = {
+    hrefIsRequired: 'The {{#link}}{{/link}} helper requires an href="" attribute.'
+};
+
 const managedAttributes = ['href', 'class', 'activeClass', 'parentActiveClass'];
 
 function _formatAttrs(attributes) {
@@ -25,7 +34,7 @@ module.exports = function link(options) {
     // If there is no href provided, this is theme dev error, so we throw an error to make this clear.
     if (!_.has(options.hash, 'href')) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.link.hrefIsRequired')
+            message: tpl(messages.hrefIsRequired)
         });
     }
     // If the href attribute is empty, this is probably a dynamic data problem, hard for theme devs to track down

package/core/frontend/helpers/link_class.js

@@ -1,8 +1,17 @@
 // # link_class helper
+const {config} = require('../services/proxy');
+const {SafeString, localUtils} = require('../services/rendering');
+
 const _ = require('lodash');
-const {config, SafeString, errors, i18n, localUtils} = require('../services/proxy');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
 const {buildLinkClasses} = localUtils;
 
+const messages = {
+    forIsRequired: 'The {{link_class}} helper requires a for="" attribute.'
+};
+
 module.exports = function link_class(options) { // eslint-disable-line camelcase
     options = options || {};
     options.hash = options.hash || {};
@@ -11,7 +20,7 @@ module.exports = function link_class(options) { // eslint-disable-line camelcase
     // If there is no for provided, this is theme dev error, so we throw an error to make this clear.
     if (!_.has(options.hash, 'for')) {
         throw new errors.IncorrectUsageError({
-            message: i18n.t('warnings.helpers.link_class.forIsRequired')
+            message: tpl(messages.forIsRequired)
         });
     }
 

package/core/frontend/helpers/match.js

@@ -1,6 +1,15 @@
-const {logging, i18n, SafeString, labs} = require('../services/proxy');
+const {labs} = require('../services/proxy');
+const {SafeString} = require('../services/rendering');
+
+const logging = require('@tryghost/logging');
+const tpl = require('@tryghost/tpl');
+
 const _ = require('lodash');
 
+const messages = {
+    invalidAttribute: 'Invalid or no attribute given to match helper'
+};
+
 /**
  * This is identical to the built-in if helper, except inverse/fn calls are replaced with false/true
  * https://github.com/handlebars-lang/handlebars.js/blob/19bdace85a8d0bc5ed3a4dec4071cb08c8d003f2/lib/handlebars/helpers/if.js#L9-L20
@@ -58,7 +67,7 @@ function match(...attrs) {
     let result;
 
     if (_.isEmpty(attrs)) {
-        logging.warn(i18n.t('warnings.helpers.has.invalidAttribute'));
+        logging.warn(tpl(messages.invalidAttribute));
         return;
     }
 
@@ -68,7 +77,7 @@ function match(...attrs) {
     } else if (attrs.length === 3) {
         result = handleMatch(attrs[0], attrs[1], attrs[2], options);
     } else {
-        logging.warn(i18n.t('warnings.helpers.has.invalidAttribute'));
+        logging.warn(tpl(messages.invalidAttribute));
         return;
     }