ghost 6.4.0 → 6.5.1

package/core/frontend/web/site.js

@@ -22,8 +22,8 @@ const errorHandler = require('@tryghost/mw-error-handler');
 const mw = require('./middleware');
 
 const STATIC_IMAGE_URL_PREFIX = `/${urlUtils.STATIC_IMAGE_URL_PREFIX}`;
-const STATIC_MEDIA_URL_PREFIX = `/${config.getStaticUrlPrefix('media')}`;
-const STATIC_FILES_URL_PREFIX = `/${config.getStaticUrlPrefix('files')}`;
+const STATIC_MEDIA_URL_PREFIX = `/${urlUtils.STATIC_MEDIA_URL_PREFIX}`;
+const STATIC_FILES_URL_PREFIX = `/${urlUtils.STATIC_FILES_URL_PREFIX}`;
 
 let router;
 

package/core/server/adapters/storage/LocalFilesStorage.js

@@ -1,6 +1,7 @@
 // # Local File System Storage module
 // The (default) module for storing media, using the local file system
 const config = require('../../../shared/config');
+const urlUtils = require('../../../shared/url-utils');
 const LocalStorageBase = require('./LocalStorageBase');
 
 const messages = {
@@ -14,7 +15,7 @@ class LocalFilesStorage extends LocalStorageBase {
         super({
             storagePath: config.getContentPath('files'),
             siteUrl: config.getSiteUrl(),
-            staticFileURLPrefix: config.getStaticUrlPrefix('files'),
+            staticFileURLPrefix: urlUtils.STATIC_FILES_URL_PREFIX,
             errorMessages: messages
         });
     }

package/core/server/adapters/storage/LocalMediaStorage.js

@@ -1,6 +1,7 @@
 // # Local File System Media Storage module
 // The (default) module for storing media, using the local file system
 const config = require('../../../shared/config');
+const urlUtils = require('../../../shared/url-utils');
 const LocalStorageBase = require('./LocalStorageBase');
 
 const messages = {
@@ -13,7 +14,7 @@ class LocalMediaStorage extends LocalStorageBase {
     constructor() {
         super({
             storagePath: config.getContentPath('media'),
-            staticFileURLPrefix: config.getStaticUrlPrefix('media'),
+            staticFileURLPrefix: urlUtils.STATIC_MEDIA_URL_PREFIX,
             siteUrl: config.getSiteUrl(),
             errorMessages: messages
         });

package/core/server/api/endpoints/utils/serializers/output/files.js

@@ -1,7 +1,8 @@
 const config = require('../../../../../../shared/config');
+const urlUtils = require('../../../../../../shared/url-utils');
 
 function getURL(urlPath) {
-    const media = new RegExp('^' + config.getSubdir() + '/' + config.getStaticUrlPrefix('files'));
+    const media = new RegExp('^' + config.getSubdir() + '/' + urlUtils.STATIC_FILES_URL_PREFIX);
     const absolute = media.test(urlPath) ? true : false;
 
     if (absolute) {

package/core/server/api/endpoints/utils/serializers/output/media.js

@@ -1,7 +1,8 @@
 const config = require('../../../../../../shared/config');
+const urlUtils = require('../../../../../../shared/url-utils');
 
 function getURL(urlPath) {
-    const media = new RegExp('^' + config.getSubdir() + '/' + config.getStaticUrlPrefix('media'));
+    const media = new RegExp('^' + config.getSubdir() + '/' + urlUtils.STATIC_MEDIA_URL_PREFIX);
     const absolute = media.test(urlPath) ? true : false;
 
     if (absolute) {

package/core/server/services/lib/magic-link/MagicLink.js

@@ -85,7 +85,7 @@ class MagicLink {
         const url = this.getSigninURL(token, type, options.referrer);
 
         let otc = null;
-        if (this.labsService?.isSet('membersSigninOTC') && options.includeOTC) {
+        if (options.includeOTC) {
             try {
                 otc = await this.getOTCFromToken(token);
             } catch (err) {
@@ -106,7 +106,7 @@ class MagicLink {
         // this if we've successfully generated an OTC to avoid clients showing
         // a token input field when the email doesn't contain an OTC
         let otcRef = null;
-        if (this.labsService?.isSet('membersSigninOTC') && otc) {
+        if (otc) {
             try {
                 otcRef = await this.getRefFromToken(token);
             } catch (err) {

package/core/server/services/members/members-api/controllers/RouterController.js

@@ -665,7 +665,7 @@ module.exports = class RouterController {
             } else {
                 const signIn = await this._handleSignin(req, normalizedEmail, referrer);
 
-                if (this.labsService.isSet('membersSigninOTC') && signIn.otcRef) {
+                if (signIn.otcRef) {
                     res.writeHead(201, {'Content-Type': 'application/json'});
                     return res.end(JSON.stringify({otc_ref: signIn.otcRef}));
                 }
@@ -790,7 +790,7 @@ module.exports = class RouterController {
 
         let includeOTC = false;
 
-        if (this.labsService.isSet('membersSigninOTC') && (reqIncludeOTC === true || reqIncludeOTC === 'true')) {
+        if (reqIncludeOTC === true || reqIncludeOTC === 'true') {
             includeOTC = true;
         }
 

package/core/shared/config/defaults.json

@@ -224,7 +224,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.55"
+        "version": "2.56"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",

package/core/shared/config/helpers.js

@@ -64,25 +64,6 @@ const isPrivacyDisabled = function isPrivacyDisabled(privacyFlag) {
     return this.get('privacy')[privacyFlag] === false;
 };
 
-/**
- * @callback getStaticUrlPrefixFn
- * @param {'images'|'media'|'files'} type
- * @returns {string}
- */
-function getStaticUrlPrefix(type) {
-    switch (type) {
-    case 'images':
-        return 'content/images';
-    case 'media':
-        return 'content/media';
-    case 'files':
-        return 'content/files';
-    default:
-        // eslint-disable-next-line ghost/ghost-custom/no-native-error
-        throw new Error('getStaticUrlPrefix was called with: ' + type);
-    }
-}
-
 /**
  * @callback getContentPathFn
  * @param {string} type - the type of context you want the path for
@@ -120,12 +101,10 @@ const getContentPath = function getContentPath(type) {
  * @typedef ConfigHelpers
  * @property {isPrivacyDisabledFn} isPrivacyDisabled
  * @property {getContentPathFn} getContentPath
- * @property {getStaticUrlPrefixFn} getStaticUrlPrefix
  */
 module.exports.bindAll = (nconf) => {
     nconf.isPrivacyDisabled = isPrivacyDisabled.bind(nconf);
     nconf.getContentPath = getContentPath.bind(nconf);
     nconf.getBackendMountPath = getBackendMountPath.bind(nconf);
     nconf.getFrontendMountPath = getFrontendMountPath.bind(nconf);
-    nconf.getStaticUrlPrefix = getStaticUrlPrefix.bind(nconf);
 };

package/core/shared/labs.js

@@ -47,8 +47,6 @@ const PRIVATE_FEATURES = [
     'lexicalIndicators',
     'contentVisibilityAlpha',
     'emailCustomization',
-    'membersSigninOTC',
-    'membersSigninOTCAlpha',
     'tagsX',
     'utmTracking',
     'emailUniqueid'

package/core/shared/url-utils.js

@@ -2,7 +2,6 @@ const UrlUtils = require('@tryghost/url-utils');
 const config = require('./config');
 
 const BASE_API_PATH = '/ghost/api';
-
 const urlUtils = new UrlUtils({
     getSubdir: config.getSubdir,
     getSiteUrl: config.getSiteUrl,
@@ -14,3 +13,5 @@ const urlUtils = new UrlUtils({
 
 module.exports = urlUtils;
 module.exports.BASE_API_PATH = BASE_API_PATH;
+module.exports.STATIC_MEDIA_URL_PREFIX = 'content/media';
+module.exports.STATIC_FILES_URL_PREFIX = 'content/files';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.4.0",
+  "version": "6.5.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -86,7 +86,7 @@
     "@tryghost/helpers": "1.1.97",
     "@tryghost/html-to-plaintext": "1.0.4",
     "@tryghost/http-cache-utils": "0.1.20",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.4.0.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.5.1.tgz",
     "@tryghost/image-transform": "1.4.6",
     "@tryghost/job-manager": "1.0.3",
     "@tryghost/kg-card-factory": "5.1.2",
@@ -273,7 +273,7 @@
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.4.0.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.5.1.tgz"
   },
   "nx": {
     "targets": {

package/yarn.lock

@@ -32417,6 +32417,11 @@ ts-node@10.9.2:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
+tsconfck@^3.0.3:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-3.1.6.tgz#da1f0b10d82237ac23422374b3fce1edb23c3ead"
+  integrity sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==
+
 tsconfig-paths@^4.1.2, tsconfig-paths@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
@@ -33369,6 +33374,15 @@ vite-plugin-svgr@4.5.0:
     "@svgr/core" "^8.1.0"
     "@svgr/plugin-jsx" "^8.1.0"
 
+vite-tsconfig-paths@5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz#d9a71106a7ff2c1c840c6f1708042f76a9212ed4"
+  integrity sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==
+  dependencies:
+    debug "^4.1.1"
+    globrex "^0.1.2"
+    tsconfck "^3.0.3"
+
 vite@5.4.20, vite@^5.0.0:
   version "5.4.20"
   resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.20.tgz#3267a5e03f21212f44edfd72758138e8fcecd76a"