npm - ghost - Versions diffs - 6.54.0 → 6.55.0 - Mend

ghost 6.54.0 → 6.55.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (327) hide show

package/core/built/admin/index.html CHANGED Viewed

@@ -2,8 +2,8 @@
 <html lang="en">
   <head>
     <link rel="stylesheet" href="./assets/vendor-3bf602dfa6463c3400ffd81697767274.css">
-    <link rel="stylesheet" href="./assets/ghost-3063eae29e6c9cc6d6e7131928a27da0.css">
-    <meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%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%226.54%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%22293973f65e%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%2201d9d91477%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D">
+    <link rel="stylesheet" href="./assets/ghost-a9c788f6f0b1ea6cf0f14ca4b13f4496.css">
+    <meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%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%226.55%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%22e35f1aa34a%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%22d7e993cdd1%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D">
     <meta charset="UTF-8" />
@@ -20,13 +20,13 @@
     <link rel="shortcut icon" href="./assets/favicon-C_q1KHzv.ico" />
     <link rel="apple-touch-icon" href="./assets/apple-touch-icon-DhO18_4B.png" />
-    <script type="module" crossorigin src="./assets/index-BBf502Wg.js"></script>
+    <script type="module" crossorigin src="./assets/index-BGG7NckO.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-DAXXjFlN.js">
     <link rel="modulepreload" crossorigin href="./assets/react-Bb3IsNbi.js">
     <link rel="modulepreload" crossorigin href="./assets/jsx-runtime-DX3WBWVO.js">
     <link rel="modulepreload" crossorigin href="./assets/framework-provider-CmtnPXIT.js">
     <link rel="modulepreload" crossorigin href="./assets/dist-Ndy-PuGN.js">
-    <link rel="modulepreload" crossorigin href="./assets/hooks-BApwwBE0.js">
+    <link rel="modulepreload" crossorigin href="./assets/hooks-CixO01lL.js">
     <link rel="modulepreload" crossorigin href="./assets/dist-DGzPJ_bO.js">
     <link rel="modulepreload" crossorigin href="./assets/dist-CQJY6SVY.js">
     <link rel="modulepreload" crossorigin href="./assets/dist-P_ohUlTi.js">
@@ -35,9 +35,13 @@
     <link rel="modulepreload" crossorigin href="./assets/chunk-KS7C4IRE-DG9HTHQ3.js">
     <link rel="modulepreload" crossorigin href="./assets/router-provider-C1R4AZ2o.js">
     <link rel="modulepreload" crossorigin href="./assets/text-DwtjwGkh.js">
+    <link rel="modulepreload" crossorigin href="./assets/shade-app-B3heOAfz-CGXQwWeO.js">
+    <link rel="modulepreload" crossorigin href="./assets/dist-CjY-f5Z1.js">
+    <link rel="modulepreload" crossorigin href="./assets/dist-2Tnz2Yfq.js">
+    <link rel="modulepreload" crossorigin href="./assets/input-surface-BpAjZXY5.js">
     <link rel="modulepreload" crossorigin href="./assets/update-queries-C4CnvJaW.js">
-    <link rel="modulepreload" crossorigin href="./assets/users-CcSCQFcQ.js">
-    <link rel="stylesheet" crossorigin href="./assets/index-BCCZKxP2.css">
+    <link rel="modulepreload" crossorigin href="./assets/users-Dkv8NQZe.js">
+    <link rel="stylesheet" crossorigin href="./assets/index-9Cw8z3rA.css">
   </head>
   <body class="react-admin">
     <div id="ember-alerts-wormhole"></div>
@@ -57,9 +61,9 @@
     <div id="ember-liquid-wormhole"></div>
     <div id="ember-notifications-wormhole"></div>
     <script src="./assets/vendor-25f0bb2b2de85265afdf33da79f14a44.js"></script>
-    <script src="./assets/chunk.962.b73442b07be930bb5d85.js"></script>
-    <script src="./assets/chunk.589.096f4d0bb775e5229aa9.js"></script>
-    <script src="./assets/chunk.524.45e0875f41b71e46e849.js"></script>
-    <script src="./assets/ghost-b1dce91ad3232cc259ee5fbbf9526243.js"></script>
+    <script src="./assets/chunk.211.6f7328d63c41536451b3.js"></script>
+    <script src="./assets/chunk.481.6c7395a49484bb4583aa.js"></script>
+    <script src="./assets/chunk.524.cffd399783a519e404a9.js"></script>
+    <script src="./assets/ghost-c4057474943effc568c5659ccc4909d7.js"></script>
   </body>
 </html>

package/core/frontend/services/proxy.js CHANGED Viewed

@@ -16,6 +16,11 @@ const FRONTEND_SUBSCRIBABLE_EVENTS = ['site.changed', 'url.added', 'url.removed'
 // Require from the handlebars framework
 const {SafeString} = require('./handlebars');
+// sanitize-html over DOMPurify here: DOMPurify needs a DOM, and jsdom costs
+// ~116MB RSS to load. This module is on the boot path, so that was paid by
+// every process — including ones that never render a caption.
+const sanitizeHtml = require('sanitize-html');
 module.exports = {
     getFrontendKey: async () => {
         try {
@@ -44,7 +49,11 @@ module.exports = {
         (Array.isArray(data) ? data : [data]).forEach((resource) => {
             // feature_image_caption contains HTML, making it a SafeString spares theme devs from triple-curlies
             if (resource.feature_image_caption) {
-                resource.feature_image_caption = new SafeString(resource.feature_image_caption);
+                const sanitizedCaption = sanitizeHtml(resource.feature_image_caption, {
+                    allowedTags: ['a', 'b', 'i', 'span'],
+                    allowedAttributes: {'*': ['href', 'style']}
+                });
+                resource.feature_image_caption = new SafeString(sanitizedCaption);
             }
             // some properties are extracted to local template data to force one way of using it

package/core/frontend/services/routing/router-manager.js CHANGED Viewed

@@ -1,5 +1,4 @@
 const debug = require('@tryghost/debug')('frontend:routing');
-const _ = require('lodash');
 const StaticRoutesRouter = require('./static-routes-router');
 const StaticPagesRouter = require('./static-pages-router');
 const CollectionRouter = require('./collection-router');
@@ -111,30 +110,30 @@ class RouterManager {
         this.siteRouter.mountRouter(previewRouter.router());
         this.registry.setRouter('previewRouter', previewRouter);
-        _.each(routerSettings.routes, (value, key) => {
-            const staticRoutesRouter = new StaticRoutesRouter(key, value, this.routerCreated.bind(this));
+        for (const route of routerSettings.routes) {
+            const staticRoutesRouter = new StaticRoutesRouter(route.path, route, this.routerCreated.bind(this));
             this.siteRouter.mountRouter(staticRoutesRouter.router());
             this.registry.setRouter(staticRoutesRouter.identifier, staticRoutesRouter);
-        });
+        }
-        _.each(routerSettings.collections, (value, key) => {
-            const collectionRouter = new CollectionRouter(key, value, RESOURCE_CONFIG, this.routerCreated.bind(this));
+        for (const collection of routerSettings.collections) {
+            const collectionRouter = new CollectionRouter(collection.path, collection, RESOURCE_CONFIG, this.routerCreated.bind(this));
             this.siteRouter.mountRouter(collectionRouter.router());
             this.registry.setRouter(collectionRouter.identifier, collectionRouter);
-        });
+        }
         const staticPagesRouter = new StaticPagesRouter(RESOURCE_CONFIG, this.routerCreated.bind(this));
         this.siteRouter.mountRouter(staticPagesRouter.router());
         this.registry.setRouter('staticPagesRouter', staticPagesRouter);
-        _.each(routerSettings.taxonomies, (value, key) => {
-            const taxonomyRouter = new TaxonomyRouter(key, value, RESOURCE_CONFIG, this.routerCreated.bind(this));
+        for (const taxonomy of routerSettings.taxonomies) {
+            const taxonomyRouter = new TaxonomyRouter(taxonomy.key, taxonomy.permalink, RESOURCE_CONFIG, this.routerCreated.bind(this));
             this.siteRouter.mountRouter(taxonomyRouter.router());
             this.registry.setRouter(taxonomyRouter.identifier, taxonomyRouter);
-        });
+        }
         const appRouter = new ParentRouter('AppsRouter');
         this.siteRouter.mountRouter(appRouter.router());
@@ -186,10 +185,11 @@ module.exports = RouterManager;
  */
 /**
- * @typedef {Object} RouteSettings
- * @property {Object} routes
- * @property {Object} collections
- * @property {Object} taxonomies
+ * The shape RouterManager consumes — produced by the activation bridge. This is
+ * a temporary reference into server code; when the bridge is removed (HKG-1898)
+ * it becomes the domain `RouteSettings` from @tryghost/adapter-base-route-settings.
+ *
+ * @typedef {import('../../../server/services/route-settings/activation-bridge').RouterSettings} RouteSettings
  */
 /**

package/core/frontend/services/routing/static-routes-router.js CHANGED Viewed

@@ -30,12 +30,12 @@ class StaticRoutesRouter extends ParentRouter {
             this.limit = object.limit;
             this.order = object.order;
-            this.controller = object.controller;
+            this.type = object.type;
             debug(this.route.value, this.templates, this.filter, this.data);
             this._registerChannelRoutes();
         } else {
-            this.contentType = object.content_type;
+            this.contentType = object.contentType;
             debug(this.route.value, this.templates);
             this._registerStaticRoute();
         }
@@ -56,11 +56,11 @@ class StaticRoutesRouter extends ParentRouter {
         }
         // REGISTER: channel route
-        this.mountRoute(this.route.value, controllers[this.controller]);
+        this.mountRoute(this.route.value, controllers[this.type]);
         // REGISTER: pagination
         this.router().param('page', middleware.pageParam);
-        this.mountRoute(urlUtils.urlJoin(this.route.value, 'page', ':page(\\d+)'), controllers[this.controller]);
+        this.mountRoute(urlUtils.urlJoin(this.route.value, 'page', ':page(\\d+)'), controllers[this.type]);
         this.routerCreated(this);
     }
@@ -74,7 +74,7 @@ class StaticRoutesRouter extends ParentRouter {
      */
     _prepareChannelContext(req, res, next) {
         res.routerOptions = {
-            type: this.controller,
+            type: this.type,
             name: this.routerName,
             context: [this.routerName],
             filter: this.filter,
@@ -131,11 +131,9 @@ class StaticRoutesRouter extends ParentRouter {
      * @returns {boolean}
      */
     isChannel(object) {
-        if (object && object.controller && object.controller === 'channel') {
-            return true;
-        }
-        return this.controller === 'channel';
+        // buildRouterSettings always sets `type` ('channel' | 'template') on
+        // every route, so a channel is simply `type === 'channel'`.
+        return object?.type === 'channel';
     }
 }

package/core/server/adapters/storage/LocalFilesStorage.js CHANGED Viewed

@@ -1,24 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 // # Local File System Storage module
 // The (default) module for storing media, using the local file system
-const config = require('../../../shared/config');
-const urlUtils = require('../../../shared/url-utils').default;
-const LocalStorageBase = require('./LocalStorageBase');
+const config_1 = __importDefault(require("../../../shared/config"));
+const url_utils_1 = __importDefault(require("../../../shared/url-utils"));
+const LocalStorageBase_1 = __importDefault(require("./LocalStorageBase"));
 const messages = {
     notFound: 'File not found',
     notFoundWithRef: 'File not found: {file}',
     cannotRead: 'Could not read File: {file}'
 };
-class LocalFilesStorage extends LocalStorageBase {
+class LocalFilesStorage extends LocalStorageBase_1.default {
     constructor() {
         super({
-            storagePath: config.getContentPath('files'),
-            siteUrl: config.getSiteUrl(),
-            staticFileURLPrefix: urlUtils.STATIC_FILES_URL_PREFIX,
+            storagePath: config_1.default.getContentPath('files'),
+            siteUrl: config_1.default.getSiteUrl(),
+            staticFileURLPrefix: url_utils_1.default.STATIC_FILES_URL_PREFIX,
             errorMessages: messages
         });
     }
 }
-module.exports = LocalFilesStorage;
+exports.default = LocalFilesStorage;

package/core/server/adapters/storage/LocalFilesStorage.ts ADDED Viewed

@@ -0,0 +1,24 @@
+// # Local File System Storage module
+// The (default) module for storing media, using the local file system
+import config from '../../../shared/config';
+import urlUtils from '../../../shared/url-utils';
+import LocalStorageBase from './LocalStorageBase';
+const messages = {
+    notFound: 'File not found',
+    notFoundWithRef: 'File not found: {file}',
+    cannotRead: 'Could not read File: {file}'
+};
+class LocalFilesStorage extends LocalStorageBase {
+    constructor() {
+        super({
+            storagePath: config.getContentPath('files'),
+            siteUrl: config.getSiteUrl(),
+            staticFileURLPrefix: urlUtils.STATIC_FILES_URL_PREFIX,
+            errorMessages: messages
+        });
+    }
+}
+export default LocalFilesStorage;

package/core/server/adapters/storage/LocalImagesStorage.js CHANGED Viewed

@@ -1,24 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 // # Local File System Image Storage module
 // The (default) module for storing images, using the local file system
-const config = require('../../../shared/config');
-const urlUtils = require('../../../shared/url-utils').default;
-const LocalStorageBase = require('./LocalStorageBase');
-let messages = {
+const config_1 = __importDefault(require("../../../shared/config"));
+const url_utils_1 = __importDefault(require("../../../shared/url-utils"));
+const LocalStorageBase_1 = __importDefault(require("./LocalStorageBase"));
+const messages = {
     notFound: 'Image not found',
     notFoundWithRef: 'Image not found: {file}',
     cannotRead: 'Could not read image: {file}'
 };
-class LocalImagesStorage extends LocalStorageBase {
+class LocalImagesStorage extends LocalStorageBase_1.default {
     constructor() {
         super({
-            storagePath: config.getContentPath('images'),
-            staticFileURLPrefix: urlUtils.STATIC_IMAGE_URL_PREFIX,
-            siteUrl: config.getSiteUrl(),
+            storagePath: config_1.default.getContentPath('images'),
+            staticFileURLPrefix: url_utils_1.default.STATIC_IMAGE_URL_PREFIX,
+            siteUrl: config_1.default.getSiteUrl(),
             errorMessages: messages
         });
     }
 }
-module.exports = LocalImagesStorage;
+exports.default = LocalImagesStorage;

package/core/server/adapters/storage/LocalImagesStorage.ts ADDED Viewed

@@ -0,0 +1,24 @@
+// # Local File System Image Storage module
+// The (default) module for storing images, using the local file system
+import config from '../../../shared/config';
+import urlUtils from '../../../shared/url-utils';
+import LocalStorageBase from './LocalStorageBase';
+const messages = {
+    notFound: 'Image not found',
+    notFoundWithRef: 'Image not found: {file}',
+    cannotRead: 'Could not read image: {file}'
+};
+class LocalImagesStorage extends LocalStorageBase {
+    constructor() {
+        super({
+            storagePath: config.getContentPath('images'),
+            staticFileURLPrefix: urlUtils.STATIC_IMAGE_URL_PREFIX,
+            siteUrl: config.getSiteUrl(),
+            errorMessages: messages
+        });
+    }
+}
+export default LocalImagesStorage;

package/core/server/adapters/storage/LocalMediaStorage.js CHANGED Viewed

@@ -1,24 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 // # Local File System Media Storage module
 // The (default) module for storing media, using the local file system
-const config = require('../../../shared/config');
-const urlUtils = require('../../../shared/url-utils').default;
-const LocalStorageBase = require('./LocalStorageBase');
+const config_1 = __importDefault(require("../../../shared/config"));
+const url_utils_1 = __importDefault(require("../../../shared/url-utils"));
+const LocalStorageBase_1 = __importDefault(require("./LocalStorageBase"));
 const messages = {
     notFound: 'Media file not found',
     notFoundWithRef: 'Media file not found: {file}',
     cannotRead: 'Could not read media file: {file}'
 };
-class LocalMediaStorage extends LocalStorageBase {
+class LocalMediaStorage extends LocalStorageBase_1.default {
     constructor() {
         super({
-            storagePath: config.getContentPath('media'),
-            staticFileURLPrefix: urlUtils.STATIC_MEDIA_URL_PREFIX,
-            siteUrl: config.getSiteUrl(),
+            storagePath: config_1.default.getContentPath('media'),
+            staticFileURLPrefix: url_utils_1.default.STATIC_MEDIA_URL_PREFIX,
+            siteUrl: config_1.default.getSiteUrl(),
             errorMessages: messages
         });
     }
 }
-module.exports = LocalMediaStorage;
+exports.default = LocalMediaStorage;

package/core/server/adapters/storage/LocalMediaStorage.ts ADDED Viewed

@@ -0,0 +1,24 @@
+// # Local File System Media Storage module
+// The (default) module for storing media, using the local file system
+import config from '../../../shared/config';
+import urlUtils from '../../../shared/url-utils';
+import LocalStorageBase from './LocalStorageBase';
+const messages = {
+    notFound: 'Media file not found',
+    notFoundWithRef: 'Media file not found: {file}',
+    cannotRead: 'Could not read media file: {file}'
+};
+class LocalMediaStorage extends LocalStorageBase {
+    constructor() {
+        super({
+            storagePath: config.getContentPath('media'),
+            staticFileURLPrefix: urlUtils.STATIC_MEDIA_URL_PREFIX,
+            siteUrl: config.getSiteUrl(),
+            errorMessages: messages
+        });
+    }
+}
+export default LocalMediaStorage;