ghost 6.0.3 → 6.0.5

package/core/server/services/koenig/node-renderers/header-v2-renderer.js

@@ -68,6 +68,73 @@ function cardTemplate(nodeData, options = {}) {
         `;
 }
 
+function generateMSOSplitHeaderImage(nodeData) {
+    const {backgroundSize, backgroundImageSrc, backgroundColor} = nodeData;
+
+    if (backgroundSize === 'contain') {
+        return `
+            <!--[if mso]>
+                <v:rect xmlns:v="urn:schemas-microsoft-com:vml" stroke="false" style="width:600px;height:320px;">
+                    <v:fill type="frame" aspect="atmost" size="225pt,120pt" src="${backgroundImageSrc}" color="${backgroundColor}" />
+                    <v:textbox inset="0,0,0,0">
+                    </v:textbox>
+                </v:rect>
+            <![endif]-->
+            `;
+    } else {
+        return `
+            <!--[if mso]>
+                <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:600px;height:320px;">
+                    <v:fill type="frame" aspect="atleast" src="${backgroundImageSrc}" color="${backgroundColor}" />
+                    <v:textbox inset="0,0,0,0">
+                    </v:textbox>
+                </v:rect>
+            <![endif]-->
+            `;
+    }
+}
+
+function generateMSOContentWrapper(nodeData) {
+    const {backgroundImageSrc, backgroundColor} = nodeData;
+    const hasContainAndSplit = nodeData.backgroundSize === 'contain' && nodeData.layout === 'split';
+    const hasImageWithoutSplit = nodeData.backgroundImageSrc && nodeData.layout !== 'split';
+
+    // Outlook clients will return the first td, all other clients will return the second td
+    const msoOpenTag = `
+                    <!--[if mso]>
+                        <td class="kg-header-card-content" style="${hasImageWithoutSplit ? 'padding: 0;' : 'padding: 40px;'}${hasContainAndSplit ? 'padding-top: 0;' : ''}">
+                    <![endif]-->
+                    <!--[if !mso]><!-->
+                        <td class="kg-header-card-content" style="${hasContainAndSplit ? 'padding-top: 0;' : ''}">
+                    <!--<![endif]-->
+                    `;
+
+    const msoImageVML = hasImageWithoutSplit ? `
+                    <!--[if mso]>
+                        <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:600px;">
+                            <v:fill src="${backgroundImageSrc}" color="${backgroundColor}" type="frame" aspect="atleast" focusposition="0.5,0.5" />
+                            <v:textbox inset="30pt,30pt,30pt,30pt" style="mso-fit-shape-to-text:true;">
+                    <![endif]-->
+                    ` : '';
+
+    return msoOpenTag + msoImageVML;
+}
+
+function generateMSOContentClosing(nodeData) {
+    const hasImageWithoutSplit = nodeData.backgroundImageSrc && nodeData.layout !== 'split';
+
+    if (!hasImageWithoutSplit) {
+        return '';
+    }
+
+    return `
+        <!--[if mso]>
+            </v:textbox>
+        </v:rect>
+        <![endif]-->
+        `;
+}
+
 function emailTemplate(nodeData, options) {
     const backgroundAccent = nodeData.backgroundColor === 'accent' ? `background-color: ${nodeData.accentColor};` : '';
     const alignment = nodeData.alignment === 'center' ? 'text-align: center;' : '';
@@ -88,17 +155,19 @@ function emailTemplate(nodeData, options) {
 
     return (
         `
-        <div class="kg-header-card kg-v2${hasDarkBg ? ' kg-header-card-dark-bg' : 'kg-header-card-light-bg'}" style="color:${nodeData.textColor}; ${alignment} ${backgroundImageStyle} ${backgroundAccent}">
+        <div class="kg-header-card kg-v2 ${hasDarkBg ? 'kg-header-card-dark-bg' : 'kg-header-card-light-bg'}" style="color:${nodeData.textColor}; ${alignment} ${backgroundImageStyle} ${backgroundAccent}">
             ${nodeData.layout === 'split' && nodeData.backgroundImageSrc ? `
                 <table border="0" cellpadding="0" cellspacing="0" width="100%">
                     <tr>
-                        <td background="${nodeData.backgroundImageSrc}" style="${splitImageStyle}" class="kg-header-card-image"></td>
+                        <td background="${nodeData.backgroundImageSrc}" style="${splitImageStyle}" class="kg-header-card-image" bgcolor="${nodeData.backgroundColor}" align="center">
+                            ${generateMSOSplitHeaderImage(nodeData) /* mso-only img, no shared markup */}
+                        </td>
                     </tr>
                 </table>
             ` : ''}
             <table border="0" cellpadding="0" cellspacing="0" width="100%" style="color:${nodeData.textColor}; ${alignment} ${backgroundImageStyle} ${backgroundAccent}">
                 <tr>
-                    <td class="kg-header-card-content" style="${nodeData.layout === 'split' && nodeData.backgroundSize === 'contain' ? 'padding-top: 0;' : ''}">
+                    ${generateMSOContentWrapper(nodeData) /* creates correct opening td tag for any platform */}
                         <table border="0" cellpadding="0" cellspacing="0" width="100%">
                             <tr>
                                 <td align="${nodeData.alignment}">
@@ -118,6 +187,7 @@ function emailTemplate(nodeData, options) {
                                 ` : ''}
                             </tr>
                         </table>
+                ${generateMSOContentClosing(nodeData) /* mso-only closing tags, no shared markup */}
                     </td>
                 </tr>
             </table>
@@ -209,4 +279,4 @@ function getCardClasses(nodeData) {
     return cardClasses;
 }
 
-module.exports = renderHeaderNodeV2;
+module.exports = renderHeaderNodeV2;

package/core/shared/config/defaults.json

@@ -212,7 +212,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.51"
+        "version": "2.52"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",
@@ -229,7 +229,7 @@
     },
     "signupForm": {
         "url": "https://cdn.jsdelivr.net/ghost/signup-form@~{version}/umd/signup-form.min.js",
-        "version": "0.2"
+        "version": "0.3"
     },
     "tenor": {
         "googleApiKey": null,

package/core/shared/labs.js

@@ -46,7 +46,8 @@ const PRIVATE_FEATURES = [
     'urlCache',
     'lexicalIndicators',
     'contentVisibilityAlpha',
-    'emailCustomization'
+    'emailCustomization',
+    'membersSigninOTC'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/ghost.js

@@ -17,7 +17,6 @@ switch (mode) {
 case 'repl':
 case 'timetravel':
 case 'generate-data':
-case 'record-test':
     require('./core/cli/command').run(mode);
     break;
 default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.0.3",
+  "version": "6.0.5",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -70,7 +70,7 @@
     "@faker-js/faker": "7.6.0",
     "@isaacs/ttlcache": "1.4.1",
     "@sentry/node": "7.120.4",
-    "@slack/webhook": "7.0.5",
+    "@slack/webhook": "7.0.6",
     "@tryghost/adapter-base-cache": "0.1.17",
     "@tryghost/admin-api-schema": "4.5.10",
     "@tryghost/api-framework": "1.0.2",
@@ -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.0.3.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.5.tgz",
     "@tryghost/image-transform": "1.4.6",
     "@tryghost/job-manager": "1.0.3",
     "@tryghost/kg-card-factory": "5.1.2",
@@ -161,12 +161,12 @@
     "ghost-storage-base": "1.0.0",
     "glob": "8.1.0",
     "got": "11.8.6",
-    "gscan": "5.0.0",
+    "gscan": "5.1.0",
     "handlebars": "4.7.8",
     "heic-convert": "2.1.0",
     "html-to-text": "5.1.1",
     "html5parser": "2.0.2",
-    "human-number": "2.0.4",
+    "human-number": "2.0.5",
     "iconv-lite": "0.6.3",
     "image-size": "1.2.1",
     "intl": "1.2.5",
@@ -216,7 +216,7 @@
     "superagent-throttle": "1.0.1",
     "terser": "5.43.1",
     "tiny-glob": "0.2.9",
-    "ua-parser-js": "1.0.40",
+    "ua-parser-js": "1.0.41",
     "xml": "1.0.1"
   },
   "optionalDependencies": {
@@ -232,9 +232,9 @@
     "@types/bookshelf": "1.2.9",
     "@types/common-tags": "1.8.4",
     "@types/jsonwebtoken": "9.0.10",
-    "@types/node": "22.17.1",
+    "@types/node": "22.17.2",
     "@types/node-jose": "1.1.13",
-    "@types/nodemailer": "6.4.17",
+    "@types/nodemailer": "6.4.19",
     "@types/sinon": "17.0.4",
     "@types/supertest": "6.0.3",
     "c8": "10.1.3",
@@ -273,7 +273,7 @@
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.3.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.5.tgz"
   },
   "nx": {
     "targets": {