ghost 4.30.0 → 4.32.1

package/core/server/services/themes/activation-bridge.js

@@ -1,6 +1,5 @@
 const debug = require('@tryghost/debug')('themes');
 const bridge = require('../../../bridge');
-const labs = require('../../../shared/labs');
 const customThemeSettings = require('../custom-theme-settings');
 
 /**
@@ -11,25 +10,19 @@ module.exports = {
     activateFromBoot: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method A on boot)', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
-        if (labs.isSet('customThemeSettings')) {
-            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
-        }
+        await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         await bridge.activateTheme(theme, checkedTheme);
     },
     activateFromAPI: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method B on API "activate")', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
-        if (labs.isSet('customThemeSettings')) {
-            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
-        }
+        await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         await bridge.activateTheme(theme, checkedTheme);
     },
     activateFromAPIOverride: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method C on API "override")', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
-        if (labs.isSet('customThemeSettings')) {
-            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
-        }
+        await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         await bridge.activateTheme(theme, checkedTheme);
     }
 };

package/core/server/services/themes/index.js

@@ -6,12 +6,6 @@ const installer = require('./installer');
 
 const settingsCache = require('../../../shared/settings-cache');
 
-// Needed for theme re-activation after customThemeSettings flag is toggled
-// @TODO: remove when customThemeSettings flag is removed
-const labs = require('../../../shared/labs');
-const events = require('../../lib/common/events');
-let _lastLabsValue;
-
 module.exports = {
     /*
      * Load the currently active theme
@@ -19,21 +13,6 @@ module.exports = {
     init: async () => {
         const themeName = settingsCache.get('active_theme');
 
-        /**
-         * When customThemeSettings labs flag is toggled we need to re-validate and activate
-         * the active theme so that it's settings are read and synced
-         *
-         * @TODO: remove when customThemeSettings labs flag is removed
-         */
-        _lastLabsValue = labs.isSet('customThemeSettings');
-        events.on('settings.labs.edited', () => {
-            if (labs.isSet('customThemeSettings') !== _lastLabsValue) {
-                _lastLabsValue = labs.isSet('customThemeSettings');
-
-                activate.activate(settingsCache.get('active_theme'));
-            }
-        });
-
         return activate.loadAndActivate(themeName);
     },
     /**

package/core/server/services/twitter-embed.js

@@ -1,6 +1,5 @@
 const {extract} = require('oembed-parser');
 const logging = require('@tryghost/logging');
-const labs = require('../../shared/labs');
 
 /**
  * @typedef {import('./oembed').ICustomProvider} ICustomProvider
@@ -43,7 +42,7 @@ class TwitterOEmbedProvider {
         /** @type {object} */
         const oembedData = await extract(url.href);
 
-        if (this.dependencies.config.bearerToken && labs.isSet('richTwitterNewsletters')) {
+        if (this.dependencies.config.bearerToken) {
             const query = {
                 expansions: ['attachments.poll_ids', 'attachments.media_keys', 'author_id', 'entities.mentions.username', 'geo.place_id', 'in_reply_to_user_id', 'referenced_tweets.id', 'referenced_tweets.id.author_id'],
                 'media.fields': ['duration_ms', 'height', 'media_key', 'preview_image_url', 'type', 'url', 'width', 'public_metrics', 'alt_text'],

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%224.30%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%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%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%224.32%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%2C%22propagation%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="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -40,8 +40,8 @@
     </style>
 
     
-                <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-c21fea11c3f431994a8ee7c47a8ed145.css" title="light">
+                <link rel="stylesheet" href="assets/vendor.min-0e0334a490951ab747706621f9ccd8b6.css">
+                <link rel="stylesheet" href="assets/ghost.min-2d5f48403647d1e11805691cc7ad0835.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-a2fd1e62ce6da8911fee8e812d8c6ceb.js"></script>
-                <script src="assets/ghost.min-884660873d56fcc3d2a3b9fe94c9f022.js"></script>
+                <script src="assets/vendor.min-45e83041aeba4ea7b184f669b20a2b23.js"></script>
+                <script src="assets/ghost.min-7535b70693bcefde1665bdf621087cbe.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%224.30%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%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%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%224.32%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%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%2C%22propagation%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="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -40,8 +40,8 @@
     </style>
 
     
-                <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-c21fea11c3f431994a8ee7c47a8ed145.css" title="light">
+                <link rel="stylesheet" href="assets/vendor.min-0e0334a490951ab747706621f9ccd8b6.css">
+                <link rel="stylesheet" href="assets/ghost.min-2d5f48403647d1e11805691cc7ad0835.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-a2fd1e62ce6da8911fee8e812d8c6ceb.js"></script>
-                <script src="assets/ghost.min-884660873d56fcc3d2a3b9fe94c9f022.js"></script>
+                <script src="assets/vendor.min-45e83041aeba4ea7b184f669b20a2b23.js"></script>
+                <script src="assets/ghost.min-7535b70693bcefde1665bdf621087cbe.js"></script>
             
 </body>
 </html>

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

@@ -4,7 +4,6 @@ const apiMw = require('../../middleware');
 const mw = require('./middleware');
 
 const shared = require('../../../shared');
-const labs = require('../../../../../shared/labs');
 
 module.exports = function apiRoutes() {
     const router = express.Router('canary admin');
@@ -238,14 +237,12 @@ module.exports = function apiRoutes() {
 
     // ## media
     router.post('/media/upload',
-        labs.enabledMiddleware('mediaAPI'),
         mw.authAdminApi,
         apiMw.upload.media('file', 'thumbnail'),
         apiMw.upload.mediaValidation({type: 'media'}),
         http(api.media.upload)
     );
     router.put('/media/thumbnail/upload',
-        labs.enabledMiddleware('mediaAPI'),
         mw.authAdminApi,
         apiMw.upload.single('file'),
         apiMw.upload.validation({type: 'images'}),
@@ -254,7 +251,6 @@ module.exports = function apiRoutes() {
 
     // ## files
     router.post('/files/upload',
-        labs.enabledMiddleware('filesAPI'),
         mw.authAdminApi,
         apiMw.upload.single('file'),
         http(api.files.upload)
@@ -303,8 +299,8 @@ module.exports = function apiRoutes() {
     router.del('/snippets/:id', mw.authAdminApi, http(api.snippets.destroy));
 
     // ## Custom theme settings
-    router.get('/custom_theme_settings', mw.authAdminApi, labs.enabledMiddleware('customThemeSettings'), http(api.customThemeSettings.browse));
-    router.put('/custom_theme_settings', mw.authAdminApi, labs.enabledMiddleware('customThemeSettings'), http(api.customThemeSettings.edit));
+    router.get('/custom_theme_settings', mw.authAdminApi, http(api.customThemeSettings.browse));
+    router.put('/custom_theme_settings', mw.authAdminApi, http(api.customThemeSettings.edit));
 
     return router;
 };

package/core/shared/config/defaults.json

@@ -127,8 +127,8 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~1.12.0/umd/portal.min.js",
-        "version": "1.12"
+        "url": "https://unpkg.com/@tryghost/portal@~1.13.0/umd/portal.min.js",
+        "version": "1.13"
     },
     "tenor": {
         "publicReadOnlyApiKey": null,

package/core/shared/config/overrides.json

@@ -32,7 +32,17 @@
         },
         "media": {
             "extensions": [".mp4",".webm", ".ogv", ".mp3", ".wav", ".ogg"],
-            "contentTypes": ["video/mp4", "video/webm", "video/ogg", "audio/mpeg", "audio/vnd.wav", "audio/ogg"]
+            "contentTypes": [
+                "video/mp4",
+                "video/webm",
+                "video/ogg",
+                "audio/mpeg",
+                "audio/vnd.wav",
+                "audio/wave",
+                "audio/wav",
+                "audio/x-wav",
+                "audio/ogg"
+            ]
         },
         "thumbnails": {
             "extensions": [".jpg", ".jpeg", ".gif", ".png", ".svg", ".svgz", ".ico", ".webp"],

package/core/shared/labs.js

@@ -15,17 +15,6 @@ const messages = {
 
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
 const GA_FEATURES = [
-    'customThemeSettings',
-    'nftCard',
-    'calloutCard',
-    'videoCard',
-    'accordionCard',
-    'productCard',
-    'richTwitterNewsletters',
-    'audioCard',
-    'mediaAPI',
-    'membersAutoLogin',
-    'filesAPI'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -40,10 +29,8 @@ const ALPHA_FEATURES = [
     'membersActivity',
     'cardSettingsPanel',
     'urlCache',
-    'fileCard',
     'beforeAfterCard',
-    'tweetGridCard',
-    'headerCard'
+    'tweetGridCard'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.30.0",
+  "version": "4.32.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -55,7 +55,7 @@
   "dependencies": {
     "@nexes/nql": "0.6.0",
     "@sentry/node": "6.16.1",
-    "@tryghost/adapter-manager": "0.2.25",
+    "@tryghost/adapter-manager": "0.2.26",
     "@tryghost/admin-api-schema": "2.6.1",
     "@tryghost/bookshelf-plugins": "0.3.5",
     "@tryghost/bootstrap-socket": "0.2.15",
@@ -69,32 +69,32 @@
     "@tryghost/errors": "1.2.0",
     "@tryghost/express-dynamic-redirects": "0.2.2",
     "@tryghost/helpers": "1.1.54",
-    "@tryghost/image-transform": "1.0.25",
+    "@tryghost/image-transform": "1.0.26",
     "@tryghost/job-manager": "0.8.17",
     "@tryghost/kg-card-factory": "3.1.0",
     "@tryghost/kg-default-atoms": "3.1.0",
-    "@tryghost/kg-default-cards": "5.14.7",
+    "@tryghost/kg-default-cards": "5.15.11",
     "@tryghost/kg-markdown-html-renderer": "5.1.0",
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.1",
-    "@tryghost/limit-service": "1.0.7",
+    "@tryghost/limit-service": "1.0.8",
     "@tryghost/logging": "2.0.0",
     "@tryghost/magic-link": "1.0.14",
-    "@tryghost/members-api": "2.8.6",
+    "@tryghost/members-api": "2.8.8",
     "@tryghost/members-csv": "1.2.0",
     "@tryghost/members-importer": "0.3.5",
     "@tryghost/members-offers": "0.10.3",
     "@tryghost/members-ssr": "1.0.16",
     "@tryghost/metrics": "1.0.1",
-    "@tryghost/minifier": "0.1.8",
+    "@tryghost/minifier": "0.1.9",
     "@tryghost/mw-error-handler": "0.1.1",
     "@tryghost/mw-session-from-token": "0.1.26",
     "@tryghost/nodemailer": "0.3.8",
-    "@tryghost/package-json": "1.0.13",
+    "@tryghost/package-json": "1.0.14",
     "@tryghost/promise": "0.1.13",
     "@tryghost/request": "0.1.10",
     "@tryghost/root-utils": "0.3.7",
     "@tryghost/security": "0.2.13",
-    "@tryghost/session-service": "0.1.35",
+    "@tryghost/session-service": "0.1.36",
     "@tryghost/settings-path-manager": "0.1.2",
     "@tryghost/social-urls": "0.1.27",
     "@tryghost/string": "0.1.21",
@@ -120,7 +120,7 @@
     "cookie-session": "1.4.0",
     "cors": "2.8.5",
     "downsize": "0.0.8",
-    "express": "4.17.1",
+    "express": "4.17.2",
     "express-brute": "1.0.1",
     "express-hbs": "2.4.0",
     "express-jwt": "6.1.0",
@@ -131,7 +131,7 @@
     "ghost-storage-base": "1.0.0",
     "glob": "7.2.0",
     "got": "9.6.0",
-    "gscan": "4.19.0",
+    "gscan": "4.20.2",
     "html-to-text": "5.1.1",
     "image-size": "1.0.0",
     "intl": "1.2.5",
@@ -144,17 +144,17 @@
     "knex": "0.21.21",
     "knex-migrator": "4.1.3",
     "lodash": "4.17.21",
-    "luxon": "2.2.0",
+    "luxon": "2.3.0",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.25.5",
-    "metascraper-author": "5.25.5",
-    "metascraper-description": "5.25.5",
-    "metascraper-image": "5.25.5",
-    "metascraper-logo": "5.25.5",
-    "metascraper-logo-favicon": "5.25.5",
-    "metascraper-publisher": "5.25.5",
-    "metascraper-title": "5.25.5",
-    "metascraper-url": "5.25.5",
+    "metascraper": "5.25.7",
+    "metascraper-author": "5.25.7",
+    "metascraper-description": "5.25.7",
+    "metascraper-image": "5.25.7",
+    "metascraper-logo": "5.25.7",
+    "metascraper-logo-favicon": "5.25.7",
+    "metascraper-publisher": "5.25.7",
+    "metascraper-title": "5.25.7",
+    "metascraper-url": "5.25.7",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.4",
@@ -162,7 +162,7 @@
     "nconf": "0.11.3",
     "node-jose": "2.0.0",
     "oembed-parser": "1.4.9",
-    "passport": "0.5.0",
+    "passport": "0.5.2",
     "passport-google-oauth": "2.0.0",
     "path-match": "1.2.4",
     "probe-image-size": "5.0.0",
@@ -175,19 +175,19 @@
     "xml": "1.0.1"
   },
   "optionalDependencies": {
-    "@tryghost/html-to-mobiledoc": "1.5.2",
+    "@tryghost/html-to-mobiledoc": "1.8.2",
     "sqlite3": "5.0.2"
   },
   "devDependencies": {
     "@ethanresnick/chai-jest-snapshot": "3.0.0",
     "@lodder/grunt-postcss": "3.1.1",
-    "c8": "7.10.0",
+    "c8": "7.11.0",
     "chai": "4.3.4",
     "coffeescript": "2.6.1",
-    "cssnano": "5.0.12",
+    "cssnano": "5.0.14",
     "eslint": "7.32.0",
     "eslint-plugin-ghost": "2.11.0",
-    "expect": "27.4.2",
+    "expect": "27.4.6",
     "grunt": "1.4.1",
     "grunt-bg-shell": "2.3.3",
     "grunt-contrib-clean": "2.0.0",