ghost 5.95.0 → 5.96.1

package/core/frontend/services/assets-minification/CommentCountsAssets.js

@@ -0,0 +1,34 @@
+const Minifier = require('@tryghost/minifier');
+const path = require('path');
+const config = require('../../../shared/config');
+const AssetsMinificationBase = require('./AssetsMinificationBase');
+
+module.exports = class CommentCountsAssets extends AssetsMinificationBase {
+    constructor(options = {}) {
+        super(options);
+
+        this.src = options.src || path.join(config.get('paths').assetSrc, 'comment-counts');
+        this.dest = options.dest || config.getContentPath('public');
+        this.minifier = new Minifier({src: this.src, dest: this.dest});
+
+        this.files = [];
+    }
+
+    /**
+     * @override
+     */
+    generateGlobs() {
+        return {
+            'comment-counts.min.js': 'js/*.js'
+        };
+    }
+
+    /**
+     * @override
+     */
+    async load() {
+        await this.clearFiles();
+        const globs = this.generateGlobs();
+        this.files = await this.minify(globs);
+    }
+};

package/core/frontend/services/assets-minification/MemberAttributionAssets.js

@@ -0,0 +1,46 @@
+const Minifier = require('@tryghost/minifier');
+const path = require('path');
+const config = require('../../../shared/config');
+const AssetsMinificationBase = require('./AssetsMinificationBase');
+
+module.exports = class MemberAttributionAssets extends AssetsMinificationBase {
+    constructor(options = {}) {
+        super(options);
+
+        /** @private */
+        this.src = options.src || path.join(config.get('paths').assetSrc, 'member-attribution');
+        /** @private */
+        this.dest = options.dest || config.getContentPath('public');
+
+        this.minifier = new Minifier({src: this.src, dest: this.dest});
+    }
+
+    /**
+     * @override
+     */
+    generateGlobs() {
+        return {
+            'member-attribution.min.js': '*.js'
+        };
+    }
+
+    /**
+     * @private
+     */
+    generateReplacements() {
+        return {};
+    }
+
+    /**
+     * Minify, move into the destination directory, and clear existing asset files.
+     *
+     * @override
+     * @returns {Promise<void>}
+     */
+    async load() {
+        const globs = this.generateGlobs();
+        const replacements = this.generateReplacements();
+        await this.clearFiles();
+        await this.minify(globs, {replacements});
+    }
+};

package/core/frontend/services/assets-minification/index.js

@@ -0,0 +1,16 @@
+const AdminAuthAssets = require('./AdminAuthAssets');
+const CardAssets = require('./CardAssets');
+const CommentCountsAssets = require('./CommentCountsAssets');
+const MemberAttributionAssets = require('./MemberAttributionAssets');
+
+const adminAuthAssets = new AdminAuthAssets();
+const cardAssets = new CardAssets();
+const commentCountsAssets = new CommentCountsAssets();
+const memberAttributionAssets = new MemberAttributionAssets();
+
+module.exports = {
+    adminAuthAssets,
+    cardAssets,
+    commentCountsAssets,
+    memberAttributionAssets
+};

package/core/frontend/services/sitemap/BaseSiteMapGenerator.js

@@ -95,6 +95,9 @@ class BaseSiteMapGenerator {
         this.lastModified = Date.now();
     }
 
+    /**
+     * @returns {moment.Moment}
+     */
     getLastModifiedForDatum(datum) {
         if (datum.updated_at || datum.published_at || datum.created_at) {
             const modifiedDate = datum.updated_at || datum.published_at || datum.created_at;
@@ -126,7 +129,7 @@ class BaseSiteMapGenerator {
         node = {
             url: [
                 {loc: url},
-                {lastmod: moment(this.getLastModifiedForDatum(datum)).toISOString()}
+                {lastmod: this.getLastModifiedForDatum(datum).toISOString()}
             ]
         };
 

package/core/frontend/web/site.js

@@ -16,6 +16,7 @@ const membersService = require('../../server/services/members');
 const offersService = require('../../server/services/offers');
 const customRedirects = require('../../server/services/custom-redirects');
 const linkRedirects = require('../../server/services/link-redirection');
+const {cardAssets, commentCountsAssets, memberAttributionAssets} = require('../services/assets-minification');
 const siteRoutes = require('./routes');
 const shared = require('../../server/web/shared');
 const errorHandler = require('@tryghost/mw-error-handler');
@@ -72,14 +73,14 @@ module.exports = function setupSiteApp(routerConfig) {
     siteApp.use(mw.servePublicFile('static', 'public/ghost.min.css', 'text/css', config.get('caching:publicAssets:maxAge')));
 
     // Card assets
-    siteApp.use(mw.servePublicFile('built', 'public/cards.min.css', 'text/css', config.get('caching:publicAssets:maxAge')));
-    siteApp.use(mw.servePublicFile('built', 'public/cards.min.js', 'application/javascript', config.get('caching:publicAssets:maxAge')));
+    siteApp.use(cardAssets.serveMiddleware(), mw.servePublicFile('built', 'public/cards.min.css', 'text/css', config.get('caching:publicAssets:maxAge')));
+    siteApp.use(cardAssets.serveMiddleware(), mw.servePublicFile('built', 'public/cards.min.js', 'application/javascript', config.get('caching:publicAssets:maxAge')));
 
     // Comment counts
-    siteApp.use(mw.servePublicFile('built', 'public/comment-counts.min.js', 'application/javascript', config.get('caching:publicAssets:maxAge')));
+    siteApp.use(commentCountsAssets.serveMiddleware(), mw.servePublicFile('built', 'public/comment-counts.min.js', 'application/javascript', config.get('caching:publicAssets:maxAge')));
 
     // Member attribution
-    siteApp.use(mw.servePublicFile('built', 'public/member-attribution.min.js', 'application/javascript', config.get('caching:publicAssets:maxAge')));
+    siteApp.use(memberAttributionAssets.serveMiddleware(), mw.servePublicFile('built', 'public/member-attribution.min.js', 'application/javascript', config.get('caching:publicAssets:maxAge')));
 
     // Serve site images using the storage adapter
     siteApp.use(STATIC_IMAGE_URL_PREFIX, mw.handleImageSizes, storage.getStorage('images').serve());

package/core/server/data/importer/importers/data/PostsImporter.js

@@ -271,10 +271,10 @@ class PostsImporter extends BaseImporter {
                 });
 
                 model.mobiledoc = JSON.stringify(mobiledoc);
-                model.html = mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(model.mobiledoc));
+                model.html = mobiledocLib.render(JSON.parse(model.mobiledoc));
             } else if (model.html && !model.lexical) {
                 model.mobiledoc = JSON.stringify(mobiledocLib.htmlToMobiledocConverter(model.html));
-                model.html = mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(model.mobiledoc));
+                model.html = mobiledocLib.render(JSON.parse(model.mobiledoc));
             }
 
             this.sanitizePostsMeta(model);

package/core/server/data/migrations/versions/4.0/23-regenerate-posts-html.js

@@ -39,7 +39,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
                 continue;
             }
 
-            const html = mobiledocLib.mobiledocHtmlRenderer.render(mobiledoc);
+            const html = mobiledocLib.render(mobiledoc);
 
             const updatedAttrs = {
                 html: html

package/core/server/data/migrations/versions/4.9/05-fix-missed-mobiledoc-url-transforms.js

@@ -59,7 +59,7 @@ module.exports = createTransactionalMigration(
                 }
 
                 try {
-                    html = mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(mobiledoc));
+                    html = mobiledocLib.render(JSON.parse(mobiledoc));
                 } catch (err) {
                     logging.warn(`Invalid mobiledoc content structure for ${id}, unable to render. Skipping`);
                     continue;

package/core/server/data/migrations/versions/5.0/2022-05-21-00-00-regenerate-posts-html.js

@@ -43,7 +43,7 @@ module.exports = createIrreversibleMigration(async (knex) => {
                 continue;
             }
 
-            const html = mobiledocLib.mobiledocHtmlRenderer.render(mobiledoc);
+            const html = mobiledocLib.render(mobiledoc);
 
             const updatedAttrs = {
                 html

package/core/server/data/schema/schema.js

@@ -113,7 +113,7 @@ module.exports = {
         meta_description: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 500}}},
         email_subject: {type: 'string', maxlength: 300, nullable: true},
         frontmatter: {type: 'text', maxlength: 65535, nullable: true},
-        feature_image_alt: {type: 'string', maxlength: 191, nullable: true, validations: {isLength: {max: 125}}},
+        feature_image_alt: {type: 'string', maxlength: 191, nullable: true},
         feature_image_caption: {type: 'text', maxlength: 65535, nullable: true},
         email_only: {type: 'boolean', nullable: false, defaultTo: false}
     },
@@ -418,7 +418,7 @@ module.exports = {
         post_status: {type: 'string', maxlength: 50, nullable: true, validations: {isIn: [['draft', 'published', 'scheduled', 'sent']]}},
         reason: {type: 'string', maxlength: 50, nullable: true},
         feature_image: {type: 'string', maxlength: 2000, nullable: true},
-        feature_image_alt: {type: 'string', maxlength: 191, nullable: true, validations: {isLength: {max: 125}}},
+        feature_image_alt: {type: 'string', maxlength: 191, nullable: true},
         feature_image_caption: {type: 'text', maxlength: 65535, nullable: true},
         custom_excerpt: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 300}}}
     },

package/core/server/lib/mobiledoc.js

@@ -73,6 +73,10 @@ module.exports = {
         return mobiledocHtmlRenderer;
     },
 
+    render(mobiledoc, options) {
+        return this.mobiledocHtmlRenderer.render(mobiledoc, options);
+    },
+
     get htmlToMobiledocConverter() {
         try {
             if (process.env.CI) {

package/core/server/models/member.js

@@ -2,7 +2,6 @@ const ghostBookshelf = require('./base');
 const crypto = require('crypto');
 const _ = require('lodash');
 const config = require('../../shared/config');
-const {gravatar} = require('../lib/image');
 
 const Member = ghostBookshelf.Model.extend({
     tableName: 'members',
@@ -397,6 +396,7 @@ const Member = ghostBookshelf.Model.extend({
         // Will not use gravatar if privacy.useGravatar is false in config
         attrs.avatar_image = null;
         if (attrs.email && !config.isPrivacyDisabled('useGravatar')) {
+            const {gravatar} = require('../lib/image');
             attrs.avatar_image = gravatar.url(attrs.email, {size: 250, default: 'blank'});
         }
 

package/core/server/models/post.js

@@ -742,7 +742,7 @@ Post = ghostBookshelf.Model.extend({
             )
         ) {
             try {
-                this.set('html', mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(this.get('mobiledoc'))));
+                this.set('html', mobiledocLib.render(JSON.parse(this.get('mobiledoc'))));
             } catch (err) {
                 throw new errors.ValidationError({
                     message: tpl(messages.invalidMobiledocStructure),

package/core/server/services/email-service/EmailServiceWrapper.js

@@ -59,7 +59,7 @@ class EmailServiceWrapper {
             settingsCache,
             settingsHelpers,
             renderers: {
-                mobiledoc: mobiledocLib.mobiledocHtmlRenderer,
+                mobiledoc: mobiledocLib,
                 lexical: lexicalLib
             },
             imageSize,

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

@@ -14,14 +14,14 @@ const messages = {
     themeCannotBeActivated: '{themeName} cannot be activated because it was not found in the theme directory.'
 };
 
-module.exports.loadAndActivate = async (themeName) => {
+module.exports.loadAndActivate = async (themeName, options = {}) => {
     debug('loadAndActivate', themeName);
     try {
         // Just read the active theme for now
         const loadedTheme = await themeLoader.loadOneTheme(themeName);
         // Validate
         // @NOTE: this is now the only usage of check, rather than checkSafe...
-        const checkedTheme = await validate.check(themeName, loadedTheme);
+        const checkedTheme = await validate.check(themeName, loadedTheme, {skipChecks: options.skipChecks});
 
         if (!validate.canActivate(checkedTheme)) {
             logging.error(validate.getThemeValidationError('activeThemeHasFatalErrors', themeName, checkedTheme));

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

@@ -5,6 +5,7 @@ const getJSON = require('./to-json');
 const installer = require('./installer');
 const validate = require('./validate');
 const settingsCache = require('../../../shared/settings-cache');
+const config = require('../../../shared/config');
 
 module.exports = {
     /*
@@ -13,8 +14,10 @@ module.exports = {
     init: async () => {
         validate.init();
 
+        const skipChecks = config.get('optimization:themes:skipBootChecks') || false;
+
         const themeName = settingsCache.get('active_theme');
-        return activate.loadAndActivate(themeName);
+        return activate.loadAndActivate(themeName, {skipChecks});
     },
     /**
      * Load all inactive themes

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

@@ -44,25 +44,27 @@ const getErrorsFromCheckedTheme = function getErrorsFromCheckedTheme(checkedThem
     };
 };
 
-const check = async function check(themeName, theme, isZip) {
+const check = async function check(themeName, theme, options = {}) {
     debug('Begin: Check');
     // gscan can slow down boot time if we require on boot, for now nest the require.
     const gscan = require('gscan');
     const checkedVersion = 'v5';
     let checkedTheme;
 
-    if (isZip) {
+    if (options.isZip === true) {
         debug('zip mode');
         checkedTheme = await gscan.checkZip(theme, {
             keepExtractedDir: true,
             checkVersion: checkedVersion,
-            labs: labs.getAll()
+            labs: labs.getAll(),
+            skipChecks: options.skipChecks || false
         });
     } else {
         debug('non-zip mode');
         checkedTheme = await gscan.check(theme.path, {
             checkVersion: checkedVersion,
-            labs: labs.getAll()
+            labs: labs.getAll(),
+            skipChecks: options.skipChecks || false
         });
     }
 
@@ -119,7 +121,7 @@ const getThemeErrors = async function getThemeErrors(themeName) {
 };
 
 const checkSafe = async function checkSafe(themeName, theme, isZip) {
-    const checkedTheme = await check(themeName, theme, isZip);
+    const checkedTheme = await check(themeName, theme, {isZip});
 
     if (canActivate(checkedTheme)) {
         return checkedTheme;

package/core/server/views/maintenance.html

@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>We'll be right back</title>
+<title>We’ll be right back</title>
 <style type="text/css">
 * {
     box-sizing: border-box;
@@ -80,8 +80,8 @@ img {
 </head>
 <body>
 <div class="content">
-    <h1>We'll be right back.</h1>
-    <p>We're busy updating our site to give you the best experience, and will be back soon.</p>
+    <h1>We’ll be right back.</h1>
+    <p>We’re busy updating our site to give you the best experience, and will be back soon.</p>
 </div>
 </body>
 </html>

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

@@ -9,6 +9,7 @@ const shared = require('../shared');
 const errorHandler = require('@tryghost/mw-error-handler');
 const sentry = require('../../../shared/sentry');
 const redirectAdminUrls = require('./middleware/redirect-admin-urls');
+const bridge = require('../../../bridge');
 
 /**
  *
@@ -38,7 +39,7 @@ module.exports = function setupAdminApp() {
     // request to the Admin API /users/me/ endpoint to check if the user is logged in.
     //
     // Used by comments-ui to add moderation options to front-end comments when logged in.
-    adminApp.use('/auth-frame', function authFrameMw(req, res, next) {
+    adminApp.use('/auth-frame', bridge.ensureAdminAuthAssetsMiddleware(), function authFrameMw(req, res, next) {
         // only render content when we have an Admin session cookie,
         // otherwise return a 204 to avoid JS and API requests being made unnecessarily
         try {

package/core/shared/config/defaults.json

@@ -164,6 +164,9 @@
                 "threshold": 200,
                 "level": "warn"
             }
+        },
+        "themes": {
+            "skipBootChecks": false
         }
     },
     "imageOptimization": {
@@ -182,12 +185,12 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.43"
+        "version": "2.44"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",
         "styles": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/main.css",
-        "version": "1.2"
+        "version": "1.3"
     },
     "announcementBar": {
         "url": "https://cdn.jsdelivr.net/ghost/announcement-bar@~{version}/umd/announcement-bar.min.js",
@@ -195,11 +198,11 @@
     },
     "comments": {
         "url": "https://cdn.jsdelivr.net/ghost/comments-ui@~{version}/umd/comments-ui.min.js",
-        "version": "0.18"
+        "version": "0.19"
     },
     "signupForm": {
         "url": "https://cdn.jsdelivr.net/ghost/signup-form@~{version}/umd/signup-form.min.js",
-        "version": "0.1"
+        "version": "0.2"
     },
     "tenor": {
         "googleApiKey": null,

package/core/shared/config/env/config.testing-browser.json

@@ -11,6 +11,9 @@
     "server": {
         "port": 2369
     },
+    "metrics_server": {
+        "port": 9417
+    },
     "logging": {
         "level": "fatal"
     },

package/core/shared/config/env/config.testing-mysql.json

@@ -3,6 +3,9 @@
     "server": {
         "port": 2369
     },
+    "metrics_server": {
+        "port": 9417
+    },
     "database": {
         "client": "mysql",
         "connection": {

package/core/shared/config/env/config.testing.json

@@ -11,6 +11,9 @@
     "server": {
         "port": 2369
     },
+    "metrics_server": {
+        "port": 9417
+    },
     "logging": {
         "level": "error"
     },

package/core/shared/config/helpers.js

@@ -1,7 +1,10 @@
 const path = require('path');
-const escapeRegExp = require('lodash/escapeRegExp');
 const {URL} = require('url');
 
+function escapeRegExp(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
 const DEFAULT_HOST_ARG = /.*/;
 
 const getHostInfo = (config) => {

package/core/shared/config/utils.js

@@ -1,6 +1,5 @@
 const path = require('path');
-const fs = require('fs-extra');
-const _ = require('lodash');
+const fs = require('fs');
 
 /**
  * transform all relative paths to absolute paths
@@ -11,11 +10,11 @@ const _ = require('lodash');
  * Path can be a "." to re-present current folder
  */
 const makePathsAbsolute = function makePathsAbsolute(nconf, obj, parent) {
-    _.each(obj, function (configValue, pathsKey) {
-        if (_.isObject(configValue)) {
+    Object.entries(obj).forEach(([pathsKey, configValue]) => {
+        if (configValue && typeof configValue === 'object') {
             makePathsAbsolute(nconf, configValue, parent + ':' + pathsKey);
         } else if (
-            _.isString(configValue) &&
+            typeof configValue === 'string' &&
             (configValue.match(/\/+|\\+/) || configValue === '.') &&
             !path.isAbsolute(configValue)
         ) {
@@ -25,7 +24,7 @@ const makePathsAbsolute = function makePathsAbsolute(nconf, obj, parent) {
 };
 
 const doesContentPathExist = function doesContentPathExist(contentPath) {
-    if (!fs.pathExistsSync(contentPath)) {
+    if (!fs.existsSync(contentPath)) {
         // new Error is allowed here, as we do not want config to depend on @tryghost/error
         // @TODO: revisit this decision when @tryghost/error is no longer dependent on all of ghost-ignition
         // eslint-disable-next-line ghost/ghost-custom/no-native-error

package/core/shared/prometheus-client.js

@@ -0,0 +1,36 @@
+class PrometheusClient {
+    constructor() {
+        this.client = require('prom-client');
+        this.prefix = 'ghost_';
+        this.collectDefaultMetrics();
+    }
+
+    collectDefaultMetrics() {
+        this.client.collectDefaultMetrics({prefix: this.prefix});
+    }
+
+    async handleMetricsRequest(req, res) {
+        try {
+            res.set('Content-Type', this.getContentType());
+            res.end(await this.getMetrics());
+        } catch (err) {
+            res.status(500).end(err.message);
+        }
+    }
+
+    async getMetrics() {
+        return this.client.register.metrics();
+    }
+
+    getRegistry() {
+        return this.client.register;
+    }
+
+    getContentType() {
+        return this.getRegistry().contentType;
+    }
+}
+
+// Create a singleton instance and export it as the default export
+const prometheusClient = new PrometheusClient();
+module.exports = prometheusClient;