ghost 5.96.0 → 5.96.2

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/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/mention.js

@@ -6,7 +6,7 @@ const Mention = ghostBookshelf.Model.extend({
         deleted: false,
         verified: false
     },
-    enforcedFilters() {
+    defaultFilters() {
         return 'deleted:false';
     }
 }, {

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/oembed/service.js

@@ -1,9 +1,8 @@
 const config = require('../../../shared/config');
-const storage = require('../../adapters/storage');
 const externalRequest = require('../../lib/request-external');
 
 const OEmbed = require('@tryghost/oembed-service');
-const oembed = new OEmbed({config, externalRequest, storage});
+const oembed = new OEmbed({config, externalRequest});
 
 const NFT = require('./NFTOEmbedProvider');
 const nft = new NFT({

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": {

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