ghost 4.48.0 → 5.0.0

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.48%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.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="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-4084931bc22e794fe3722139050a80b3.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-855c93486d789aa09dbe97f272672bf9.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.js"></script>
+                <script src="assets/vendor.min-14ad7269e0529dd20f61d2989e69fa1e.js"></script>
+                <script src="assets/ghost.min-75bec566fbea362ed98811fe6d5b6e24.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.48%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.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="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-4084931bc22e794fe3722139050a80b3.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-855c93486d789aa09dbe97f272672bf9.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.js"></script>
+                <script src="assets/vendor.min-14ad7269e0529dd20f61d2989e69fa1e.js"></script>
+                <script src="assets/ghost.min-75bec566fbea362ed98811fe6d5b6e24.js"></script>
             
 </body>
 </html>

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

@@ -1,7 +1,6 @@
 const debug = require('@tryghost/debug')('web:api:default:app');
 const config = require('../../../shared/config');
 const express = require('../../../shared/express');
-const urlUtils = require('../../../shared/url-utils');
 const sentry = require('../../../shared/sentry');
 const errorHandler = require('@tryghost/mw-error-handler');
 const APIVersionCompatibilityService = require('../../services/api-version-compatibility');
@@ -14,22 +13,11 @@ module.exports = function setupApiApp() {
         apiApp.use(require('./testmode')());
     }
 
+    apiApp.use(APIVersionCompatibilityService.versionRewrites);
     apiApp.use(APIVersionCompatibilityService.contentVersion);
 
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v2', type: 'content'}), require('./v2/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v2', type: 'admin'}), require('./v2/admin/app'));
-
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v3', type: 'content'}), require('./v3/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v3', type: 'admin'}), require('./v3/admin/app'));
-
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v4', type: 'content'}), require('./canary/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v4', type: 'admin'}), require('./canary/admin/app'));
-
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v5', type: 'content'}), require('./canary/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v5', type: 'admin'}), require('./canary/admin/app'));
-
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'canary', type: 'content'}), require('./canary/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'canary', type: 'admin'}), require('./canary/admin/app'));
+    apiApp.lazyUse('/content/', require('./canary/content/app'));
+    apiApp.lazyUse('/admin/', require('./canary/admin/app'));
 
     // Error handling for requests to non-existent API versions
     apiApp.use(errorHandler.resourceNotFound);

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

@@ -35,7 +35,7 @@ module.exports = function setupApiApp() {
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
     apiApp.use(APIVersionCompatibilityService.errorHandler);
-    apiApp.use(errorHandler.handleJSONResponseV2(sentry));
+    apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Admin API canary setup end');
 

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

@@ -31,11 +31,13 @@ const notImplemented = function (req, res, next) {
         members: ['GET', 'PUT', 'DELETE', 'POST'],
         tiers: ['GET', 'PUT', 'POST'],
         offers: ['GET', 'PUT', 'POST'],
+        newsletters: ['GET', 'PUT', 'POST'],
         config: ['GET'],
         schedules: ['PUT'],
         files: ['POST'],
         media: ['POST'],
-        db: ['POST']
+        db: ['POST'],
+        settings: ['GET']
     };
 
     const match = req.url.match(/^\/(\w+)\/?/);

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

@@ -1,5 +1,6 @@
 const express = require('../../../../../shared/express');
-const api = require('../../../../api').canary;
+const api = require('../../../../api').endpoints;
+const http = require('../../../../api').shared.http;
 const apiMw = require('../../middleware');
 const mw = require('./middleware');
 
@@ -13,8 +14,6 @@ module.exports = function apiRoutes() {
 
     router.use(apiMw.cors);
 
-    const http = api.http;
-
     // ## Public
     router.get('/site', mw.publicAdminApi, http(api.site.read));
 
@@ -59,7 +58,6 @@ module.exports = function apiRoutes() {
     );
 
     router.get('/settings', mw.authAdminApi, http(api.settings.browse));
-    router.get('/settings/:key', mw.authAdminApi, http(api.settings.read));
     router.put('/settings', mw.authAdminApi, http(api.settings.edit));
     router.get('/settings/members/email', http(api.settings.validateMembersEmailUpdate));
     router.post('/settings/members/email', mw.authAdminApi, http(api.settings.updateMembersEmail));
@@ -87,13 +85,6 @@ module.exports = function apiRoutes() {
     router.put('/tags/:id', mw.authAdminApi, http(api.tags.edit));
     router.del('/tags/:id', mw.authAdminApi, http(api.tags.destroy));
 
-    // Products
-    // TODO Remove
-    router.get('/products', mw.authAdminApi, http(api.products.browse));
-    router.post('/products', mw.authAdminApi, http(api.products.add));
-    router.get('/products/:id', mw.authAdminApi, http(api.products.read));
-    router.put('/products/:id', mw.authAdminApi, http(api.products.edit));
-
     // Tiers
     router.get('/tiers', mw.authAdminApi, http(api.tiers.browse));
     router.post('/tiers', mw.authAdminApi, http(api.tiers.add));
@@ -124,8 +115,6 @@ module.exports = function apiRoutes() {
         http(api.members.importCSV)
     );
 
-    router.get('/members/hasActiveStripeSubscriptions', mw.authAdminApi, http(api.members.hasActiveStripeSubscriptions));
-
     router.get('/members/stripe_connect', mw.authAdminApi, http(api.membersStripeConnect.auth));
 
     router.get('/members/:id', mw.authAdminApi, http(api.members.read));
@@ -202,10 +191,6 @@ module.exports = function apiRoutes() {
         http(api.db.backupContent)
     );
 
-    // ## Mail
-    router.post('/mail', mw.authAdminApi, http(api.mail.send));
-    router.post('/mail/test', mw.authAdminApi, http(api.mail.sendTest));
-
     // ## Slack
     router.post('/slack/test', mw.authAdminApi, http(api.slack.sendTest));
 
@@ -223,18 +208,18 @@ module.exports = function apiRoutes() {
     router.get('/identities', mw.authAdminApi, http(api.identities.read));
 
     // ## Authentication
-    router.post('/authentication/passwordreset',
+    router.post('/authentication/password_reset',
         shared.middleware.brute.globalReset,
         shared.middleware.brute.userReset,
         http(api.authentication.generateResetToken)
     );
-    router.put('/authentication/passwordreset', shared.middleware.brute.globalBlock, http(api.authentication.resetPassword));
+    router.put('/authentication/password_reset', shared.middleware.brute.globalBlock, http(api.authentication.resetPassword));
     router.post('/authentication/invitation', http(api.authentication.acceptInvitation));
     router.get('/authentication/invitation', http(api.authentication.isInvitation));
     router.post('/authentication/setup', http(api.authentication.setup));
     router.put('/authentication/setup', mw.authAdminApi, http(api.authentication.updateSetup));
     router.get('/authentication/setup', http(api.authentication.isSetup));
-    router.post('/authentication/reset_all_passwords', mw.authAdminApi, http(api.authentication.resetAllPasswords));
+    router.post('/authentication/global_password_reset', mw.authAdminApi, http(api.authentication.resetAllPasswords));
 
     // ## Images
     router.post('/images/upload',
@@ -293,9 +278,8 @@ module.exports = function apiRoutes() {
     router.get('/actions', mw.authAdminApi, http(api.actions.browse));
 
     // ## Email Preview
-    // @TODO: rename to email_previews in 5.0
-    router.get('/email_preview/posts/:id', mw.authAdminApi, http(api.email_preview.read));
-    router.post('/email_preview/posts/:id', mw.authAdminApi, http(api.email_preview.sendTestEmail));
+    router.get('/email_previews/posts/:id', mw.authAdminApi, http(api.email_previews.read));
+    router.post('/email_previews/posts/:id', mw.authAdminApi, http(api.email_previews.sendTestEmail));
 
     // ## Emails
     router.get('/emails', mw.authAdminApi, http(api.emails.browse));

package/core/server/web/api/canary/content/app.js

@@ -6,8 +6,7 @@ const sentry = require('../../../../../shared/sentry');
 const shared = require('../../../shared');
 const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
-const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
-const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
+const apiVersionCompatibility = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Content API canary setup start');
@@ -29,7 +28,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
-    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
+    apiApp.use(apiVersionCompatibility.errorHandler);
     apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Content API canary setup end');

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

@@ -1,6 +1,7 @@
 const express = require('../../../../../shared/express');
 const cors = require('cors');
-const api = require('../../../../api').canary;
+const api = require('../../../../api').endpoints;
+const http = require('../../../../api').shared.http;
 const mw = require('./middleware');
 
 module.exports = function apiRoutes() {
@@ -8,8 +9,6 @@ module.exports = function apiRoutes() {
 
     router.use(cors());
 
-    const http = api.http;
-
     // ## Posts
     router.get('/posts', mw.authenticatePublic, http(api.postsPublic.browse));
     router.get('/posts/:id', mw.authenticatePublic, http(api.postsPublic.read));
@@ -33,8 +32,10 @@ module.exports = function apiRoutes() {
     // ## Settings
     router.get('/settings', mw.authenticatePublic, http(api.publicSettings.browse));
 
-    router.get('/products', mw.authenticatePublic, http(api.productsPublic.browse));
+    // ## Members
+    router.get('/newsletters', mw.authenticatePublic, http(api.newslettersPublic.browse));
     router.get('/tiers', mw.authenticatePublic, http(api.tiersPublic.browse));
+    router.get('/offers/:id', mw.authenticatePublic, http(api.offersPublic.read));
 
     return router;
 };

package/core/server/web/members/app.js

@@ -38,13 +38,14 @@ module.exports = function setupMembersApp() {
     membersApp.get('/api/member/newsletters', middleware.getMemberNewsletters);
     membersApp.put('/api/member/newsletters', bodyParser.json({limit: '1mb'}), middleware.updateMemberNewsletters);
 
+    // Get and update member data
     membersApp.get('/api/member', middleware.getMemberData);
     membersApp.put('/api/member', bodyParser.json({limit: '1mb'}), middleware.updateMemberData);
     membersApp.post('/api/member/email', bodyParser.json({limit: '1mb'}), (req, res) => membersService.api.middleware.updateEmailAddress(req, res));
+
+    // Manage session
     membersApp.get('/api/session', middleware.getIdentityToken);
-    membersApp.get('/api/offers/:id', middleware.getOfferData);
     membersApp.delete('/api/session', middleware.deleteSession);
-    membersApp.get('/api/site', middleware.getMemberSiteData);
 
     // NOTE: this is wrapped in a function to ensure we always go via the getter
     membersApp.post('/api/send-magic-link', bodyParser.json(), shared.middleware.brute.membersAuth, (req, res, next) => membersService.api.middleware.sendMagicLink(req, res, next));
@@ -55,11 +56,11 @@ module.exports = function setupMembersApp() {
 
     // API error handling
     membersApp.use('/api', errorHandler.resourceNotFound);
-    membersApp.use('/api', errorHandler.handleJSONResponseV2(sentry));
+    membersApp.use('/api', errorHandler.handleJSONResponse(sentry));
 
     // Webhook error handling
     membersApp.use('/webhooks', errorHandler.resourceNotFound);
-    membersApp.use('/webhooks', errorHandler.handleJSONResponseV2(sentry));
+    membersApp.use('/webhooks', errorHandler.handleJSONResponse(sentry));
 
     debug('Members App setup end');
 

package/core/server/web/parent/backend.js

@@ -13,7 +13,6 @@ module.exports = () => {
     const backendApp = express('backend');
 
     backendApp.lazyUse(BASE_API_PATH, require('../api'));
-    backendApp.lazyUse('/ghost/oauth', require('../oauth'));
     backendApp.lazyUse('/ghost/.well-known', require('../well-known'));
 
     backendApp.use('/ghost', require('../../services/auth/session').createSessionFromToken, require('../admin')());

package/core/server/web/parent/frontend.js

@@ -1,25 +1,24 @@
 const debug = require('@tryghost/debug')('frontend');
 const express = require('../../../shared/express');
-
 const shared = require('../shared');
 
 /**
  *
- * @param {object} options
+ * @param {import('../../../frontend/services/routing/router-manager').RouterConfig} routerConfig
  * @returns {import('express').RequestHandler}
  */
-module.exports = (options) => {
-    debug('FrontendApp setup start', options);
+module.exports = (routerConfig) => {
+    debug('FrontendApp setup start', routerConfig);
 
     // FRONTEND
     const frontendApp = express('frontend');
 
     // Force SSL if blog url is set to https. The redirects handling must happen before asset and page routing,
-    // otherwise we serve assets/pages with http. This can cause mixed content warnings in the admin client.
+    // otherwise we serve assets/pages with http. This can cause mixed content warnings in the admin app.
     frontendApp.use(shared.middleware.urlRedirects.frontendSSLRedirect);
 
     frontendApp.lazyUse('/members', require('../members'));
-    frontendApp.use('/', require('../../../frontend/web')(options));
+    frontendApp.use('/', require('../../../frontend/web')(routerConfig));
 
     return frontendApp;
 };

package/core/server/web/parent/middleware/ghost-locals.js

@@ -1,5 +1,4 @@
 const ghostVersion = require('@tryghost/version');
-const bridge = require('../../../../bridge');
 
 // ### GhostLocals Middleware
 // Expose the standard locals that every request will need to have available
@@ -12,8 +11,6 @@ module.exports = function ghostLocals(req, res, next) {
     res.locals.safeVersion = ghostVersion.safe;
     // relative path from the URL
     res.locals.relativeUrl = req.path;
-    // make ghost api version available for the theme + routing
-    res.locals.apiVersion = bridge.getFrontendApiVersion();
 
     next();
 };

package/core/shared/config/defaults.json

@@ -128,8 +128,8 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~1.22.0/umd/portal.min.js",
-        "version": "1.20"
+        "url": "https://unpkg.com/@tryghost/portal@~2.1.0/umd/portal.min.js",
+        "version": "2.1"
     },
     "tenor": {
         "publicReadOnlyApiKey": null,
@@ -140,5 +140,8 @@
     },
     "twitter": {
         "privateReadOnlyToken": null
+    },
+    "gravatar": {
+        "url": "https://www.gravatar.com/avatar/{hash}?s={size}&r={rating}&d={_default}"
     }
 }

package/core/shared/config/overrides.json

@@ -2,7 +2,7 @@
     "paths": {
         "appRoot": ".",
         "corePath": "core/",
-        "clientAssets": "core/built/assets",
+        "adminAssets": "core/built/assets",
         "helperTemplates": "core/frontend/helpers/tpl/",
         "adminViews": "core/server/web/admin/views/",
         "defaultViews": "core/server/views/",
@@ -77,32 +77,6 @@
     "maintenance": {
         "enabled": false
     },
-    "api": {
-        "versions": {
-            "all": ["v2", "v3", "v4", "v5", "canary"],
-            "default": "v4",
-            "canary": {
-                "admin": "canary/admin",
-                "content": "canary/content"
-            },
-            "v5": {
-                "admin": "admin",
-                "content": "content"
-            },
-            "v4": {
-                "admin": "v4/admin",
-                "content": "v4/content"
-            },
-            "v3": {
-                "admin": "v3/admin",
-                "content": "v3/content"
-            },
-            "v2": {
-                "admin": "v2/admin",
-                "content": "v2/content"
-            }
-        }
-    },
     "imageOptimization": {
         "defaultMaxWidth": 2000,
         "contentImageSizes": {

package/core/shared/html-to-plaintext.js

@@ -1,12 +1,76 @@
-module.exports = function htmlToPlaintext(html) {
-    const htmlToText = require('html-to-text');
-
-    return htmlToText.fromString(html, {
-        wordwrap: 80,
-        ignoreImage: true,
-        hideLinkHrefIfSameAsText: true,
-        preserveNewlines: true,
-        returnDomByDefault: true,
-        uppercaseHeadings: false
+const _ = require('lodash');
+
+const mergeSettings = (extraSettings) => {
+    return _.mergeWith({}, baseSettings, extraSettings, function customizer(objValue, srcValue) {
+        if (_.isArray(objValue)) {
+            return objValue.concat(srcValue);
+        }
     });
 };
+
+const baseSettings = {
+    wordwrap: false,
+    preserveNewlines: true,
+
+    // equiv returnDomByDefault: true,
+    baseElements: {returnDomByDefault: true},
+    selectors: [
+        // Ignore images, equiv ignoreImage: true
+        {selector: 'img', format: 'skip'},
+
+        // disable uppercase headings, equiv uppercaseHeadings: false
+        {selector: 'h1', options: {uppercase: false}},
+        {selector: 'h2', options: {uppercase: false}},
+        {selector: 'h3', options: {uppercase: false}},
+        {selector: 'h4', options: {uppercase: false}},
+        {selector: 'h5', options: {uppercase: false}},
+        {selector: 'h6', options: {uppercase: false}},
+        {selector: 'table', options: {uppercaseHeaderCells: false}},
+
+        // Backwards compatibility with html-to-text 5.1.1
+        {selector: 'div', format: 'inline'}
+    ]
+};
+
+let excerptConverter;
+let emailConverter;
+
+const loadConverters = () => {
+    if (excerptConverter && emailConverter) {
+        return;
+    }
+
+    const {compile} = require('html-to-text');
+
+    const excerptSettings = mergeSettings({
+        selectors: [
+            {selector: 'a', options: {ignoreHref: true}},
+            {selector: 'figcaption', format: 'skip'},
+            // Strip inline and bottom footnotes
+            {selector: 'a[rel=footnote]', format: 'skip'},
+            {selector: 'div.footnotes', format: 'skip'}
+        ]
+    });
+
+    const emailSettings = mergeSettings({
+        selectors: [
+            // equiv hideLinkHrefIfSameAsText: true
+            {selector: 'a', options: {hideLinkHrefIfSameAsText: true}}
+        ]
+    });
+
+    excerptConverter = compile(excerptSettings);
+    emailConverter = compile(emailSettings);
+};
+
+module.exports.excerpt = (html) => {
+    loadConverters();
+
+    return excerptConverter(html);
+};
+
+module.exports.email = (html) => {
+    loadConverters();
+
+    return emailConverter(html);
+};

package/core/shared/labs.js

@@ -20,26 +20,22 @@ const GA_FEATURES = [
     'tierName',
     'selectablePortalLinks',
     'membersTableStatus',
-    'improvedOnboarding',
     'multipleNewsletters',
-    'membersActivityFeed'
+    'multipleNewslettersUI',
+    'membersActivityFeed',
+    'dashboardV5'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
 const BETA_FEATURES = [
-    'multipleNewslettersUI',
     'activitypub'
 ];
 
 const ALPHA_FEATURES = [
-    'oauthLogin',
-    'membersActivity',
     'urlCache',
     'beforeAfterCard',
-    'tweetGridCard',
-    'dashboardV5',
-    'publishingFlow'
+    'tweetGridCard'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/core/shared/settings-cache/cache.js

@@ -3,6 +3,7 @@
 // circular dependency bugs.
 const debug = require('@tryghost/debug')('settings:cache');
 const _ = require('lodash');
+
 const publicSettings = require('./public');
 
 // Local function, only ever used for initializing
@@ -12,6 +13,13 @@ const updateSettingFromModel = function updateSettingFromModel(settingModel) {
     module.exports.set(settingModel.get('key'), settingModel.toJSON());
 };
 
+const updateCalculatedField = function updateCalculatedField(field) {
+    return () => {
+        debug('Auto updating', field.key);
+        module.exports.set(field.key, field.getSetting());
+    };
+};
+
 /**
  * ## Cache
  * Holds cached settings
@@ -20,6 +28,7 @@ const updateSettingFromModel = function updateSettingFromModel(settingModel) {
  * @type {{}} - object of objects
  */
 let settingsCache = {};
+let _calculatedFields = [];
 
 const doGet = (key, options) => {
     if (!settingsCache[key]) {
@@ -33,6 +42,11 @@ const doGet = (key, options) => {
 
     // Default behaviour is to try to resolve the value and return that
     try {
+        // CASE: handle literal false
+        if (settingsCache[key].value === false || settingsCache[key].value === 'false') {
+            return false;
+        }
+
         // CASE: if a string contains a number e.g. "1", JSON.parse will auto convert into integer
         if (!isNaN(Number(settingsCache[key].value))) {
             return settingsCache[key].value || null;
@@ -99,7 +113,7 @@ module.exports = {
         let settings = {};
 
         _.each(publicSettings, (key, newKey) => {
-            settings[newKey] = doGet(key) || null;
+            settings[newKey] = doGet(key) ?? null;
         });
 
         return settings;
@@ -110,11 +124,12 @@ module.exports = {
      * Optionally takes a collection of settings & can populate the cache with these.
      *
      * @param {EventEmitter} events
-     * @param {Bookshelf.Collection<Settings>} [settingsCollection]
+     * @param {Bookshelf.Collection<Settings>} settingsCollection
+     * @param {Array} calculatedFields
      * @return {object}
      */
-    init(events, settingsCollection) {
-        // First, reset the cache and listeners
+    init(events, settingsCollection, calculatedFields) {
+        // First, reset the cache and
         this.reset(events);
 
         // // if we have been passed a collection of settings, use this to populate the cache
@@ -122,11 +137,21 @@ module.exports = {
             _.each(settingsCollection.models, updateSettingFromModel);
         }
 
+        _calculatedFields = Array.isArray(calculatedFields) ? calculatedFields : [];
+
         // Bind to events to automatically keep up-to-date
         events.on('settings.edited', updateSettingFromModel);
         events.on('settings.added', updateSettingFromModel);
         events.on('settings.deleted', updateSettingFromModel);
 
+        // set and bind calculated fields
+        _calculatedFields.forEach((field) => {
+            updateCalculatedField(field)();
+            field.dependents.forEach((dependent) => {
+                events.on(`settings.${dependent}.edited`, updateCalculatedField(field));
+            });
+        });
+
         return settingsCache;
     },
 
@@ -140,5 +165,14 @@ module.exports = {
         events.removeListener('settings.edited', updateSettingFromModel);
         events.removeListener('settings.added', updateSettingFromModel);
         events.removeListener('settings.deleted', updateSettingFromModel);
+
+        //unbind calculated fields
+        _calculatedFields.forEach((field) => {
+            field.dependents.forEach((dependent) => {
+                events.removeListener(`settings.${dependent}.edited`, updateCalculatedField(field));
+            });
+        });
+
+        _calculatedFields = [];
     }
 };