[pull] main from TryGhost:main

.github/workflows/ci.yml

@@ -21,7 +21,6 @@ env:
     ${{ github.workspace }}/ghost/*/node_modules
     ${{ github.workspace }}/e2e/node_modules
     ~/.cache/ms-playwright/
-  NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
   NODE_VERSION: 22.18.0
   # Disable v8-compile-cache to prevent intermittent V8 deserializer crashes
   # when multiple parallel Nx workers race to read/write shared bytecode cache
@@ -31,7 +30,7 @@ env:
   DISABLE_V8_COMPILE_CACHE: 1
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: ${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -164,17 +163,6 @@ jobs:
           echo "dep-cache" >> "$GITHUB_ENV"
           echo "$EOF" >> "$GITHUB_ENV"
 
-      - name: Nx cache
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
-        id: cache_nx
-        with:
-          path: .nxcache
-          key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }}
-          restore-keys: |
-            nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }}
-            nx-Linux-${{ github.ref }}
-            nx-Linux
-
       - name: Check dependency cache
         uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
         id: cache_dependencies
@@ -450,9 +438,6 @@ jobs:
         env:
           DEPENDENCY_CACHE_KEY: ${{ needs.job_setup.outputs.dependency_cache_key }}
 
-      - name: Build TS packages
-        run: yarn nx run-many -t build --exclude=ghost-admin
-
       - name: Set timezone (non-UTC)
         uses: szenius/set-timezone@1f9716b0f7120e344f0c62bb7b1ee98819aefd42 # v2.0
         with:
@@ -470,12 +455,10 @@ jobs:
           echo "database__connection__password=root" >> $GITHUB_ENV
 
       - name: E2E tests
-        working-directory: ghost/core
-        run: yarn test:ci:e2e
+        run: yarn nx run ghost:test:ci:e2e
 
       - name: Integration tests
-        working-directory: ghost/core
-        run: yarn test:ci:integration
+        run: yarn nx run ghost:test:ci:integration
 
       - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
         if: matrix.node == env.NODE_VERSION && contains(matrix.env.DB, 'mysql')
@@ -540,9 +523,6 @@ jobs:
         env:
           DEPENDENCY_CACHE_KEY: ${{ needs.job_setup.outputs.dependency_cache_key }}
 
-      - name: Build TS packages
-        run: yarn nx run-many -t build --exclude=ghost-admin
-
       - name: Set env vars (SQLite)
         if: contains(matrix.env.DB, 'sqlite')
         run: echo "database__connection__filename=/dev/shm/ghost-test.db" >> $GITHUB_ENV
@@ -555,8 +535,7 @@ jobs:
           echo "database__connection__password=root" >> $GITHUB_ENV
 
       - name: Legacy tests
-        working-directory: ghost/core
-        run: yarn test:ci:legacy
+        run: yarn nx run ghost:test:ci:legacy
 
       - uses: tryghost/actions/actions/slack-build@0cbdcbeb9030f46b109d5e6e44c14933026d8ca5 # main
         if: failure() && github.event_name == 'push' && github.ref == 'refs/heads/main'

apps/activitypub/package.json

@@ -29,7 +29,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@playwright/test": "1.58.2",
+    "@playwright/test": "1.59.1",
     "@testing-library/react": "14.3.1",
     "@types/dompurify": "3.2.0",
     "@types/jest": "29.5.14",

apps/admin-x-design-system/package.json

@@ -48,14 +48,14 @@
         "eslint-plugin-react-refresh": "0.4.24",
         "eslint-plugin-tailwindcss": "4.0.0-beta.0",
         "jsdom": "28.1.0",
-        "lodash-es": "4.17.21",
+        "lodash-es": "4.17.23",
         "postcss": "8.5.6",
         "postcss-import": "16.1.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
         "rollup-plugin-node-builtins": "2.1.2",
         "sinon": "18.0.1",
-        "storybook": "8.6.14",
+        "storybook": "8.6.15",
         "tailwindcss": "4.2.1",
         "typescript": "5.9.3",
         "validator": "13.12.0",

apps/admin-x-settings/package.json

@@ -40,22 +40,22 @@
   },
   "dependencies": {
     "@codemirror/lang-html": "6.4.11",
-    "@tryghost/color-utils": "0.2.10",
+    "@tryghost/color-utils": "0.2.16",
     "@tryghost/i18n": "0.0.0",
     "@tryghost/kg-unsplash-selector": "0.3.24",
-    "@tryghost/limit-service": "1.4.1",
+    "@tryghost/limit-service": "1.5.2",
     "@tryghost/nql": "0.12.10",
-    "@tryghost/timezone-data": "0.4.12",
+    "@tryghost/timezone-data": "0.4.18",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "validator": "13.12.0"
   },
   "devDependencies": {
-    "@playwright/test": "1.58.2",
+    "@playwright/test": "1.59.1",
     "@testing-library/react": "14.3.1",
     "@tryghost/admin-x-design-system": "0.0.0",
     "@tryghost/admin-x-framework": "0.0.0",
-    "@tryghost/custom-fonts": "1.0.2",
+    "@tryghost/custom-fonts": "1.0.8",
     "@tryghost/shade": "0.0.0",
     "@types/react": "18.3.28",
     "@types/react-dom": "18.3.7",

apps/admin/package.json

@@ -34,7 +34,7 @@
     "eslint-plugin-react-hooks": "5.2.0",
     "eslint-plugin-react-refresh": "0.4.24",
     "eslint-plugin-tailwindcss": "4.0.0-beta.0",
-    "globals": "16.5.0",
+    "globals": "17.4.0",
     "jest-extended": "6.0.0",
     "jsdom": "28.1.0",
     "sirv": "3.0.2",

apps/announcement-bar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/announcement-bar",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",
@@ -14,7 +14,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tryghost/content-api": "1.12.0",
+    "@tryghost/content-api": "1.12.6",
     "react": "17.0.2",
     "react-dom": "17.0.2"
   },

apps/comments-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/comments-ui",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",
@@ -60,7 +60,7 @@
     "react-string-replace": "1.1.1"
   },
   "devDependencies": {
-    "@playwright/test": "1.58.2",
+    "@playwright/test": "1.59.1",
     "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "12.1.5",
     "@testing-library/user-event": "14.6.1",

apps/shade/package.json

@@ -92,7 +92,7 @@
         "eslint-plugin-storybook": "10.3.3",
         "eslint-plugin-tailwindcss": "4.0.0-beta.0",
         "jsdom": "28.1.0",
-        "lodash-es": "4.17.21",
+        "lodash-es": "4.17.23",
         "postcss": "8.5.6",
         "rollup-plugin-node-builtins": "2.1.2",
         "sinon": "18.0.1",

apps/signup-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/signup-form",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",
@@ -35,7 +35,7 @@
     "react-dom": "18.3.1"
   },
   "devDependencies": {
-    "@playwright/test": "1.58.2",
+    "@playwright/test": "1.59.1",
     "@storybook/addon-essentials": "8.6.14",
     "@storybook/addon-interactions": "8.6.14",
     "@storybook/addon-links": "8.6.14",
@@ -59,7 +59,7 @@
     "postcss-import": "16.1.1",
     "prop-types": "15.8.1",
     "rollup-plugin-node-builtins": "2.1.2",
-    "storybook": "8.6.14",
+    "storybook": "8.6.15",
     "stylelint": "15.11.0",
     "tailwindcss": "3.4.18",
     "vite": "5.4.21",

apps/stats/package.json

@@ -34,7 +34,7 @@
     },
     "devDependencies": {
         "@faker-js/faker": "9.9.0",
-        "@playwright/test": "1.58.2",
+        "@playwright/test": "1.59.1",
         "@tanstack/react-query": "4.36.1",
         "@testing-library/jest-dom": "5.17.0",
         "@testing-library/react": "14.3.1",

e2e/package.json

@@ -31,7 +31,7 @@
   "devDependencies": {
     "@eslint/js": "9.37.0",
     "@faker-js/faker": "8.4.1",
-    "@playwright/test": "1.58.2",
+    "@playwright/test": "1.59.1",
     "@tryghost/debug": "0.1.40",
     "@tryghost/logging": "2.5.5",
     "@types/dockerode": "3.3.47",

ghost/admin/package.json

@@ -45,18 +45,18 @@
     "@sentry/integrations": "7.114.0",
     "@sentry/replay": "7.116.0",
     "@tryghost/admin-x-framework": "0.0.0",
-    "@tryghost/color-utils": "0.2.10",
+    "@tryghost/color-utils": "0.2.16",
     "@tryghost/ember-promise-modals": "2.0.1",
-    "@tryghost/helpers": "1.1.97",
+    "@tryghost/helpers": "1.1.103",
     "@tryghost/kg-clean-basic-html": "4.2.21",
     "@tryghost/kg-converters": "1.1.20",
     "@tryghost/koenig-lexical": "1.7.28",
-    "@tryghost/limit-service": "1.4.1",
-    "@tryghost/members-csv": "2.0.3",
+    "@tryghost/limit-service": "1.5.2",
+    "@tryghost/members-csv": "2.0.5",
     "@tryghost/nql": "0.12.10",
     "@tryghost/nql-lang": "0.6.4",
-    "@tryghost/string": "0.2.17",
-    "@tryghost/timezone-data": "0.4.12",
+    "@tryghost/string": "0.3.2",
+    "@tryghost/timezone-data": "0.4.18",
     "animejs": "3.2.2",
     "autoprefixer": "9.8.6",
     "babel-plugin-transform-class-properties": "6.24.1",
@@ -124,7 +124,7 @@
     "ember-truth-helpers": "3.1.1",
     "eslint-plugin-babel": "5.3.1",
     "flexsearch": "0.7.43",
-    "fs-extra": "11.3.0",
+    "fs-extra": "11.3.4",
     "glob": "8.1.0",
     "google-caja-bower": "https://github.com/acburdine/google-caja-bower#ghost",
     "keymaster": "https://github.com/madrobby/keymaster.git",

ghost/core/core/server/data/migrations/versions/6.28/2026-04-08-21-40-32-add-show-header-icon-to-email-design-settings.js

@@ -0,0 +1,7 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('email_design_settings', 'show_header_icon', {
+    type: 'boolean',
+    nullable: false,
+    defaultTo: true
+});

ghost/core/core/server/data/migrations/versions/6.28/2026-04-09-15-17-41-drop-nullable-gifts-expires-at.js

@@ -0,0 +1,3 @@
+const {createDropNullableMigration} = require('../../utils');
+
+module.exports = createDropNullableMigration('gifts', 'expires_at');

ghost/core/core/server/data/schema/schema.js

@@ -1149,6 +1149,7 @@ module.exports = {
         background_color: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'light'},
         header_background_color: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'transparent'},
         header_image: {type: 'string', maxlength: 2000, nullable: true},
+        show_header_icon: {type: 'boolean', nullable: false, defaultTo: true},
         show_header_title: {type: 'boolean', nullable: false, defaultTo: true},
         footer_content: {type: 'text', maxlength: 1000000000, nullable: true},
         button_color: {type: 'string', maxlength: 50, nullable: true, defaultTo: 'accent'},
@@ -1223,7 +1224,7 @@ module.exports = {
         stripe_payment_intent_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
 
         consumes_at: {type: 'dateTime', nullable: true},
-        expires_at: {type: 'dateTime', nullable: true},
+        expires_at: {type: 'dateTime', nullable: false},
 
         status: {
             type: 'string', maxlength: 50, nullable: false, validations: {

ghost/core/core/server/models/email-design-setting.js

@@ -7,6 +7,7 @@ const EmailDesignSetting = ghostBookshelf.Model.extend({
         return {
             background_color: 'light',
             header_background_color: 'transparent',
+            show_header_icon: true,
             show_header_title: true,
             button_color: 'accent',
             button_corners: 'rounded',

ghost/core/core/server/services/email-service/email-renderer.js

@@ -1031,6 +1031,10 @@ class EmailRenderer {
         }
 
         const postUrl = this.#getPostUrl(post);
+        const isPublicPost = post.get('visibility') === 'public';
+        const showShareButton = isPublicPost && newsletter.get('show_share_button');
+        const shareUrl = new URL(postUrl);
+        shareUrl.hash = '/share';
 
         // Signup URL is the post url with a hash added to it
         const signupUrl = new URL(postUrl);
@@ -1054,6 +1058,12 @@ class EmailRenderer {
         commentUrl.hash = '#ghost-comments-root';
 
         const hasEmailOnlyFlag = post.related('posts_meta')?.get('email_only') ?? false;
+        const hasFeedbackButtons = newsletter.get('feedback_enabled');
+        const showCommentCta = newsletter.get('show_comment_cta') && this.#settingsCache.get('comments_enabled') !== 'off' && !hasEmailOnlyFlag;
+        const feedbackButtonCount = (hasFeedbackButtons ? 2 : 0) + (showCommentCta ? 1 : 0) + (showShareButton ? 1 : 0);
+        const feedbackButtonCellWidth = feedbackButtonCount > 0
+            ? `${(100 / feedbackButtonCount).toFixed(2).replace(/\.00$/, '')}%`
+            : null;
 
         const latestPosts = [];
         let latestPostsHasImages = false;
@@ -1114,6 +1124,7 @@ class EmailRenderer {
             post: {
                 title: post.get('title'),
                 url: postUrl,
+                shareUrl: showShareButton ? shareUrl.href : null,
                 commentUrl: commentUrl.href,
                 authors,
                 publishedAt,
@@ -1129,7 +1140,7 @@ class EmailRenderer {
                 name: newsletter.get('name'),
                 showPostTitleSection: newsletter.get('show_post_title_section'),
                 showExcerpt: newsletter.get('show_excerpt'),
-                showCommentCta: newsletter.get('show_comment_cta') && this.#settingsCache.get('comments_enabled') !== 'off' && !hasEmailOnlyFlag,
+                showCommentCta,
                 showSubscriptionDetails: newsletter.get('show_subscription_details')
             },
 
@@ -1200,10 +1211,11 @@ class EmailRenderer {
             },
 
             // Audience feedback
-            feedbackButtons: newsletter.get('feedback_enabled') ? {
+            feedbackButtons: hasFeedbackButtons ? {
                 likeHref: positiveLink,
                 dislikeHref: negativeLink
             } : null,
+            feedbackButtonCellWidth,
 
             // Paywall
             paywall: addPaywall ? {

ghost/core/core/server/services/email-service/email-templates/partials/feedback-button.hbs

@@ -1,7 +1,7 @@
-<td dir="ltr" valign="top" align="center" style="display: inline-block; vertical-align: top; font-family: inherit; text-align: center; padding: 0 4px 4px; cursor: pointer; width: 30%;">
+<td dir="ltr" valign="top" align="center" style="display: inline-block; box-sizing: border-box; vertical-align: top; font-family: inherit; text-align: center; padding: 0 4px 4px; cursor: pointer; width: {{#if cellWidth}}{{cellWidth}}{{else}}30%{{/if}};">
     <a href="{{href}}" target="_blank">
-        <img src={{iconUrl}} border="0" width={{width}} height={{height}} alt="{{buttonText}}">
+        <img src={{iconUrl}} border="0" width={{width}} height={{height}} alt="{{buttonText}}" {{#if iconClass}}class="{{iconClass}}"{{/if}}>
         <p class="feedback-button-text">{{t buttonText}}</p>
-        {{!-- Button text possible values:  {{t 'More like this'}} {{t 'Less like this'}} {{t 'Comment'}} --}}
+        {{!-- Button text possible values:  {{t 'More like this'}} {{t 'Less like this'}} {{t 'Comment'}} {{t 'Share'}} --}}
     </a>
-</td>
+</td>

ghost/core/core/server/services/email-service/email-templates/template.hbs

@@ -19,17 +19,20 @@
 
                             <!-- END MAIN CONTENT AREA -->
 
-                            {{#if (or feedbackButtons newsletter.showCommentCta) }}
+                            {{#if (or feedbackButtons newsletter.showCommentCta post.shareUrl) }}
                                 <tr>
                                     <td class="feedback-buttons-container" dir="ltr" width="100%" align="center">
                                         <table class="feedback-buttons" role="presentation" border="0" cellpadding="0" cellspacing="0">
                                             <tr>
                                                 {{#if feedbackButtons }}
-                                                    {{> feedbackButton feedbackButtons href=feedbackButtons.likeHref buttonText='More like this' iconUrl="https://static.ghost.org/v5.0.0/images/more-like-this-mobile.png" width="42" height="42" }}
-                                                    {{> feedbackButton feedbackButtons href=feedbackButtons.dislikeHref buttonText='Less like this' iconUrl="https://static.ghost.org/v5.0.0/images/less-like-this-mobile.png" width="42" height="42" }}
+                                                    {{> feedbackButton feedbackButtons href=feedbackButtons.likeHref buttonText='More like this' iconUrl="https://static.ghost.org/v5.0.0/images/more-like-this-mobile.png" width="42" height="42" cellWidth=feedbackButtonCellWidth }}
+                                                    {{> feedbackButton feedbackButtons href=feedbackButtons.dislikeHref buttonText='Less like this' iconUrl="https://static.ghost.org/v5.0.0/images/less-like-this-mobile.png" width="42" height="42" cellWidth=feedbackButtonCellWidth }}
                                                 {{/if}}
                                                 {{#if newsletter.showCommentCta}}
-                                                    {{> feedbackButton href=post.commentUrl buttonText='Comment' iconUrl="https://static.ghost.org/v5.0.0/images/comment-mobile.png" width="42" height="42"}}
+                                                    {{> feedbackButton href=post.commentUrl buttonText='Comment' iconUrl="https://static.ghost.org/v5.0.0/images/comment-mobile.png" width="42" height="42" cellWidth=feedbackButtonCellWidth }}
+                                                {{/if}}
+                                                {{#if post.shareUrl}}
+                                                    {{> feedbackButton href=post.shareUrl buttonText='Share' iconUrl="https://static.ghost.org/v6.0.0/images/share-mobile.png" width="42" height="42" cellWidth=feedbackButtonCellWidth}}
                                                 {{/if}}
                                             </tr>
                                         </table>