ghost 5.85.1 → 5.86.0

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.85%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%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%22e120f6f1a6%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22c8c4974f41%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22c7bac5b827%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22e30d6e5987%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.86%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%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%2262f98e1b33%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%224245030234%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%226b8583f4e9%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22f6cd11e49b%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-da719d2c50388e7f72e596e1a8b99e80.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-117facae643a21dde076079b84fce471.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-232fd88c6ffbd896b34c449112793e93.js"></script>
-<script src="assets/chunk.216.700faeec5043322dc8d5.js"></script>
-<script src="assets/chunk.524.8523297d6be9ed0dcd59.js"></script>
-    <script src="assets/ghost-648739878fcdb7a22ab135757c8e3fab.js"></script>
+<script src="assets/chunk.216.1641331b33471771559d.js"></script>
+<script src="assets/chunk.524.c7b0bf99001aaf59b891.js"></script>
+    <script src="assets/ghost-cc7512accd98e0fa3cc0906c52204a55.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -296,6 +296,18 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
                 head.push(`<script defer src="${getAssetUrl('public/member-attribution.min.js')}"></script>`);
             }
 
+            if (options.data.site.accent_color) {
+                const accentColor = escapeExpression(options.data.site.accent_color);
+                const styleTag = `<style>:root {--ghost-accent-color: ${accentColor};}</style>`;
+                const existingScriptIndex = _.findLastIndex(head, str => str.match(/<\/(style|script)>/));
+
+                if (existingScriptIndex !== -1) {
+                    head[existingScriptIndex] = head[existingScriptIndex] + styleTag;
+                } else {
+                    head.push(styleTag);
+                }
+            }
+
             if (!_.isEmpty(globalCodeinjection)) {
                 head.push(globalCodeinjection);
             }
@@ -309,19 +321,6 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
             }
         }
 
-        // AMP template has style injected directly because there can only be one <style amp-custom> tag
-        if (options.data.site.accent_color && !_.includes(context, 'amp')) {
-            const accentColor = escapeExpression(options.data.site.accent_color);
-            const styleTag = `<style>:root {--ghost-accent-color: ${accentColor};}</style>`;
-            const existingScriptIndex = _.findLastIndex(head, str => str.match(/<\/(style|script)>/));
-
-            if (existingScriptIndex !== -1) {
-                head[existingScriptIndex] = head[existingScriptIndex] + styleTag;
-            } else {
-                head.push(styleTag);
-            }
-        }
-
         debug('end');
         return new SafeString(head.join('\n    ').trim());
     } catch (error) {

package/core/frontend/web/site.js

@@ -3,7 +3,6 @@ const path = require('path');
 const express = require('../../shared/express');
 const DomainEvents = require('@tryghost/domain-events');
 const {MemberPageViewEvent} = require('@tryghost/member-events');
-const GhostNestApp = require('@tryghost/ghost');
 
 // App requires
 const config = require('../../shared/config');
@@ -21,8 +20,6 @@ const siteRoutes = require('./routes');
 const shared = require('../../server/web/shared');
 const errorHandler = require('@tryghost/mw-error-handler');
 const mw = require('./middleware');
-const labs = require('../../shared/labs');
-const bodyParser = require('body-parser');
 
 const STATIC_IMAGE_URL_PREFIX = `/${urlUtils.STATIC_IMAGE_URL_PREFIX}`;
 const STATIC_MEDIA_URL_PREFIX = `/${constants.STATIC_MEDIA_URL_PREFIX}`;
@@ -51,36 +48,6 @@ module.exports = function setupSiteApp(routerConfig) {
     // enable CORS headers (allows admin client to hit front-end when configured on separate URLs)
     siteApp.use(mw.cors);
 
-    const jsonParser = bodyParser.json({
-        type: ['application/activity+json', 'application/ld+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'],
-        // TODO: The @RawBody decorator in nest isn't working without this atm...
-        verify: function (req, res, buf) {
-            req.rawBody = buf;
-        }
-    });
-    siteApp.use(async function nestBodyParser(req, res, next) {
-        if (labs.isSet('NestPlayground') || labs.isSet('ActivityPub')) {
-            jsonParser(req, res, next);
-            return;
-        }
-        return next();
-    });
-
-    siteApp.use(async function nestApp(req, res, next) {
-        if (labs.isSet('NestPlayground') || labs.isSet('ActivityPub')) {
-            const originalExpressApp = req.app;
-            const app = await GhostNestApp.getApp();
-
-            const instance = app.getHttpAdapter().getInstance();
-            instance(req, res, function (err) {
-                req.app = originalExpressApp;
-                next(err);
-            });
-            return;
-        }
-        return next();
-    });
-
     siteApp.use(offersService.middleware);
 
     siteApp.use(linkRedirects.service.handleRequest);

package/core/server/GhostServer.js

@@ -127,8 +127,8 @@ class GhostServer {
 
             // ensure that Ghost exits correctly on Ctrl+C and SIGTERM
             process
-                .removeAllListeners('SIGINT').on('SIGINT', self.shutdown.bind(self))
-                .removeAllListeners('SIGTERM').on('SIGTERM', self.shutdown.bind(self));
+                .removeAllListeners('SIGINT').on('SIGINT', () => self.shutdown())
+                .removeAllListeners('SIGTERM').on('SIGTERM', () => self.shutdown());
         });
     }
 

package/core/server/data/db/index.js

@@ -1,8 +1,3 @@
-const logging = require('@tryghost/logging');
-const metrics = require('@tryghost/metrics');
-const config = require('../../../shared/config');
-const ConnectionPoolInstrumentation = require('./ConnectionPoolInstrumentation');
-
 let connection;
 
 Object.defineProperty(exports, 'knex', {
@@ -10,10 +5,6 @@ Object.defineProperty(exports, 'knex', {
     configurable: true,
     get: function get() {
         connection = connection || require('./connection');
-        if (config.get('telemetry:connectionPool')) {
-            const instrumentation = new ConnectionPoolInstrumentation({knex: connection, logging, metrics, config});
-            instrumentation.instrument();
-        }
         return connection;
     }
 });

package/core/server/services/members-events/index.js

@@ -1,5 +1,6 @@
 const labsService = require('../../../shared/labs');
 const DomainEvents = require('@tryghost/domain-events');
+const events = require('../../lib/common/events');
 const settingsCache = require('../../../shared/settings-cache');
 const members = require('../members');
 
@@ -32,7 +33,8 @@ class MembersEventsServiceWrapper {
             getMembersApi() {
                 return members.api;
             },
-            db
+            db,
+            events
         });
 
         this.eventStorage.subscribe(DomainEvents);

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

@@ -39,7 +39,7 @@ module.exports = function setupApiApp() {
     apiApp.use(routes());
 
     apiApp.use(async function nestApp(req, res, next) {
-        if (labs.isSet('NestPlayground') || labs.isSet('ActivityPub')) {
+        if (labs.isSet('NestPlayground')) {
             const originalExpressApp = req.app;
             const app = await GhostNestApp.getApp();
 

package/core/server/web/api/middleware/upload.js

@@ -152,19 +152,23 @@ const checkFileIsValid = (fileData, types, extensions) => {
 };
 
 /**
- * 
- * @param {String} filepath 
+ *
+ * @param {String} filepath
  * @returns {Boolean}
- * 
+ *
  * Checks for the presence of <script> tags or 'on' attributes in an SVG file
- * 
+ *
  */
 const isSvgSafe = (filepath) => {
     const fileContent = fs.readFileSync(filepath, 'utf8');
     const document = new JSDOM(fileContent).window.document;
     document.body.innerHTML = fileContent;
     const svgEl = document.body.firstElementChild;
-    
+
+    if (!svgEl) {
+        return false;
+    }
+
     const attributes = Array.from(svgEl.attributes).map(({name}) => name);
     const hasScriptAttr = !!attributes.find(attr => attr.startsWith('on'));
     const scripts = svgEl.getElementsByTagName('script');

package/core/shared/instrumentation.js

@@ -0,0 +1,33 @@
+async function initOpenTelemetry({config}) {
+    // Always enable in development environment
+    // In production, only enable if explicitly enabled via config `opentelemetry:enabled`
+    const isDevelopment = process.env.NODE_ENV === 'development';
+    const isConfigured = config.get('opentelemetry:enabled');
+    const enabled = isDevelopment || isConfigured;
+    if (!enabled) {
+        return;
+    }
+    const collectorOptions = {
+        url: config.get('opentelemetry:exporter:endpoint') || 'http://localhost:4318/v1/traces',
+        headers: {},
+        concurrencyLimit: 10
+    };
+
+    // Lazyloaded to avoid boot time overhead when not enabled
+    const {NodeSDK} = require('@opentelemetry/sdk-node');
+    const {OTLPTraceExporter} = require('@opentelemetry/exporter-trace-otlp-http');
+    const {getNodeAutoInstrumentations} = require('@opentelemetry/auto-instrumentations-node');
+
+    const sdk = new NodeSDK({
+        serviceName: 'ghost',
+        traceExporter: new OTLPTraceExporter(collectorOptions),
+        instrumentations: [
+            getNodeAutoInstrumentations()
+        ]
+    });
+    sdk.start();
+}
+
+module.exports = {
+    initOpenTelemetry
+};

package/core/shared/labs.js

@@ -25,8 +25,8 @@ const GA_FEATURES = [
     'filterEmailDisabled',
     'newEmailAddresses',
     'portalImprovements',
-    'onboardingChecklist',
-    'newsletterExcerpt'
+    'newsletterExcerpt',
+    'internalLinking'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -35,7 +35,6 @@ const BETA_FEATURES = [
     'additionalPaymentMethods',
     'i18n',
     'activitypub',
-    'internalLinking',
     'stripeAutomaticTax',
     'webmentions',
     'editorExcerpt'
@@ -54,7 +53,6 @@ const ALPHA_FEATURES = [
     'importMemberTier',
     'lexicalIndicators',
     'adminXDemo',
-    'internalLinkingAtLinks',
     'contentVisibility'
 ];