ghost 5.129.2 → 6.0.0-alpha.1

package/core/built/admin/assets/img/amp-d7b72aae3315fda95921fb575dfca100.svg

@@ -1,4 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-    <title>amp</title>
-    <path d="m171.887 116.28-53.696 89.36h-9.728l9.617-58.227-30.2.047a4.854 4.854 0 0 1-4.855-4.855c0-1.152 1.07-3.102 1.07-3.102l53.52-89.254 9.9.043-9.86 58.317 30.413-.043a4.854 4.854 0 0 1 4.855 4.855c0 1.088-.427 2.044-1.033 2.854l.004.004-.007.001zM128 0C57.306 0 0 57.3 0 128s57.306 128 128 128 128-57.306 128-128S198.7 0 128 0z" fill="#0379C4" fill-rule="evenodd"/>
-</svg>

package/core/frontend/apps/amp/index.js

@@ -1,30 +0,0 @@
-const path = require('path');
-
-const router = require('./lib/router');
-const urlUtils = require('../../../shared/url-utils');
-
-// Dirty requires
-const settingsCache = require('../../../shared/settings-cache');
-
-function ampRouter(req, res) {
-    if (settingsCache.get('amp') === true) {
-        return router.apply(this, arguments);
-    } else {
-        // routeKeywords.amp: 'amp'
-        let redirectUrl = req.originalUrl.replace(/\/amp\//, '/');
-
-        urlUtils.redirect301(res, redirectUrl);
-    }
-}
-
-module.exports = {
-    activate: function activate(ghost) {
-        // routeKeywords.amp: 'amp'
-        let ampRoute = '*/amp/';
-
-        ghost.routeService.registerRouter(ampRoute, ampRouter);
-        ghost.helperService.registerDir(path.resolve(__dirname, './lib/helpers'));
-        // we use the {{ghost_head}} helper, but call it {{amp_ghost_head}}, so it's consistent
-        ghost.helperService.registerAlias('amp_ghost_head', 'ghost_head');
-    }
-};

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

@@ -1,32 +0,0 @@
-// # Amp Components Helper
-// Usage: `{{amp_analytics}}`
-//
-// Outputs inline scripts used for analytics
-const {settingsCache} = require('../../../../services/proxy');
-const {SafeString} = require('../../../../services/handlebars');
-
-function ampComponents() {
-    let components = [];
-
-    const ampGtagId = settingsCache.get('amp_gtag_id');
-    if (ampGtagId) {
-        components.push(`
-            <amp-analytics type="gtag" data-credentials="include">
-                <script type="application/json">
-                    {
-                        "vars" : {
-                            "gtag_id": "${ampGtagId}",
-                            "config" : {
-                                "${ampGtagId}": { "groups": "default" }
-                            }
-                        }
-                    }
-                </script>
-            </amp-analytics>
-        `);
-    }
-
-    return new SafeString(components.join('\n'));
-}
-
-module.exports = ampComponents;

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

@@ -1,48 +0,0 @@
-// # Amp Components Helper
-// Usage: `{{amp_components}}`
-//
-// Reads through the AMP HTML and adds neccessary scripts
-// for each extended component
-// If more components need to be added, we can add more scripts.
-// Here's the list of all supported extended components: https://www.ampproject.org/docs/reference/extended.html
-// 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 {settingsCache} = require('../../../../services/proxy');
-const {SafeString} = require('../../../../services/handlebars');
-
-function ampComponents() {
-    let components = [];
-    let html = this.post && this.post.html || this.html;
-
-    if (!html) {
-        return;
-    }
-
-    if (html.indexOf('.gif') !== -1) {
-        components.push('<script async custom-element="amp-anim" src="https://cdn.ampproject.org/v0/amp-anim-0.1.js"></script>');
-    }
-
-    let iframeCount = (html.match(/(<iframe)(.*?\s*?)(<\/iframe>)/gi) || []).length;
-    let youtubeCount = (html.match(/(<iframe)(.*?\s*?)(youtu.be\/|youtube(-nocookie)?.com\/(v\/|.*u\/\w\/|embed\/|.*v=))(.*?\s*?)(<\/iframe>)/gi) || []).length;
-
-    if (youtubeCount) {
-        components.push('<script async custom-element="amp-youtube" src="https://cdn.ampproject.org/v0/amp-youtube-0.1.js"></script>');
-    }
-
-    if (iframeCount > youtubeCount) {
-        components.push('<script async custom-element="amp-iframe" src="https://cdn.ampproject.org/v0/amp-iframe-0.1.js"></script>');
-    }
-
-    if (html.indexOf('<audio') !== -1) {
-        components.push('<script async custom-element="amp-audio" src="https://cdn.ampproject.org/v0/amp-audio-0.1.js"></script>');
-    }
-
-    if (settingsCache.get('amp_gtag_id')) {
-        components.push('<script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>');
-    }
-
-    return new SafeString(components.join('\n'));
-}
-
-module.exports = ampComponents;

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

@@ -1,214 +0,0 @@
-// # Amp Content Helper
-// Usage: `{{amp_content}}`
-//
-// Turns content html into a safestring so that the user doesn't have to
-// escape it or tell handlebars to leave it alone with a triple-brace.
-//
-// Converts normal HTML into AMP HTML with Amperize module and uses a cache to return it from
-// there if available. The cacheId is a combination of `updated_at` and the `slug`.
-const {DateTime} = require('luxon');
-const errors = require('@tryghost/errors');
-const logging = require('@tryghost/logging');
-
-const {SafeString} = require('../../../../services/handlebars');
-
-const amperizeCache = {};
-let allowedAMPTags = [];
-let allowedAMPAttributes = {};
-let amperize = null;
-let ampHTML = '';
-let cleanHTML = '';
-
-allowedAMPTags = ['html', 'body', 'article', 'section', 'nav', 'aside', 'h1', 'h2',
-    'h3', 'h4', 'h5', 'h6', 'header', 'footer', 'address', 'p', 'hr',
-    'pre', 'blockquote', 'ol', 'ul', 'li', 'dl', 'dt', 'dd', 'figure',
-    'figcaption', 'div', 'main', 'a', 'em', 'strong', 'small', 's', 'cite',
-    'q', 'dfn', 'abbr', 'data', 'time', 'code', 'var', 'samp', 'kbd', 'sub',
-    'sup', 'i', 'b', 'u', 'mark', 'ruby', 'rb', 'rt', 'rtc', 'rp', 'bdi',
-    'bdo', 'span', 'br', 'wbr', 'ins', 'del', 'source', 'track', 'svg', 'g',
-    'path', 'glyph', 'glyphref', 'marker', 'view', 'circle', 'line', 'polygon',
-    'polyline', 'rect', 'text', 'textpath', 'tref', 'tspan', 'clippath',
-    'filter', 'lineargradient', 'radialgradient', 'mask', 'pattern', 'vkern',
-    'hkern', 'defs', 'stop', 'use', 'foreignobject', 'symbol', 'desc', 'title',
-    'table', 'caption', 'colgroup', 'col', 'tbody', 'thead', 'tfoot', 'tr', 'td',
-    'th', 'button', 'noscript', 'acronym', 'center', 'dir', 'hgroup', 'listing',
-    'multicol', 'nextid', 'nobr', 'spacer', 'strike', 'tt', 'xmp', 'amp-img',
-    'amp-video', 'amp-ad', 'amp-embed', 'amp-anim', 'amp-iframe', 'amp-youtube',
-    'amp-pixel', 'amp-audio', 'O:P'];
-
-allowedAMPAttributes = {
-    '*': ['itemid', 'itemprop', 'itemref', 'itemscope', 'itemtype', 'accesskey', 'class', 'dir', 'draggable',
-        'id', 'lang', 'tabindex', 'title', 'translate', 'aria-*', 'role', 'placeholder', 'fallback', 'lightbox',
-        'overflow', 'amp-access', 'amp-access-*', 'i-amp-access-id', 'data-*'],
-    h1: ['align'],
-    h2: ['align'],
-    h3: ['align'],
-    h4: ['align'],
-    h5: ['align'],
-    h6: ['align'],
-    p: ['align'],
-    blockquote: ['align'],
-    ol: ['reversed', 'start', 'type'],
-    li: ['value'],
-    div: ['align'],
-    a: ['href', 'hreflang', 'rel', 'role', 'tabindex', 'target', 'download', 'media', 'type', 'border', 'name'],
-    time: ['datetime'],
-    bdo: ['dir'],
-    ins: ['datetime'],
-    del: ['datetime'],
-    source: ['src', 'srcset', 'sizes', 'media', 'type', 'kind', 'label', 'srclang'],
-    track: ['src', 'default', 'kind', 'label', 'srclang'],
-    svg: ['*'],
-    g: ['*'],
-    glyph: ['*'],
-    glyphref: ['*'],
-    marker: ['*'],
-    path: ['*'],
-    view: ['*'],
-    circle: ['*'],
-    line: ['*'],
-    polygon: ['*'],
-    polyline: ['*'],
-    rect: ['*'],
-    text: ['*'],
-    textpath: ['*'],
-    tref: ['*'],
-    tspan: ['*'],
-    clippath: ['*'],
-    filter: ['*'],
-    hkern: ['*'],
-    lineargradient: ['*'],
-    mask: ['*'],
-    pattern: ['*'],
-    radialgradient: ['*'],
-    stop: ['*'],
-    vkern: ['*'],
-    defs: ['*'],
-    symbol: ['*'],
-    use: ['*'],
-    foreignobject: ['*'],
-    desc: ['*'],
-    title: ['*'],
-    table: ['sortable', 'align', 'border', 'bgcolor', 'cellpadding', 'cellspacing', 'width'],
-    colgroup: ['span'],
-    col: ['span'],
-    tr: ['align', 'bgcolor', 'height', 'valign'],
-    td: ['align', 'bgcolor', 'height', 'valign', 'colspan', 'headers', 'rowspan'],
-    th: ['align', 'bgcolor', 'height', 'valign', 'colspan', 'headers', 'rowspan', 'abbr', 'scope', 'sorted'],
-    button: ['disabled', 'name', 'role', 'tabindex', 'type', 'value', 'formtarget'],
-    // built ins
-    'amp-img': ['media', 'noloading', 'alt', 'attribution', 'placeholder', 'src', 'srcset', 'width', 'height', 'layout'],
-    'amp-pixel': ['src'],
-    'amp-video': ['src', 'srcset', 'media', 'noloading', 'width', 'height', 'layout', 'alt', 'attribution',
-        'autoplay', 'controls', 'loop', 'muted', 'poster', 'preload'],
-    'amp-embed': ['media', 'noloading', 'width', 'height', 'layout', 'type', 'data-*', 'json'],
-    'amp-ad': ['media', 'noloading', 'width', 'height', 'layout', 'type', 'data-*', 'json'],
-    // extended components we support
-    'amp-anim': ['media', 'noloading', 'alt', 'attribution', 'placeholder', 'src', 'srcset', 'width', 'height', 'layout'],
-    'amp-audio': ['src', 'width', 'height', 'autoplay', 'loop', 'muted', 'controls'],
-    'amp-iframe': ['src', 'srcdoc', 'width', 'height', 'layout', 'frameborder', 'allowfullscreen', 'allowtransparency',
-        'sandbox', 'referrerpolicy'],
-    'amp-youtube': ['src', 'layout', 'frameborder', 'autoplay', 'loop', 'data-videoid', 'data-live-channelid', 'width', 'height']
-};
-
-function getAmperizeHTML(html, post) {
-    if (!html) {
-        return;
-    }
-
-    let Amperize = require('amperize');
-
-    amperize = amperize || new Amperize();
-
-    let cacheDateTime;
-    let postDateTime;
-
-    if (amperizeCache[post.id]) {
-        const {updated_at: ampCacheUpdatedAt} = amperizeCache[post.id];
-        const {updated_at: postUpdatedAt} = post;
-
-        cacheDateTime = DateTime.fromJSDate(new Date(ampCacheUpdatedAt));
-        postDateTime = DateTime.fromJSDate(new Date(postUpdatedAt));
-    }
-
-    if (!amperizeCache[post.id] || cacheDateTime.diff(postDateTime).valueOf() < 0) {
-        return new Promise((resolve) => {
-            amperize.parse(html, (err, res) => {
-                if (err) {
-                    if (err.src) {
-                        // This is a valid 500 GhostError because it means the amperize parser is unable to handle some Ghost HTML.
-                        logging.error(new errors.InternalServerError({
-                            message: `AMP HTML couldn't be parsed: ${err.src}`,
-                            code: 'AMP_PARSER_ERROR',
-                            err: err,
-                            context: post.url,
-                            help: 'Please share this error on GitHub or https://forum.ghost.org'
-                        }));
-                    } else {
-                        logging.error(new errors.InternalServerError({err, code: 'AMP_PARSER_ERROR'}));
-                    }
-
-                    // save it in cache to prevent multiple calls to Amperize until
-                    // content is updated.
-                    amperizeCache[post.id] = {updated_at: post.updated_at, amp: html};
-                    // return the original html on an error
-                    return resolve(html);
-                }
-
-                amperizeCache[post.id] = {updated_at: post.updated_at, amp: res};
-                return resolve(amperizeCache[post.id].amp);
-            });
-        });
-    }
-
-    return Promise.resolve(amperizeCache[post.id].amp);
-}
-
-module.exports = async function amp_content() { // eslint-disable-line camelcase
-    let sanitizeHtml = require('sanitize-html');
-    let cheerio = require('cheerio');
-
-    try {
-        const response = await getAmperizeHTML(this.html, this);
-        let $ = null;
-
-        // our Amperized HTML
-        ampHTML = response ?? '';
-
-        // Use cheerio to traverse through HTML and make little clean-ups
-        $ = cheerio.load(ampHTML);
-
-        // We have to remove source children in video, as source is allowed for audio,
-        // but causes validation errors in video, because video will be stripped out.
-        // @TODO: remove this, when Amperize support video transform
-        $('video').children('source').remove();
-        $('video').children('track').remove();
-
-        // Case: AMP parsing failed and we returned the regular HTML,
-        // then we have to remove remaining, invalid HTML tags.
-        $('audio').children('source').remove();
-        $('audio').children('track').remove();
-
-        $('amp-youtube').attr('layout', 'responsive');
-        $('amp-youtube').attr('height', '350');
-        $('amp-youtube').attr('width', '600');
-
-        ampHTML = $.html();
-
-        // @TODO: remove this, when Amperize supports HTML sanitizing
-        cleanHTML = sanitizeHtml(ampHTML, {
-            allowedTags: allowedAMPTags,
-            allowedAttributes: allowedAMPAttributes,
-            selfClosing: ['source', 'track', 'br']
-        });
-
-        return new SafeString(cleanHTML);
-    } catch (error) {
-        logging.error(error);
-
-        // Return an empty safe string
-        return new SafeString('');
-    }
-};
-
-module.exports.async = true;

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

@@ -1,8 +0,0 @@
-const {SafeString, escapeExpression} = require('../../../../services/handlebars');
-
-module.exports = function amp_style(options) { // eslint-disable-line camelcase
-    if (options.data.site.accent_color) {
-        const accentColor = escapeExpression(options.data.site.accent_color);
-        return new SafeString(`:root {--ghost-accent-color: ${accentColor};}`);
-    }
-};

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

@@ -1,95 +0,0 @@
-const path = require('path');
-const express = require('../../../../shared/express');
-const ampRouter = express.Router('amp');
-
-const tpl = require('@tryghost/tpl');
-const errors = require('@tryghost/errors');
-
-// Dirty requires
-const urlService = require('../../../../server/services/url');
-const dataService = require('../../../services/data');
-const renderer = require('../../../services/rendering');
-const templateName = 'amp';
-
-const messages = {
-    pageNotFound: 'Page not found.'
-};
-
-function _renderer(req, res, next) {
-    res.routerOptions = {
-        type: 'custom',
-        templates: templateName,
-        defaultTemplate: path.resolve(__dirname, 'views', `${templateName}.hbs`)
-    };
-
-    // Renderer begin
-    // Format data
-    let body = req.body || {};
-
-    if (!body.post) {
-        return next(new errors.NotFoundError({message: tpl(messages.pageNotFound)}));
-    }
-
-    // Render Call
-    return renderer.renderer(req, res, body);
-}
-
-// This here is a controller.
-// In fact, this whole file is nothing more than a controller + renderer & doesn't need to be a router
-function getPostData(req, res, next) {
-    req.body = req.body || {};
-
-    const urlWithoutSubdirectoryWithoutAmp = res.locals.relativeUrl.match(/(.*?\/)amp\/?$/)[1];
-
-    /**
-     * @NOTE
-     *
-     * We have to figure out the target permalink, otherwise it would be possible to serve a post
-     * which lives in two collections.
-     *
-     * @TODO:
-     *
-     * This is not optimal and caused by the fact how apps currently work. But apps weren't designed
-     * for dynamic routing.
-     *
-     * I think if the responsible, target router would first take care fetching/determining the post, the
-     * request could then be forwarded to this app. Then we don't have to:
-     *
-     * 1. care about fetching the post
-     * 2. care about if the post can be served
-     * 3. then this app would act like an extension
-     *
-     * The challenge is to design different types of apps e.g. extensions of routers, standalone pages etc.
-     */
-    const permalinks = urlService.getPermalinkByUrl(urlWithoutSubdirectoryWithoutAmp, {withUrlOptions: true});
-
-    if (!permalinks) {
-        return next(new errors.NotFoundError({
-            message: tpl(messages.pageNotFound)
-        }));
-    }
-
-    // @NOTE: amp is not supported for "page" resource
-    // @TODO: https://github.com/TryGhost/Ghost/issues/10548
-    dataService.entryLookup(urlWithoutSubdirectoryWithoutAmp, {permalinks, query: {controller: 'postsPublic', resource: 'posts'}}, res.locals)
-        .then((result) => {
-            if (result && result.entry) {
-                req.body.post = result.entry;
-            }
-
-            next();
-        })
-        .catch(next);
-}
-
-// AMP frontend route
-ampRouter
-    .route('/')
-    .get(
-        getPostData,
-        _renderer
-    );
-
-module.exports = ampRouter;
-module.exports.renderer = _renderer;
-module.exports.getPostData = getPostData;