ghost 5.0.2 → 5.1.0

package/core/server/services/mega/mega.js

@@ -2,7 +2,6 @@ const _ = require('lodash');
 const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('mega');
 const tpl = require('@tryghost/tpl');
-const url = require('url');
 const moment = require('moment');
 const ObjectID = require('bson-objectid');
 const errors = require('@tryghost/errors');
@@ -15,7 +14,6 @@ const jobsService = require('../jobs');
 const db = require('../../data/db');
 const models = require('../../models');
 const postEmailSerializer = require('./post-email-serializer');
-const labs = require('../../../shared/labs');
 const {getSegmentsFromHtml} = require('./segment-parser');
 
 // Used to listen to email.added and email.edited model events originally, I think to offload this - ideally would just use jobs now if possible
@@ -267,58 +265,6 @@ const retryFailedEmail = async (emailModel) => {
     });
 };
 
-/**
- * handleUnsubscribeRequest
- *
- * Takes a request/response pair and reads the `unsubscribe` query parameter,
- * using the content to update the members service to set the `subscribed` flag
- * to false on the member
- *
- * If any operation fails, or the request is invalid the function will error - so using
- * as middleware should consider wrapping with `try/catch`
- *
- * @param {Request} req
- * @returns {Promise<void>}
- */
-async function handleUnsubscribeRequest(req) {
-    if (!req.url) {
-        throw new errors.BadRequestError({
-            message: 'Email address not found.'
-        });
-    }
-
-    const {query} = url.parse(req.url, true);
-    if (!query || !query.uuid) {
-        throw new errors.BadRequestError({
-            message: (query.preview ? 'Unsubscribe preview' : 'Email address not found.')
-        });
-    }
-
-    const member = await membersService.api.members.get({
-        uuid: query.uuid
-    });
-
-    if (!member) {
-        throw new errors.BadRequestError({
-            message: 'Email address not found.'
-        });
-    }
-
-    try {
-        let memberData = {subscribed: false};
-        if (labs.isSet('multipleNewsletters')) {
-            memberData.newsletters = [];
-        }
-        const memberModel = await membersService.api.members.update(memberData, {id: member.id});
-        return memberModel.toJSON();
-    } catch (err) {
-        throw new errors.InternalServerError({
-            err,
-            message: 'Failed to unsubscribe this email address'
-        });
-    }
-}
-
 async function pendingEmailHandler(emailModel, options) {
     // CASE: do not send email if we import a database
     // TODO: refactor post.published events to never fire on importing
@@ -590,7 +536,6 @@ module.exports = {
     addEmail,
     retryFailedEmail,
     sendTestEmail,
-    handleUnsubscribeRequest,
     // NOTE: below are only exposed for testing purposes
     _transformEmailRecipientFilter: transformEmailRecipientFilter,
     _partitionMembersBySegment: partitionMembersBySegment,

package/core/server/services/members/utils.js

@@ -1,5 +1,3 @@
-const labsService = require('../../../shared/labs');
-
 function formatNewsletterResponse(newsletters) {
     return newsletters.map(({id, name, description, sort_order: sortOrder}) => {
         return {id, name, description, sort_order: sortOrder};
@@ -20,7 +18,7 @@ module.exports.formattedMemberResponse = function formattedMemberResponse(member
         subscriptions: member.subscriptions || [],
         paid: member.status !== 'free'
     };
-    if (member.newsletters && labsService.isSet('multipleNewsletters')) {
+    if (member.newsletters) {
         data.newsletters = formatNewsletterResponse(member.newsletters);
     }
     return data;

package/core/server/services/webhooks/webhooks-service.js

@@ -50,7 +50,7 @@ class WebhooksService {
 }
 
 /**
- * @returns {WebhooksService} instance of the PostsService
+ * @returns {WebhooksService} instance of the WebhooksService
  */
 const getWebhooksServiceInstance = ({WebhookModel}) => {
     return new WebhooksService({WebhookModel});

package/core/server/web/admin/views/default-prod.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%22rootURL%22%3A%22%2F%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.0%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%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%22rootURL%22%3A%22%2F%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.1%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%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="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-ba66b98f7c24fa40e061c7ffc94f4e23.css">
-                <link rel="stylesheet" href="assets/ghost.min-a40c7b301c702bd84c2fae19366ab5d7.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-39cecb1bdd781ae091204535bf9df8c7.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-2bca41946dea27dc292428db605d466d.js"></script>
-                <script src="assets/ghost.min-b37a2752b0abda202c14c948b8bc3587.js"></script>
+                <script src="assets/vendor.min-ea369e6487643585f35409d474b06789.js"></script>
+                <script src="assets/ghost.min-1e4e29e84772e7a2af07258b4d089bfc.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.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%22rootURL%22%3A%22%2F%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.0%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%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%22rootURL%22%3A%22%2F%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.1%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%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="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-ba66b98f7c24fa40e061c7ffc94f4e23.css">
-                <link rel="stylesheet" href="assets/ghost.min-a40c7b301c702bd84c2fae19366ab5d7.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-39cecb1bdd781ae091204535bf9df8c7.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-2bca41946dea27dc292428db605d466d.js"></script>
-                <script src="assets/ghost.min-b37a2752b0abda202c14c948b8bc3587.js"></script>
+                <script src="assets/vendor.min-ea369e6487643585f35409d474b06789.js"></script>
+                <script src="assets/ghost.min-1e4e29e84772e7a2af07258b4d089bfc.js"></script>
             
 </body>
 </html>

package/core/server/web/api/middleware/normalize-image.js

@@ -7,7 +7,7 @@ module.exports = function normalize(req, res, next) {
     const imageOptimizationOptions = config.get('imageOptimization');
 
     // CASE: image transform is not capable of transforming file (e.g. .gif)
-    if (!imageTransform.canTransformFileExtension(req.file.ext) || !imageOptimizationOptions.resize) {
+    if (!imageTransform.shouldResizeFileExtension(req.file.ext) || !imageOptimizationOptions.resize) {
         return next();
     }
 

package/core/shared/config/overrides.json

@@ -49,8 +49,8 @@
             "contentTypes": ["image/jpeg", "image/png", "image/gif", "image/svg+xml", "image/x-icon", "image/vnd.microsoft.icon", "image/webp"]
         },
         "icons": {
-            "extensions": [".png", ".ico"],
-            "contentTypes": ["image/png", "image/x-icon", "image/vnd.microsoft.icon"]
+            "extensions": [".jpg", ".jpeg", ".gif", ".png", ".svg", ".svgz", ".ico", ".webp"],
+            "contentTypes": ["image/jpeg", "image/png", "image/gif", "image/svg+xml", "image/x-icon", "image/vnd.microsoft.icon", "image/webp"]
         },
         "db": {
             "extensions": [".json", ".zip"],
@@ -84,6 +84,9 @@
             "w1000": {"width": 1000},
             "w1600": {"width": 1600},
             "w2400": {"width": 2400}
+        },
+        "internalImageSizes": {
+            "icon": {"width": 256, "height": 256}
         }
     }
 }

package/core/shared/labs.js

@@ -14,17 +14,7 @@ const messages = {
 };
 
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
-const GA_FEATURES = [
-    'multipleProducts',
-    'tierWelcomePages',
-    'tierName',
-    'selectablePortalLinks',
-    'membersTableStatus',
-    'multipleNewsletters',
-    'multipleNewslettersUI',
-    'membersActivityFeed',
-    'dashboardV5'
-];
+const GA_FEATURES = [];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
@@ -34,8 +24,7 @@ const BETA_FEATURES = [
 
 const ALPHA_FEATURES = [
     'urlCache',
-    'beforeAfterCard',
-    'tweetGridCard'
+    'beforeAfterCard'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.0.2",
+  "version": "5.1.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -73,8 +73,8 @@
     "@tryghost/email-content-generator": "0.1.3",
     "@tryghost/errors": "1.2.12",
     "@tryghost/express-dynamic-redirects": "0.2.13",
-    "@tryghost/helpers": "1.1.69",
-    "@tryghost/image-transform": "1.0.32",
+    "@tryghost/helpers": "1.1.70",
+    "@tryghost/image-transform": "1.1.0",
     "@tryghost/job-manager": "0.8.24",
     "@tryghost/kg-card-factory": "3.1.3",
     "@tryghost/kg-default-atoms": "3.1.2",
@@ -85,9 +85,9 @@
     "@tryghost/logging": "2.1.8",
     "@tryghost/magic-link": "1.0.26",
     "@tryghost/member-events": "0.4.6",
-    "@tryghost/members-api": "8.1.1",
+    "@tryghost/members-api": "8.1.2",
     "@tryghost/members-events-service": "0.4.3",
-    "@tryghost/members-importer": "0.5.15",
+    "@tryghost/members-importer": "0.5.16",
     "@tryghost/members-offers": "0.11.6",
     "@tryghost/members-ssr": "1.0.28",
     "@tryghost/members-stripe-service": "0.10.5",
@@ -144,7 +144,7 @@
     "ghost-storage-base": "1.0.0",
     "glob": "8.0.3",
     "got": "9.6.0",
-    "gscan": "4.30.0",
+    "gscan": "4.31.0",
     "html-to-text": "8.2.0",
     "image-size": "1.0.1",
     "intl": "1.2.5",
@@ -154,20 +154,20 @@
     "jsonwebtoken": "8.5.1",
     "juice": "8.0.0",
     "keypair": "1.0.4",
-    "knex": "2.0.0",
+    "knex": "2.1.0",
     "knex-migrator": "4.2.10",
     "lodash": "4.17.21",
     "luxon": "2.4.0",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.29.3",
-    "metascraper-author": "5.29.3",
-    "metascraper-description": "5.29.3",
-    "metascraper-image": "5.29.3",
-    "metascraper-logo": "5.29.3",
-    "metascraper-logo-favicon": "5.29.3",
-    "metascraper-publisher": "5.29.3",
-    "metascraper-title": "5.29.3",
-    "metascraper-url": "5.29.3",
+    "metascraper": "5.29.6",
+    "metascraper-author": "5.29.6",
+    "metascraper-description": "5.29.6",
+    "metascraper-image": "5.29.6",
+    "metascraper-logo": "5.29.6",
+    "metascraper-logo-favicon": "5.29.6",
+    "metascraper-publisher": "5.29.6",
+    "metascraper-title": "5.29.6",
+    "metascraper-url": "5.29.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.4",