ghost 6.8.1 → 6.9.1

package/core/shared/config/defaults.json

@@ -218,6 +218,7 @@
     "enableTipsAndDonations": true,
     "emailAnalytics": {
         "enabled": true,
+        "batchProcessing": false,
         "metrics": {
             "openThroughput": {
                 "enabled": false,
@@ -302,5 +303,5 @@
         "captureLinkClickBadMemberUuid": false
     },
     "disableJSBackups": false,
-    "memberWelcomeEmailTestInbox" : ""
+    "memberWelcomeEmailTestInbox": ""
 }

package/core/shared/config/helpers.js

@@ -97,6 +97,18 @@ const getContentPath = function getContentPath(type) {
     }
 };
 
+/**
+ * Get the path to admin assets, switching between Ember and React admin based on USE_REACT_SHELL env var
+ * @returns {string}
+ */
+const getAdminAssetsPath = function getAdminAssetsPath() {
+    const useReactShell = process.env.USE_REACT_SHELL === 'true';
+    if (useReactShell) {
+        return path.join(this.get('paths:appRoot'), '../../apps/admin/dist');
+    }
+    return this.get('paths:adminAssets');
+};
+
 /**
  * @typedef ConfigHelpers
  * @property {isPrivacyDisabledFn} isPrivacyDisabled
@@ -105,6 +117,7 @@ const getContentPath = function getContentPath(type) {
 module.exports.bindAll = (nconf) => {
     nconf.isPrivacyDisabled = isPrivacyDisabled.bind(nconf);
     nconf.getContentPath = getContentPath.bind(nconf);
+    nconf.getAdminAssetsPath = getAdminAssetsPath.bind(nconf);
     nconf.getBackendMountPath = getBackendMountPath.bind(nconf);
     nconf.getFrontendMountPath = getFrontendMountPath.bind(nconf);
 };

package/core/shared/url-utils.js

@@ -6,6 +6,10 @@ const urlUtils = new UrlUtils({
     getSubdir: config.getSubdir,
     getSiteUrl: config.getSiteUrl,
     getAdminUrl: config.getAdminUrl,
+    assetBaseUrls: {
+        media: config.get('urls:media'),
+        files: config.get('urls:files')
+    },
     slugs: config.get('slugs').protected,
     redirectCacheMaxAge: config.get('caching:301:maxAge'),
     baseApiPath: BASE_API_PATH
@@ -13,5 +17,3 @@ 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.8.1",
+  "version": "6.9.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -87,14 +87,14 @@
     "@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.8.1.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.9.1.tgz",
     "@tryghost/image-transform": "1.4.6",
     "@tryghost/job-manager": "1.0.3",
     "@tryghost/kg-card-factory": "5.1.2",
     "@tryghost/kg-clean-basic-html": "4.2.7",
     "@tryghost/kg-converters": "1.1.7",
     "@tryghost/kg-default-atoms": "5.1.1",
-    "@tryghost/kg-default-cards": "10.1.5",
+    "@tryghost/kg-default-cards": "10.2.0",
     "@tryghost/kg-default-nodes": "2.0.1",
     "@tryghost/kg-default-transforms": "1.2.24",
     "@tryghost/kg-html-to-lexical": "1.2.24",
@@ -119,7 +119,7 @@
     "@tryghost/social-urls": "0.1.54",
     "@tryghost/string": "0.2.17",
     "@tryghost/tpl": "0.1.35",
-    "@tryghost/url-utils": "4.4.15",
+    "@tryghost/url-utils": "4.5.0",
     "@tryghost/validator": "0.2.17",
     "@tryghost/version": "0.1.33",
     "@tryghost/zip": "1.1.49",
@@ -274,7 +274,7 @@
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.8.1.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.9.1.tgz"
   },
   "nx": {
     "targets": {