ghost 5.96.0 → 5.96.2

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.96%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22ee37f0b9eb%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22eb50ad82db%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%226ee58b4615%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22b5243a9829%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fnpm%2F%40tryghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.96%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22ee37f0b9eb%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22eb50ad82db%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%223e886898df%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%2268888cb677%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fnpm%2F%40tryghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-0c7839fc6bdbca9bf08a2c1291159903.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-c75b9d653495f9cfce528f6e10900b3f.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-88cd9f5cf5eba65221e2d2a636531eaa.js"></script>
-<script src="assets/chunk.874.2b603e6adcf3c2e9788c.js"></script>
-<script src="assets/chunk.524.c8d208efb3cca58fb564.js"></script>
-    <script src="assets/ghost-6720b11b60bbdb3abbd6b3b5dd314d5d.js"></script>
+<script src="assets/chunk.874.e1d421507701daac30fb.js"></script>
+<script src="assets/chunk.524.e61cf6deaaec6bf6f9d2.js"></script>
+    <script src="assets/ghost-286f9a114755e8c3c7e9c37550f624a9.js"></script>
 </body>
 </html>

package/core/frontend/helpers/get.js

@@ -7,7 +7,6 @@ const {hbs, SafeString} = require('../services/handlebars');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
-const Sentry = require('@sentry/node');
 
 const _ = require('lodash');
 const jsonpath = require('jsonpath');
@@ -292,53 +291,37 @@ module.exports = async function get(resource, options) {
 
     // Parse the options we're going to pass to the API
     apiOptions = parseOptions(ghostGlobals, this, apiOptions);
-    let apiOptionsString = Object.entries(apiOptions)
-        .map(([key, value]) => ` ${key}="${value}"`)
-        .join('');
     apiOptions.context = {member: data.member};
     try {
-        const spanName = `{{#get "${resource}"${apiOptionsString}}} ${data.member ? 'member' : 'public'}`;
-        const result = await Sentry.startSpan({
-            op: 'frontend.helpers.get',
-            name: spanName,
-            tags: {
-                resource,
-                ...apiOptions,
-                context: data.member ? 'member' : 'public'
-            }
-        }, async (span) => {
-            const response = await makeAPICall(resource, controllerName, action, apiOptions);
-
-            // prepare data properties for use with handlebars
-            if (response[resource] && response[resource].length) {
-                response[resource].forEach(prepareContextResource);
-            }
+        const response = await makeAPICall(resource, controllerName, action, apiOptions);
 
-            // used for logging details of slow requests
-            returnedRowsCount = response[resource] && response[resource].length;
-            span?.setTag('returnedRows', returnedRowsCount);
+        // prepare data properties for use with handlebars
+        if (response[resource] && response[resource].length) {
+            response[resource].forEach(prepareContextResource);
+        }
 
-            // block params allows the theme developer to name the data using something like
-            // `{{#get "posts" as |result pageInfo|}}`
-            const blockParams = [response[resource]];
-            if (response.meta && response.meta.pagination) {
-                response.pagination = response.meta.pagination;
-                blockParams.push(response.meta.pagination);
-            }
+        // used for logging details of slow requests
+        returnedRowsCount = response[resource] && response[resource].length;
 
-            // Call the main template function
-            const rendered = options.fn(response, {
-                data: data,
-                blockParams: blockParams
-            });
+        // block params allows the theme developer to name the data using something like
+        // `{{#get "posts" as |result pageInfo|}}`
+        const blockParams = [response[resource]];
+        if (response.meta && response.meta.pagination) {
+            response.pagination = response.meta.pagination;
+            blockParams.push(response.meta.pagination);
+        }
 
-            if (response['@@ABORTED_GET_HELPER@@']) {
-                return new SafeString(`<span data-aborted-get-helper>Could not load content</span>` + rendered);
-            } else {
-                return rendered;
-            }
+        // Call the main template function
+        const rendered = options.fn(response, {
+            data: data,
+            blockParams: blockParams
         });
-        return result;
+
+        if (response['@@ABORTED_GET_HELPER@@']) {
+            return new SafeString(`<span data-aborted-get-helper>Could not load content</span>` + rendered);
+        } else {
+            return rendered;
+        }
     } catch (error) {
         logging.error(error);
         data.error = error.message;

package/core/frontend/helpers/ghost_head.js

@@ -7,7 +7,7 @@ const {escapeExpression, SafeString} = require('../services/handlebars');
 
 // BAD REQUIRE
 // @TODO fix this require
-const cardAssetService = require('../services/card-assets');
+const {cardAssets} = require('../services/assets-minification');
 
 const logging = require('@tryghost/logging');
 const _ = require('lodash');
@@ -297,10 +297,10 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
             }
 
             // @TODO do this in a more "frameworky" way
-            if (cardAssetService.hasFile('js')) {
+            if (cardAssets.hasFile('js')) {
                 head.push(`<script defer src="${getAssetUrl('public/cards.min.js')}"></script>`);
             }
-            if (cardAssetService.hasFile('css')) {
+            if (cardAssets.hasFile('css')) {
                 head.push(`<link rel="stylesheet" type="text/css" href="${getAssetUrl('public/cards.min.css')}">`);
             }
 

package/core/frontend/meta/generate-excerpt.js

@@ -1,5 +1,3 @@
-const downsize = require('downsize');
-
 function generateExcerpt(excerpt, truncateOptions) {
     truncateOptions = truncateOptions || {};
 
@@ -8,6 +6,7 @@ function generateExcerpt(excerpt, truncateOptions) {
     }
 
     // Just uses downsize to truncate, not format
+    const downsize = require('downsize');
     return downsize(excerpt, truncateOptions);
 }
 

package/core/frontend/services/{admin-auth-assets/AdminAuthAssetsService.js → assets-minification/AdminAuthAssets.js}

@@ -1,23 +1,38 @@
 // const debug = require('@tryghost/debug')('comments-counts-assets');
 const Minifier = require('@tryghost/minifier');
 const path = require('path');
-const fs = require('fs').promises;
+const fs = require('fs');
 const logging = require('@tryghost/logging');
 const config = require('../../../shared/config');
 const urlUtils = require('../../../shared/url-utils');
+const AssetsMinificationBase = require('./AssetsMinificationBase');
 
-class AdminAuthAssetsService {
+module.exports = class AdminAuthAssets extends AssetsMinificationBase {
     constructor(options = {}) {
-        /** @private */
+        super(options);
+
         this.src = options.src || path.join(config.get('paths').assetSrc, 'admin-auth');
         /** @private */
         this.dest = options.dest || path.join(config.getContentPath('public'), 'admin-auth');
-        /** @private */
+
         this.minifier = new Minifier({src: this.src, dest: this.dest});
+
+        try {
+            // TODO: don't do this synchronously
+            fs.mkdirSync(this.dest, {recursive: true});
+            fs.copyFileSync(path.join(this.src, 'index.html'), path.join(this.dest, 'index.html'));
+        } catch (error) {
+            if (error.code === 'EACCES') {
+                logging.error('Ghost was not able to write admin-auth asset files due to permissions.');
+                return;
+            }
+
+            throw error;
+        }
     }
 
     /**
-     * @private
+     * @override
      */
     generateGlobs() {
         return {
@@ -39,62 +54,10 @@ class AdminAuthAssetsService {
         };
     }
 
-    /**
-     * @private
-     * @returns {Promise<void>}
-     */
-    async minify(globs, options) {
-        try {
-            await this.minifier.minify(globs, options);
-        } catch (error) {
-            if (error.code === 'EACCES') {
-                logging.error('Ghost was not able to write admin-auth asset files due to permissions.');
-                return;
-            }
-
-            throw error;
-        }
-    }
-
-    /**
-     * @private
-     * @returns {Promise<void>}
-     */
-    async copyStatic() {
-        try {
-            await fs.copyFile(path.join(this.src, 'index.html'), path.join(this.dest, 'index.html'));
-        } catch (error) {
-            if (error.code === 'EACCES') {
-                logging.error('Ghost was not able to write admin-auth asset files due to permissions.');
-                return;
-            }
-
-            throw error;
-        }
-    }
-
-    /**
-     * @private
-     * @returns {Promise<void>}
-     */
-    async clearFiles() {
-        const rmFile = async (name) => {
-            await fs.unlink(path.join(this.dest, name));
-        };
-
-        let promises = [
-            // @deprecated switch this to use fs.rm when we drop support for Node v12
-            rmFile('admin-auth.min.js'),
-            rmFile('index.html')
-        ];
-
-        // We don't care if removing these files fails as it's valid for them to not exist
-        await Promise.allSettled(promises);
-    }
-
     /**
      * Minify, move into the destination directory, and clear existing asset files.
      *
+     * @override
      * @returns {Promise<void>}
      */
     async load() {
@@ -102,8 +65,5 @@ class AdminAuthAssetsService {
         const replacements = this.generateReplacements();
         await this.clearFiles();
         await this.minify(globs, {replacements});
-        await this.copyStatic();
     }
-}
-
-module.exports = AdminAuthAssetsService;
+};

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

@@ -0,0 +1,79 @@
+const path = require('path');
+const fs = require('fs').promises;
+const errors = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
+
+module.exports = class AssetsMinificationBase {
+    minifier;
+
+    ready = false;
+
+    constructor(options = {}) {
+        this.options = options;
+    }
+
+    invalidate() {
+        this.ready = false;
+    }
+
+    generateGlobs() {
+        throw new errors.InternalServerError({
+            message: 'generateGlobs not implemented'
+        });
+    }
+
+    async load() {
+        throw new errors.InternalServerError({
+            message: 'load not implemented'
+        });
+    }
+
+    /**
+     * @returns {Promise<void>}
+     */
+    async clearFiles() {
+        const rmFile = async (name) => {
+            await fs.unlink(path.join(this.dest, name));
+        };
+
+        const promises = [];
+        for (const key of Object.keys(this.generateGlobs())) {
+            // @deprecated switch this to use fs.rm when we drop support for Node v12
+            promises.push(rmFile(key));
+        }
+
+        // We don't care if removing these files fails as it's valid for them to not exist
+        await Promise.allSettled(promises);
+    }
+
+    async minify(globs, options) {
+        try {
+            return await this.minifier.minify(globs, options);
+        } catch (error) {
+            if (error.code === 'EACCES') {
+                logging.error('Ghost was not able to write asset files due to permissions.');
+                return;
+            }
+
+            throw error;
+        } finally {
+            this.ready = true;
+        }
+    }
+
+    serveMiddleware() {
+        const self = this;
+        /**
+         * @param {import('express').Request} req
+         * @param {import('express').Response} res
+         * @param {import('express').NextFunction} next
+         */
+        return async function serveMiddleware(req, res, next) {
+            if (!self.ready) {
+                await self.load();
+            }
+
+            next();
+        };
+    }
+};

package/core/frontend/services/{card-assets/CardAssetService.js → assets-minification/CardAssets.js}

@@ -2,12 +2,13 @@ const debug = require('@tryghost/debug')('card-assets');
 const Minifier = require('@tryghost/minifier');
 const _ = require('lodash');
 const path = require('path');
-const fs = require('fs').promises;
-const logging = require('@tryghost/logging');
 const config = require('../../../shared/config');
+const AssetsMinificationBase = require('./AssetsMinificationBase');
 
-class CardAssetService {
+module.exports = class CardAssets extends AssetsMinificationBase {
     constructor(options = {}) {
+        super(options);
+
         this.src = options.src || path.join(config.get('paths').assetSrc, 'cards');
         this.dest = options.dest || config.getContentPath('public');
         this.minifier = new Minifier({src: this.src, dest: this.dest});
@@ -19,6 +20,9 @@ class CardAssetService {
         this.files = [];
     }
 
+    /**
+     * @override
+     */
     generateGlobs() {
         // CASE: The theme has asked for all card assets to be included by default
         if (this.config === true) {
@@ -50,52 +54,33 @@ class CardAssetService {
         return {};
     }
 
-    async minify(globs) {
-        try {
-            return await this.minifier.minify(globs);
-        } catch (error) {
-            if (error.code === 'EACCES') {
-                logging.error('Ghost was not able to write card asset files due to permissions.');
-                return;
-            }
-
-            throw error;
+    hasFile(type) {
+        if (this.files.length) {
+            return this.files.indexOf(`cards.min.${type}`) > -1;
         }
-    }
-
-    async clearFiles() {
-        this.files = [];
 
-        const rmFile = async (name) => {
-            await fs.unlink(path.join(this.dest, name));
-        };
-
-        let promises = [
-            // @deprecated switch this to use fs.rm when we drop support for Node v12
-            rmFile('cards.min.css'),
-            rmFile('cards.min.js')
-        ];
-
-        // We don't care if removing these files fails as it's valid for them to not exist
-        return Promise.allSettled(promises);
+        return Object.keys(this.generateGlobs()).indexOf(`cards.min.${type}`) > -1;
     }
 
-    hasFile(type) {
-        return this.files.indexOf(`cards.min.${type}`) > -1;
+    invalidate(cardAssetConfig) {
+        if (cardAssetConfig) {
+            this.config = cardAssetConfig;
+        }
+
+        return super.invalidate();
     }
 
     /**
      * A theme can declare which cards it supports, and we'll do the rest
      *
-     * @param {Array|boolean} cardAssetConfig
-     * @returns
+     * @override
      */
     async load(cardAssetConfig) {
         if (cardAssetConfig) {
             this.config = cardAssetConfig;
         }
 
-        debug('loading with config', cardAssetConfig);
+        debug('loading with config', this.config);
 
         await this.clearFiles();
 
@@ -105,6 +90,4 @@ class CardAssetService {
 
         this.files = await this.minify(globs) || [];
     }
-}
-
-module.exports = CardAssetService;
+};

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/api/endpoints/utils/serializers/output/mappers/index.js

@@ -9,7 +9,6 @@ module.exports = {
     emailFailures: require('./email-failures'),
     images: require('./images'),
     integrations: require('./integrations'),
-    oembed: require('./oembed'),
     pages: require('./pages'),
     posts: require('./posts'),
     settings: require('./settings'),

package/core/server/api/endpoints/utils/serializers/output/oembed.js

@@ -1,15 +1,8 @@
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output:oembed');
-const mappers = require('./mappers');
 
 module.exports = {
     all(data, apiConfig, frame) {
         debug('all');
-        if (data?.metadata?.thumbnail) {
-            data.metadata.thumbnail = mappers.oembed(data.metadata.thumbnail);
-        }
-        if (data?.metadata?.icon) {
-            data.metadata.icon = mappers.oembed(data.metadata.icon);
-        }
         frame.response = data;
     }
 };

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;