ghost 5.67.0 → 5.68.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%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.67%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%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.68%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%22ad022e25eb%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2203b15b5c6c%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-9e454659c8c0896ed10336b640d1b1eb.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-04f331b095bb184b7ee00f43f65466e4.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-71d23939faaa5d1478ead73d917111b9.js"></script>
-<script src="assets/chunk.940.b09a2c2049ed9c373dd0.js"></script>
-<script src="assets/chunk.143.da2301d9edb6ad0b5496.js"></script>
-    <script src="assets/ghost-193c98abe66483968da753e54917e87a.js"></script>
+<script src="assets/chunk.940.f55d8073f4fd2738aa11.js"></script>
+<script src="assets/chunk.143.5770521695d411ee098e.js"></script>
+    <script src="assets/ghost-fb0f793a8d8d9df304bc501fbcad01e4.js"></script>
 </body>
 </html>

package/core/frontend/helpers/recommendations.js

@@ -63,7 +63,7 @@ async function fetchRecommendations(apiOptions) {
  */
 function parseOptions(options) {
     let limit = options.limit ?? 5;
-    let order = options.order ?? 'createdAt desc';
+    let order = options.order ?? 'created_at desc';
     let filter = options.filter ?? '';
     let page = options.page ?? 1;
 

package/core/frontend/helpers/tpl/recommendations.hbs

@@ -2,12 +2,10 @@
     <ul class="recommendations">
         {{#each recommendations as |rec|}}
         <li class="recommendation">
-            <a href="{{rec.url}}">
+            <a href="{{rec.url}}" data-recommendation="{{rec.id}}" target="_blank" rel="noopener">
                 <img class="recommendation-favicon" src="{{rec.favicon}}" alt="{{rec.title}}">
-                <div class="recommendation-content">
-                    <h5 class="recommendation-title">{{rec.title}}</h5>
-                    <p class="recommendation-reason">{{rec.reason}}</p>
-                </div>
+                <h5 class="recommendation-title">{{rec.title}}</h5>
+                <p class="recommendation-reason">{{rec.reason}}</p>
             </a>
         </li>
         {{/each}}

package/core/server/GhostServer.js

@@ -4,6 +4,7 @@ const debug = require('@tryghost/debug')('server');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
+const metrics = require('@tryghost/metrics');
 const notify = require('./notify');
 const moment = require('moment');
 const stoppable = require('stoppable');
@@ -169,8 +170,16 @@ class GhostServer {
         try {
             // If we never fully started, there's nothing to stop
             if (this.httpServer && this.httpServer.listening) {
+                // Time how long it takes to close all in-flight requests
+                const startTime = Date.now();
+
                 // We stop the server first so that no new long running requests or processes can be started
                 await this._stopServer();
+
+                const shutdownDuration = Date.now() - startTime;
+                if (shutdownDuration > 15000) {
+                    metrics.metric('long-shutdown', shutdownDuration);
+                }
             }
             // Do all of the cleanup tasks
             await this._cleanup();

package/core/server/api/endpoints/incoming-recommendations.js

@@ -0,0 +1,20 @@
+const recommendations = require('../../services/recommendations');
+
+module.exports = {
+    docName: 'recommendations',
+
+    browse: {
+        headers: {
+            cacheInvalidate: false
+        },
+        options: [
+            'limit',
+            'page'
+        ],
+        permissions: true,
+        validation: {},
+        async query(frame) {
+            return await recommendations.incomingRecommendationController.browse(frame);
+        }
+    }
+};

package/core/server/api/endpoints/index.js

@@ -209,6 +209,10 @@ module.exports = {
         return apiFramework.pipeline(require('./recommendations'), localUtils);
     },
 
+    get incomingRecommendations() {
+        return apiFramework.pipeline(require('./incoming-recommendations'), localUtils);
+    },
+
     /**
      * Content API Controllers
      *

package/core/server/api/endpoints/posts-public.js

@@ -26,8 +26,9 @@ const rejectPrivateFieldsTransformer = input => mapQuery(input, function (value,
 function generateOptionsData(frame, options) {
     return options.reduce((memo, option) => {
         let value = frame.options?.[option];
-        if (['include', 'fields', 'formats'].includes(option)) {
-            value = value?.split(',').sort();
+
+        if (['include', 'fields', 'formats'].includes(option) && typeof value === 'string') {
+            value = value.split(',').sort();
         }
 
         if (option === 'page') {

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

@@ -19,7 +19,6 @@ module.exports = {
             'emailAnalytics',
             'hostSettings',
             'tenor',
-            'editor',
             'pintura',
             'signupForm'
         ];

package/core/server/models/product.js

@@ -82,7 +82,7 @@ const Product = ghostBookshelf.Model.extend({
                 return benefitToSave.name.toLowerCase() === existingBenefit.get('name').toLowerCase();
             });
             if (existingBenefitModel) {
-                benefitToSave.name = existingBenefitModel.get('name');
+                benefitToSave.id = existingBenefitModel.id;
             }
         });
 

package/core/server/services/recommendations/RecommendationServiceWrapper.js

@@ -28,6 +28,11 @@ class RecommendationServiceWrapper {
      */
     service;
 
+    /**
+     * @type {import('@tryghost/recommendations').IncomingRecommendationController}
+     */
+    incomingRecommendationController;
+
     /**
      * @type {import('@tryghost/recommendations').IncomingRecommendationService}
      */
@@ -51,6 +56,7 @@ class RecommendationServiceWrapper {
             RecommendationController,
             WellknownService,
             BookshelfClickEventRepository,
+            IncomingRecommendationController,
             IncomingRecommendationService,
             IncomingRecommendationEmailRenderer
         } = require('@tryghost/recommendations');
@@ -125,6 +131,10 @@ class RecommendationServiceWrapper {
             service: this.service
         });
 
+        this.incomingRecommendationController = new IncomingRecommendationController({
+            service: this.incomingRecommendationService
+        });
+
         if (labs.isSet('recommendations')) {
             this.service.init().catch(logging.error);
             this.incomingRecommendationService.init().catch(logging.error);

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

@@ -354,5 +354,8 @@ module.exports = function apiRoutes() {
     router.put('/recommendations/:id', mw.authAdminApi, http(api.recommendations.edit));
     router.del('/recommendations/:id', mw.authAdminApi, http(api.recommendations.destroy));
 
+    // Incoming recommendations
+    router.get('/incoming_recommendations', mw.authAdminApi, http(api.incomingRecommendations.browse));
+
     return router;
 };

package/core/shared/config/defaults.json

@@ -197,10 +197,6 @@
         "url": "https://cdn.jsdelivr.net/ghost/comments-ui@~{version}/umd/comments-ui.min.js",
         "version": "0.13"
     },
-    "editor": {
-        "url": "https://cdn.jsdelivr.net/ghost/koenig-lexical@~{version}/dist/koenig-lexical.umd.js",
-        "version": "0.4"
-    },
     "signupForm": {
         "url": "https://cdn.jsdelivr.net/ghost/signup-form@~{version}/umd/signup-form.min.js",
         "version": "0.1"

package/core/shared/labs.js

@@ -19,7 +19,8 @@ const GA_FEATURES = [
     'themeErrorsNotification',
     'outboundLinkTagging',
     'announcementBar',
-    'signupForm'
+    'signupForm',
+    'lexicalEditor'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -27,8 +28,7 @@ const GA_FEATURES = [
 const BETA_FEATURES = [
     'i18n',
     'activitypub',
-    'webmentions',
-    'lexicalEditor'
+    'webmentions'
 ];
 
 const ALPHA_FEATURES = [