ghost 4.48.0 → 5.0.2

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,80 @@
-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'},
+            // Don't output hrs
+            {selector: 'hr', format: 'skip'},
+            // Don't output > in blockquotes
+            {selector: 'blockquote', format: 'block'}
+        ]
+    });
+
+    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 = [];
     }
 };

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

@@ -1,8 +1,4 @@
 /**
- * The settings with type "site" were originally meant to be public
- * This has been misused - unsplash and slack are incorrectly stored there
- * https://github.com/TryGhost/Ghost/issues/10318
- *
  * This file acts as an allowlist for "public" settings
  */
 
@@ -15,8 +11,8 @@ module.exports = {
     cover_image: 'cover_image',
     facebook: 'facebook',
     twitter: 'twitter',
-    lang: 'lang',
-    locale: 'lang',
+    lang: 'locale',
+    locale: 'locale',
     timezone: 'timezone',
     codeinjection_head: 'codeinjection_head',
     codeinjection_foot: 'codeinjection_foot',
@@ -30,5 +26,15 @@ module.exports = {
     twitter_image: 'twitter_image',
     twitter_title: 'twitter_title',
     twitter_description: 'twitter_description',
-    members_support_address: 'members_support_address'
+    members_support_address: 'members_support_address',
+    members_enabled: 'members_enabled',
+    members_invite_only: 'members_invite_only',
+    paid_members_enabled: 'paid_members_enabled',
+    firstpromoter_account: 'firstpromoter_account',
+    portal_button_style: 'portal_button_style',
+    portal_button_signup_text: 'portal_button_signup_text',
+    portal_button_icon: 'portal_button_icon',
+    portal_plans: 'portal_plans',
+    portal_name: 'portal_name',
+    portal_button: 'portal_button'
 };

package/core/shared/url-utils.js

@@ -7,8 +7,6 @@ const urlUtils = new UrlUtils({
     getSubdir: config.getSubdir,
     getSiteUrl: config.getSiteUrl,
     getAdminUrl: config.getAdminUrl,
-    apiVersions: config.get('api:versions'),
-    defaultApiVersion: config.get('api:versions:default'),
     slugs: config.get('slugs').protected,
     redirectCacheMaxAge: config.get('caching:301:maxAge'),
     baseApiPath: BASE_API_PATH

package/ghost.js

@@ -12,8 +12,14 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 const argv = process.argv;
 const mode = argv[2];
 
+const command = require('./core/cli/command');
+
 // Switch between boot modes
 switch (mode) {
+case 'repl':
+case 'timetravel':
+    command.run(mode);
+    break;
 default:
     // New boot sequence
     require('./core/boot')();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.48.0",
+  "version": "5.0.2",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -46,9 +46,9 @@
     "lint:test": "eslint -c test/.eslintrc.js --ignore-path test/.eslintignore 'test/**/*.js'",
     "lint:code": "yarn lint:server && yarn lint:shared && yarn lint:frontend",
     "lint": "yarn lint:server && yarn lint:shared && yarn lint:frontend && yarn lint:test",
-    "fix:client": "yarn cache clean && cd core/client && rm -rf node_modules tmp dist && yarn && cd ../../",
+    "fix:admin": "yarn cache clean && cd core/admin && rm -rf node_modules tmp dist && yarn && cd ../../",
     "fix:server": "yarn cache clean && rm -rf node_modules && yarn",
-    "fix": "yarn fix:client && yarn fix:server"
+    "fix": "yarn fix:admin && yarn fix:server"
   },
   "engines": {
     "node": "^14.17.0 || ^16.13.0",
@@ -56,66 +56,67 @@
   },
   "dependencies": {
     "@sentry/node": "6.19.7",
-    "@tryghost/adapter-manager": "0.2.29",
-    "@tryghost/admin-api-schema": "2.14.0",
-    "@tryghost/api-version-compatibility-service": "0.1.1",
+    "@tryghost/adapter-manager": "0.2.31",
+    "@tryghost/admin-api-schema": "4.0.0",
+    "@tryghost/api-version-compatibility-service": "0.4.3",
     "@tryghost/bookshelf-plugins": "0.4.1",
-    "@tryghost/bootstrap-socket": "0.2.18",
-    "@tryghost/color-utils": "0.1.13",
-    "@tryghost/config-url-helpers": "0.1.6",
-    "@tryghost/constants": "1.0.3",
+    "@tryghost/bootstrap-socket": "0.2.20",
+    "@tryghost/color-utils": "0.1.17",
+    "@tryghost/config-url-helpers": "1.0.0",
+    "@tryghost/constants": "1.0.5",
     "@tryghost/custom-theme-settings-service": "0.3.3",
-    "@tryghost/database-info": "0.3.3",
+    "@tryghost/database-info": "0.3.5",
     "@tryghost/debug": "0.1.16",
-    "@tryghost/domain-events": "0.1.12",
+    "@tryghost/domain-events": "0.1.14",
     "@tryghost/email-analytics-provider-mailgun": "1.0.9",
     "@tryghost/email-analytics-service": "1.0.7",
+    "@tryghost/email-content-generator": "0.1.3",
     "@tryghost/errors": "1.2.12",
-    "@tryghost/express-dynamic-redirects": "0.2.11",
-    "@tryghost/helpers": "1.1.64",
-    "@tryghost/image-transform": "1.0.30",
-    "@tryghost/job-manager": "0.8.22",
+    "@tryghost/express-dynamic-redirects": "0.2.13",
+    "@tryghost/helpers": "1.1.69",
+    "@tryghost/image-transform": "1.0.32",
+    "@tryghost/job-manager": "0.8.24",
     "@tryghost/kg-card-factory": "3.1.3",
     "@tryghost/kg-default-atoms": "3.1.2",
     "@tryghost/kg-default-cards": "5.16.2",
     "@tryghost/kg-markdown-html-renderer": "5.1.5",
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.5",
-    "@tryghost/limit-service": "1.1.2",
+    "@tryghost/limit-service": "1.2.0",
     "@tryghost/logging": "2.1.8",
-    "@tryghost/magic-link": "1.0.24",
-    "@tryghost/member-events": "0.4.4",
-    "@tryghost/members-api": "6.3.1",
-    "@tryghost/members-events-service": "0.4.1",
-    "@tryghost/members-importer": "0.5.12",
-    "@tryghost/members-offers": "0.11.4",
-    "@tryghost/members-ssr": "1.0.26",
-    "@tryghost/members-stripe-service": "0.10.3",
+    "@tryghost/magic-link": "1.0.26",
+    "@tryghost/member-events": "0.4.6",
+    "@tryghost/members-api": "8.1.1",
+    "@tryghost/members-events-service": "0.4.3",
+    "@tryghost/members-importer": "0.5.15",
+    "@tryghost/members-offers": "0.11.6",
+    "@tryghost/members-ssr": "1.0.28",
+    "@tryghost/members-stripe-service": "0.10.5",
     "@tryghost/metrics": "1.0.11",
-    "@tryghost/minifier": "0.1.13",
-    "@tryghost/mw-api-version-mismatch": "0.1.1",
-    "@tryghost/mw-error-handler": "0.2.2",
-    "@tryghost/mw-session-from-token": "0.1.30",
+    "@tryghost/minifier": "0.1.15",
+    "@tryghost/mw-api-version-mismatch": "0.2.1",
+    "@tryghost/mw-error-handler": "1.0.1",
+    "@tryghost/mw-session-from-token": "0.1.32",
     "@tryghost/nodemailer": "0.3.22",
     "@tryghost/nql": "0.9.2",
-    "@tryghost/package-json": "1.0.19",
-    "@tryghost/promise": "0.1.16",
+    "@tryghost/package-json": "1.0.21",
+    "@tryghost/pretty-cli": "1.2.27",
+    "@tryghost/promise": "0.1.18",
     "@tryghost/request": "0.1.26",
     "@tryghost/root-utils": "0.3.14",
-    "@tryghost/security": "0.2.16",
-    "@tryghost/session-service": "0.1.40",
-    "@tryghost/settings-path-manager": "0.1.5",
-    "@tryghost/social-urls": "0.1.29",
-    "@tryghost/stats-service": "0.2.1",
-    "@tryghost/string": "0.1.23",
+    "@tryghost/security": "0.3.1",
+    "@tryghost/session-service": "0.1.42",
+    "@tryghost/settings-path-manager": "0.1.7",
+    "@tryghost/social-urls": "0.1.32",
+    "@tryghost/stats-service": "0.2.2",
+    "@tryghost/string": "0.1.26",
     "@tryghost/tpl": "0.1.16",
-    "@tryghost/update-check-service": "0.3.2",
-    "@tryghost/url-utils": "2.1.0",
+    "@tryghost/update-check-service": "0.3.4",
+    "@tryghost/url-utils": "4.0.1",
     "@tryghost/validator": "0.1.24",
-    "@tryghost/verification-trigger": "0.2.3",
+    "@tryghost/verification-trigger": "0.2.5",
     "@tryghost/version": "0.1.14",
-    "@tryghost/version-notifications-data-service": "0.1.0",
-    "@tryghost/vhost-middleware": "1.0.24",
-    "@tryghost/zip": "1.1.23",
+    "@tryghost/vhost-middleware": "1.0.25",
+    "@tryghost/zip": "1.1.25",
     "amperize": "0.6.1",
     "analytics-node": "6.0.0",
     "bluebird": "3.7.2",
@@ -125,25 +126,26 @@
     "brute-knex": "4.0.1",
     "bson-objectid": "2.0.3",
     "bthreads": "0.5.1",
+    "chalk": "4.1.2",
     "cheerio": "0.22.0",
     "compression": "1.7.4",
     "connect-slashes": "1.4.0",
     "cookie-session": "2.0.0",
     "cors": "2.8.5",
     "downsize": "0.0.8",
-    "express": "4.18.0",
+    "express": "4.18.1",
     "express-brute": "1.0.1",
     "express-hbs": "2.4.0",
-    "express-jwt": "7.5.2",
+    "express-jwt": "7.7.2",
     "express-lazy-router": "1.0.4",
     "express-query-boolean": "2.0.0",
-    "express-session": "1.17.2",
+    "express-session": "1.17.3",
     "fs-extra": "10.1.0",
     "ghost-storage-base": "1.0.0",
-    "glob": "8.0.1",
+    "glob": "8.0.3",
     "got": "9.6.0",
-    "gscan": "4.27.0",
-    "html-to-text": "5.1.1",
+    "gscan": "4.30.0",
+    "html-to-text": "8.2.0",
     "image-size": "1.0.1",
     "intl": "1.2.5",
     "intl-messageformat": "5.4.3",
@@ -153,9 +155,9 @@
     "juice": "8.0.0",
     "keypair": "1.0.4",
     "knex": "2.0.0",
-    "knex-migrator": "4.2.8",
+    "knex-migrator": "4.2.10",
     "lodash": "4.17.21",
-    "luxon": "2.3.2",
+    "luxon": "2.4.0",
     "mailgun-js": "0.22.0",
     "metascraper": "5.29.3",
     "metascraper-author": "5.29.3",
@@ -173,8 +175,6 @@
     "nconf": "0.12.0",
     "node-jose": "2.1.1",
     "oembed-parser": "1.4.9",
-    "passport": "0.5.2",
-    "passport-google-oauth": "2.0.0",
     "path-match": "1.2.4",
     "probe-image-size": "7.2.3",
     "rss": "1.2.2",
@@ -187,18 +187,19 @@
   },
   "optionalDependencies": {
     "@tryghost/html-to-mobiledoc": "1.8.6",
-    "sqlite3": "5.0.6"
+    "sqlite3": "5.0.8"
   },
   "devDependencies": {
     "@lodder/grunt-postcss": "3.1.1",
-    "@playwright/test": "1.21.1",
+    "@playwright/test": "1.22.2",
     "@tryghost/express-test": "0.10.0",
-    "c8": "7.11.2",
+    "c8": "7.11.3",
+    "cli-progress": "3.11.1",
     "coffeescript": "2.7.0",
-    "cssnano": "5.1.7",
-    "eslint": "8.14.0",
-    "eslint-plugin-ghost": "2.13.0",
-    "grunt": "1.5.2",
+    "cssnano": "5.1.9",
+    "eslint": "8.16.0",
+    "eslint-plugin-ghost": "2.14.0",
+    "grunt": "1.5.3",
     "grunt-bg-shell": "2.3.3",
     "grunt-contrib-clean": "2.0.1",
     "grunt-contrib-compress": "2.0.0",
@@ -209,16 +210,17 @@
     "grunt-shell": "4.0.0",
     "grunt-subgrunt": "1.3.0",
     "grunt-update-submodules": "0.4.1",
-    "jwks-rsa": "2.1.0",
-    "mocha": "9.2.2",
+    "inquirer": "8.2.4",
+    "jwks-rsa": "2.1.3",
+    "mocha": "10.0.0",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "TryGhost/mock-knex#8ecb8c227bf463c991c3d820d33f59efc3ab9682",
     "nock": "13.2.4",
     "papaparse": "5.3.2",
-    "postcss": "8.4.12",
+    "postcss": "8.4.14",
     "rewire": "6.0.0",
     "should": "13.2.3",
-    "sinon": "13.0.2",
+    "sinon": "14.0.0",
     "supertest": "6.2.3",
     "tmp": "0.2.1"
   },