ghost 4.15.0 → 4.17.1

package/core/server/web/shared/middlewares/custom-redirects.js

@@ -5,92 +5,115 @@ const debug = require('@tryghost/debug')('web:shared:mw:custom-redirects');
 const config = require('../../../../shared/config');
 const urlUtils = require('../../../../shared/url-utils');
 const errors = require('@tryghost/errors');
-const i18n = require('../../../../shared/i18n');
 const logging = require('@tryghost/logging');
-const redirectsService = require('../../../../frontend/services/redirects');
+const redirectsService = require('../../../services/redirects');
+const labsService = require('../../../../shared/labs');
+
+const messages = {
+    customRedirectsRegistrationFailure: 'Could not register custom redirects.'
+};
 
 const _private = {};
 
 let customRedirectsRouter;
 
-_private.registerRoutes = () => {
+/**
+ *
+ * @param {Object} router instance of Express Router to decorate with redirects
+ * @param {Object} redirects valid redirects JSON
+ *
+ * @returns {Object} instance of express.Router express router handling redirects based on config
+ */
+_private.registerRoutes = (router, redirects) => {
     debug('redirects loading');
 
-    customRedirectsRouter = express.Router('redirects');
+    if (labsService.isSet('offers')) {
+        redirects.unshift({
+            from: '/zimo50',
+            to: '/#/portal/offers/abcdefuckoff'
+        });
+    }
 
-    try {
-        const redirects = redirectsService.settings.loadRedirectsFile();
+    redirects.forEach((redirect) => {
+        /**
+         * Detect case insensitive modifier when regex is enclosed by
+         * / ... /i
+         */
+        let options = '';
+        if (redirect.from.match(/^\/.*\/i$/)) {
+            redirect.from = redirect.from.slice(1, -2);
+            options = 'i';
+        }
 
-        redirectsService.validation.validate(redirects);
+        /**
+         * always delete trailing slashes, doesn't matter if regex or not
+         * Example:
+         *   - you define /my-blog-post-1/ as from property
+         *   - /my-blog-post-1 or /my-blog-post-1/ should work
+         */
 
-        redirects.forEach((redirect) => {
-            /**
-             * Detect case insensitive modifier when regex is enclosed by
-             * / ... /i
-             */
-            let options = '';
-            if (redirect.from.match(/^\/.*\/i$/)) {
-                redirect.from = redirect.from.slice(1, -2);
-                options = 'i';
-            }
+        if (redirect.from.match(/\/$/)) {
+            redirect.from = redirect.from.slice(0, -1);
+        }
 
-            /**
-             * always delete trailing slashes, doesn't matter if regex or not
-             * Example:
-             *   - you define /my-blog-post-1/ as from property
-             *   - /my-blog-post-1 or /my-blog-post-1/ should work
-             */
+        if (redirect.from[redirect.from.length - 1] !== '$') {
+            redirect.from += '/?$';
+        }
 
-            if (redirect.from.match(/\/$/)) {
-                redirect.from = redirect.from.slice(0, -1);
-            }
+        debug('register', redirect.from);
+        router.get(new RegExp(redirect.from, options), function (req, res) {
+            const maxAge = redirect.permanent ? config.get('caching:customRedirects:maxAge') : 0;
+            const toURL = url.parse(redirect.to);
+            const toURLParams = querystring.parse(toURL.query);
+            const currentURL = url.parse(req.url);
+            const currentURLParams = querystring.parse(currentURL.query);
+            const params = Object.assign({}, currentURLParams, toURLParams);
+            const search = querystring.stringify(params);
 
-            if (redirect.from[redirect.from.length - 1] !== '$') {
-                redirect.from += '/?$';
+            toURL.pathname = currentURL.pathname.replace(new RegExp(redirect.from, options), toURL.pathname);
+            toURL.search = search !== '' ? `?${search}` : null;
+
+            /**
+             * Only if the URL is internal should we prepend the Ghost subdirectory
+             * @see https://github.com/TryGhost/Ghost/issues/10776
+             */
+            if (!toURL.hostname) {
+                toURL.pathname = urlUtils.urlJoin(urlUtils.getSubdir(), toURL.pathname);
             }
 
-            debug('register', redirect.from);
-            customRedirectsRouter.get(new RegExp(redirect.from, options), function (req, res) {
-                const maxAge = redirect.permanent ? config.get('caching:customRedirects:maxAge') : 0;
-                const toURL = url.parse(redirect.to);
-                const toURLParams = querystring.parse(toURL.query);
-                const currentURL = url.parse(req.url);
-                const currentURLParams = querystring.parse(currentURL.query);
-                const params = Object.assign({}, currentURLParams, toURLParams);
-                const search = querystring.stringify(params);
-
-                toURL.pathname = currentURL.pathname.replace(new RegExp(redirect.from, options), toURL.pathname);
-                toURL.search = search !== '' ? `?${search}` : null;
-
-                /**
-                 * Only if the URL is internal should we prepend the Ghost subdirectory
-                 * @see https://github.com/TryGhost/Ghost/issues/10776
-                 */
-                if (!toURL.hostname) {
-                    toURL.pathname = urlUtils.urlJoin(urlUtils.getSubdir(), toURL.pathname);
-                }
-
-                res.set({
-                    'Cache-Control': `public, max-age=${maxAge}`
-                });
-
-                res.redirect(redirect.permanent ? 301 : 302, url.format(toURL));
+            res.set({
+                'Cache-Control': `public, max-age=${maxAge}`
             });
+
+            res.redirect(redirect.permanent ? 301 : 302, url.format(toURL));
         });
+    });
+
+    debug('redirects loaded');
+
+    return router;
+};
+
+const loadRoutes = () => {
+    try {
+        customRedirectsRouter = express.Router('redirects');
+
+        const redirects = redirectsService.loadRedirectsFile();
+        redirectsService.validate(redirects);
+
+        _private.registerRoutes(customRedirectsRouter, redirects);
     } catch (err) {
         if (errors.utils.isIgnitionError(err)) {
             logging.error(err);
         } else {
             logging.error(new errors.IncorrectUsageError({
-                message: i18n.t('errors.middleware.redirects.register'),
+                message: messages.customRedirectsRegistrationFailure,
                 context: err.message,
                 help: 'https://ghost.org/docs/themes/routing/#redirects',
                 err
             }));
         }
     }
-
-    debug('redirects loaded');
 };
 
 /**
@@ -99,7 +122,7 @@ _private.registerRoutes = () => {
  * - file loads synchronously, because we need to register the routes before anything else
  */
 exports.use = function use(siteApp) {
-    _private.registerRoutes();
+    loadRoutes();
 
     // Recommended approach by express, see https://github.com/expressjs/express/issues/2596#issuecomment-81353034.
     // As soon as the express router get's re-instantiated, the old router instance is not used anymore.
@@ -109,5 +132,5 @@ exports.use = function use(siteApp) {
 };
 
 exports.reload = function reload() {
-    _private.registerRoutes();
+    loadRoutes();
 };

package/core/server/web/site/routes.js

@@ -1,9 +1,9 @@
 const debug = require('@tryghost/debug')('routing');
 const routing = require('../../../frontend/services/routing');
-const frontendSettings = require('../../../frontend/services/settings');
+const routeSettings = require('../../services/route-settings');
 
 module.exports = function siteRoutes(options = {}) {
     debug('site Routes', options);
-    options.routerSettings = frontendSettings.get('routes');
+    options.routerSettings = routeSettings.loadRouteSettingsSync();
     return routing.bootstrap.init(options);
 };

package/core/shared/config/defaults.json

@@ -121,7 +121,7 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~1.9.0/umd/portal.min.js",
-        "version": "1.9"
+        "url": "https://unpkg.com/@tryghost/portal@~1.11.0/umd/portal.min.js",
+        "version": "1.11"
     }
 }

package/core/shared/config/overrides.json

@@ -6,7 +6,7 @@
         "helperTemplates": "core/frontend/helpers/tpl/",
         "adminViews": "core/server/web/admin/views/",
         "defaultViews": "core/server/views/",
-        "defaultSettings": "core/frontend/services/settings/",
+        "defaultSettings": "core/server/services/route-settings/",
         "internalAppPath": "core/frontend/apps/",
         "internalAdaptersPath": "core/server/adapters/",
         "migrationPath": "core/server/data/migrations",

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

@@ -0,0 +1,3 @@
+const {Cache: CustomThemeSettingsCache} = require('@tryghost/custom-theme-settings-service');
+
+module.exports = new CustomThemeSettingsCache();

package/core/shared/i18n/translations/en.json

@@ -106,8 +106,7 @@
             },
             "images": {
                 "invalidDimensions": "Could not fetch image dimensions."
-            },
-            "redirectsWrongFormat": "Incorrect redirects file format."
+            }
         },
         "config": {
             "couldNotLocateConfigFile": {
@@ -157,8 +156,7 @@
             "maintenance": "Site is currently undergoing maintenance, please wait a moment then retry.",
             "maintenanceUrlService": "Site is starting up, please wait a moment then retry.",
             "requiredOnFuture": "This will be required in future. Please see {link}",
-            "internalError": "Something went wrong.",
-            "jsonParse": "Could not parse JSON: {context}."
+            "internalError": "Something went wrong."
         },
         "mail": {
             "incompleteMessageData": {
@@ -539,15 +537,6 @@
             }
         },
         "services": {
-            "settings": {
-                "yaml": {
-                    "error": "Could not parse {file}: {context}.",
-                    "help": "Check your {file} file for typos and fix the named issues.",
-                    "validate": "The following definition \"{at}\" is invalid: {reason}"
-                },
-                "loader": "Error trying to load YAML setting for {setting} from '{path}'.",
-                "ensureSettings": "Error trying to access settings files in {path}."
-            },
             "mega": {
                 "requestFailed": {
                     "error": "The email service was unable to send an email batch."

package/core/shared/labs.js

@@ -24,10 +24,10 @@ const BETA_FEATURES = [
 
 const ALPHA_FEATURES = [
     'oauthLogin',
-    'membersFiltering',
     'emailOnlyPosts',
     'customThemeSettings',
-    'membersActivity'
+    'membersActivity',
+    'offers'
 ];
 
 module.exports.WRITABLE_KEYS_ALLOWLIST = [...BETA_FEATURES, ...ALPHA_FEATURES];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.15.0",
+  "version": "4.17.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -51,50 +51,51 @@
   },
   "dependencies": {
     "@nexes/nql": "0.6.0",
-    "@sentry/node": "6.12.0",
-    "@tryghost/adapter-manager": "0.2.14",
+    "@sentry/node": "6.13.2",
+    "@tryghost/adapter-manager": "0.2.16",
     "@tryghost/admin-api-schema": "2.6.0",
     "@tryghost/bookshelf-plugins": "0.3.1",
-    "@tryghost/bootstrap-socket": "0.2.9",
+    "@tryghost/bootstrap-socket": "0.2.11",
     "@tryghost/color-utils": "0.1.2",
-    "@tryghost/config-url-helpers": "0.1.0",
-    "@tryghost/constants": "0.1.8",
+    "@tryghost/config-url-helpers": "0.1.2",
+    "@tryghost/constants": "0.1.10",
+    "@tryghost/custom-theme-settings-service": "0.0.5",
     "@tryghost/debug": "0.1.5",
-    "@tryghost/email-analytics-provider-mailgun": "1.0.0",
-    "@tryghost/email-analytics-service": "1.0.0",
-    "@tryghost/errors": "0.2.13",
+    "@tryghost/email-analytics-provider-mailgun": "1.0.2",
+    "@tryghost/email-analytics-service": "1.0.2",
+    "@tryghost/errors": "0.2.15",
     "@tryghost/helpers": "1.1.52",
-    "@tryghost/image-transform": "1.0.13",
-    "@tryghost/job-manager": "0.8.7",
+    "@tryghost/image-transform": "1.0.15",
+    "@tryghost/job-manager": "0.8.9",
     "@tryghost/kg-card-factory": "3.0.4",
     "@tryghost/kg-default-atoms": "3.0.0",
     "@tryghost/kg-default-cards": "5.0.7",
     "@tryghost/kg-markdown-html-renderer": "5.0.5",
     "@tryghost/kg-mobiledoc-html-renderer": "5.1.1",
-    "@tryghost/limit-service": "0.6.1",
+    "@tryghost/limit-service": "0.6.3",
     "@tryghost/logging": "0.1.7",
-    "@tryghost/magic-link": "1.0.11",
-    "@tryghost/members-api": "1.32.1",
-    "@tryghost/members-csv": "1.1.6",
-    "@tryghost/members-importer": "0.3.2",
-    "@tryghost/members-ssr": "1.0.12",
-    "@tryghost/mw-session-from-token": "0.1.22",
-    "@tryghost/nodemailer": "0.3.1",
-    "@tryghost/package-json": "1.0.2",
-    "@tryghost/promise": "0.1.9",
+    "@tryghost/magic-link": "1.0.13",
+    "@tryghost/members-api": "1.39.1",
+    "@tryghost/members-csv": "1.1.7",
+    "@tryghost/members-importer": "0.3.3",
+    "@tryghost/members-ssr": "1.0.14",
+    "@tryghost/mw-session-from-token": "0.1.24",
+    "@tryghost/nodemailer": "0.3.3",
+    "@tryghost/package-json": "1.0.4",
+    "@tryghost/promise": "0.1.11",
     "@tryghost/request": "0.1.5",
     "@tryghost/root-utils": "0.3.4",
-    "@tryghost/security": "0.2.9",
-    "@tryghost/session-service": "0.1.24",
+    "@tryghost/security": "0.2.11",
+    "@tryghost/session-service": "0.1.26",
     "@tryghost/social-urls": "0.1.26",
     "@tryghost/string": "0.1.20",
-    "@tryghost/tpl": "0.1.3",
-    "@tryghost/update-check-service": "0.2.0",
+    "@tryghost/tpl": "0.1.5",
+    "@tryghost/update-check-service": "0.2.2",
     "@tryghost/url-utils": "2.0.2",
     "@tryghost/validator": "0.1.5",
     "@tryghost/version": "0.1.4",
-    "@tryghost/vhost-middleware": "1.0.15",
-    "@tryghost/zip": "1.1.14",
+    "@tryghost/vhost-middleware": "1.0.17",
+    "@tryghost/zip": "1.1.16",
     "amperize": "0.6.1",
     "analytics-node": "5.1.0",
     "bluebird": "3.7.2",
@@ -118,9 +119,9 @@
     "express-session": "1.17.2",
     "fs-extra": "10.0.0",
     "ghost-storage-base": "0.0.6",
-    "glob": "7.1.7",
+    "glob": "7.2.0",
     "got": "9.6.0",
-    "gscan": "4.2.1",
+    "gscan": "4.3.1",
     "html-to-text": "5.1.1",
     "image-size": "1.0.0",
     "intl": "1.2.5",
@@ -134,15 +135,15 @@
     "knex-migrator": "4.0.4",
     "lodash": "4.17.21",
     "mailgun-js": "0.22.0",
-    "metascraper": "5.24.6",
-    "metascraper-author": "5.24.6",
-    "metascraper-description": "5.24.6",
-    "metascraper-image": "5.24.6",
-    "metascraper-logo": "5.24.6",
-    "metascraper-logo-favicon": "5.24.6",
-    "metascraper-publisher": "5.24.6",
-    "metascraper-title": "5.24.6",
-    "metascraper-url": "5.24.6",
+    "metascraper": "5.24.7",
+    "metascraper-author": "5.24.7",
+    "metascraper-description": "5.24.7",
+    "metascraper-image": "5.24.7",
+    "metascraper-logo": "5.24.7",
+    "metascraper-logo-favicon": "5.24.7",
+    "metascraper-publisher": "5.24.7",
+    "metascraper-title": "5.24.7",
+    "metascraper-url": "5.24.7",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23",
     "multer": "1.4.3",
@@ -169,7 +170,7 @@
   "devDependencies": {
     "@lodder/grunt-postcss": "3.0.1",
     "c8": "7.9.0",
-    "coffeescript": "2.5.1",
+    "coffeescript": "2.6.0",
     "cssnano": "5.0.8",
     "eslint": "7.32.0",
     "eslint-plugin-ghost": "2.6.0",
@@ -185,12 +186,12 @@
     "grunt-subgrunt": "1.3.0",
     "grunt-update-submodules": "0.4.1",
     "jwks-rsa": "2.0.4",
-    "mocha": "9.1.1",
+    "mocha": "9.1.2",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "0.4.10",
     "nock": "13.1.3",
     "papaparse": "5.3.1",
-    "postcss": "8.3.6",
+    "postcss": "8.3.8",
     "rewire": "5.0.0",
     "should": "13.2.3",
     "sinon": "11.1.2",