[pull] main from TryGhost:main

.changeset/changelogs/@tryghost!adapter-base-scheduling@0.2.1.md

@@ -0,0 +1,5 @@
+## 0.2.1
+
+### Patch Changes
+
+- Fixed the test suite type-check against the typed @tryghost/logging error signature.

.changeset/changelogs/@tryghost!kg-converters@1.2.4.md

@@ -0,0 +1,5 @@
+## 1.2.4
+
+### Patch Changes
+
+- Fixed the test suite type-check failing under TypeScript 7.

.changeset/changelogs/@tryghost!kg-default-cards@10.3.4.md

@@ -0,0 +1,5 @@
+## 10.3.4
+
+### Patch Changes
+
+- Removed a third-party network request (spacergif.org) from the web-rendered video card's poster image, replacing it with a local transparent placeholder. Email rendering is unaffected.

.changeset/changelogs/@tryghost!kg-default-nodes@2.1.5.md

@@ -0,0 +1,7 @@
+## 2.1.5
+
+### Patch Changes
+
+- Removed a third-party network request (spacergif.org) from the web-rendered video card's poster image, replacing it with a local transparent placeholder. Email rendering is unaffected.
+
+- Fixed contrast text colors for light backgrounds

.changeset/changelogs/@tryghost!koenig-lexical@1.9.1.md

@@ -0,0 +1,5 @@
+## 1.9.1
+
+### Patch Changes
+
+- Fixed contrast text colors for light backgrounds

.changeset/ledger.yaml

@@ -12,19 +12,40 @@
   dir: packages/adapters/scheduling-base
   intents:
     - fifty-maps-sing
+"@tryghost/adapter-base-scheduling@0.2.1":
+  dir: packages/adapters/scheduling-base
+  intents:
+    - typed-logging-args
 "@tryghost/adapter-base-sso@0.1.1":
   dir: packages/adapters/sso-base
   intents:
     - major-areas-fail
     - plain-singers-cheat
+"@tryghost/kg-converters@1.2.4":
+  dir: koenig/kg-converters
+  intents:
+    - tidy-types-check
+"@tryghost/kg-default-cards@10.3.4":
+  dir: koenig/kg-default-cards
+  intents:
+    - spacy-poodles-hunt
 "@tryghost/kg-default-nodes@2.1.4":
   dir: koenig/kg-default-nodes
   intents:
     - floppy-bobcats-spend
+"@tryghost/kg-default-nodes@2.1.5":
+  dir: koenig/kg-default-nodes
+  intents:
+    - spacy-poodles-hunt
+    - warm-hotels-make
 "@tryghost/koenig-lexical@1.9.0":
   dir: koenig/koenig-lexical
   intents:
     - bright-walls-preview
+"@tryghost/koenig-lexical@1.9.1":
+  dir: koenig/koenig-lexical
+  intents:
+    - warm-hotels-make
 ghost-storage-base@3.0.0:
   dir: packages/adapters/storage-base
   intents:

.changeset/spacy-poodles-hunt.md

@@ -0,0 +1,6 @@
+---
+"@tryghost/kg-default-nodes": patch
+"@tryghost/kg-default-cards": patch
+---
+
+Removed a third-party network request (spacergif.org) from the web-rendered video card's poster image, replacing it with a local transparent placeholder. Email rendering is unaffected.

.changeset/tidy-types-check.md

@@ -0,0 +1,5 @@
+---
+"@tryghost/kg-converters": patch
+---
+
+Fixed the test suite type-check failing under TypeScript 7.

.changeset/typed-logging-args.md

@@ -0,0 +1,5 @@
+---
+"@tryghost/adapter-base-scheduling": patch
+---
+
+Fixed the test suite type-check against the typed @tryghost/logging error signature.

.changeset/warm-hotels-make.md

@@ -0,0 +1,6 @@
+---
+"@tryghost/kg-default-nodes": patch
+"@tryghost/koenig-lexical": patch
+---
+
+Fixed contrast text colors for light backgrounds

.github/workflows/ci.yml

@@ -484,8 +484,7 @@ jobs:
   # Changing the runner label or the hyperfine version makes new results
   # incomparable with the existing history - treat both as pinned.
   job_perf-tests:
-    runs-on:
-      labels: ubuntu-latest-4-cores
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     needs: [job_setup]
     if: (needs.job_setup.outputs.changed_core == 'true' && needs.job_setup.outputs.is_development == 'true') || needs.job_setup.outputs.has_perf_tests_label == 'true'
     name: Performance tests
@@ -533,10 +532,10 @@ jobs:
   # bump would land in the code series as a regression with no Ghost commit behind it.
   job_perf-tests-image:
     name: Performance tests (production image)
-    runs-on:
-      labels: ubuntu-latest-4-cores
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     needs: [job_setup, job_docker]
-    # Registry path only: the core image is pushed to GHCR, never saved as an artifact.
+    # Registry path only: benchmarks are a canonical-repo series, so this pulls the
+    # core image from GHCR rather than loading the artifact-path tarball.
     if: |
       needs.job_docker.result == 'success' &&
       needs.job_docker.outputs.use-artifact == 'false' &&
@@ -1401,6 +1400,29 @@ jobs:
           cache-from: type=registry,ref=${{ steps.strategy.outputs.image-core-name }}:cache-main
           cache-to: ${{ steps.strategy.outputs.should-push == 'true' && format('type=registry,ref={0}:cache-{1},mode=max', steps.strategy.outputs.image-core-name, github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || 'main') || '' }}
 
+      # Uploaded here, before the full image is even built: on the artifact path
+      # consumers (Ghost-Moya CD) need the core image — server only, no admin —
+      # and would otherwise have to fall back to `docker-image-production`.
+      - name: Save core image as artifact
+        if: steps.strategy.outputs.use-artifact == 'true'
+        run: |
+          IMAGE_TAG=$(echo "${{ steps.meta-core.outputs.tags }}" | head -n1)
+          echo "Saving image: $IMAGE_TAG"
+          # Written outside the repo root: a stray tarball there would change the
+          # `.` context between the core and full builds and bust the deploy-stage
+          # COPY cache (same reason the admin artifact lands in RUNNER_TEMP below).
+          docker save "$IMAGE_TAG" | gzip > "${RUNNER_TEMP}/docker-image-core.tar.gz"
+          ls -lh "${RUNNER_TEMP}/docker-image-core.tar.gz"
+
+      - name: Upload core image artifact
+        if: steps.strategy.outputs.use-artifact == 'true'
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: docker-image-core
+          path: ${{ runner.temp }}/docker-image-core.tar.gz
+          retention-days: 1
+          if-no-files-found: error
+
       # Synchronise with job_build_admin only now, after core is built: the full
       # image is core + admin. No `needs` edge, so the two jobs run concurrently
       # and core builds during the wait.

apps/admin/src/settings/app/components/settings/advanced/labs/private-features.tsx

@@ -15,6 +15,10 @@ const features: Feature[] = [{
     title: 'Automations',
     description: 'Toggle the automations beta. Unexpected problems can occur if you turn this off after previously turning it on.',
     flag: 'automations'
+}, {
+    title: 'Automation run analytics',
+    description: 'Track run-level analytics for automations.',
+    flag: 'automationRunAnalytics'
 }, {
     title: 'Stripe Automatic Tax (private beta)',
     description: 'Use Stripe Automatic Tax at Stripe Checkout. Needs to be enabled in Stripe',

apps/admin/src/settings/app/components/settings/site/theme/theme-code-editor-modal.tsx

@@ -764,7 +764,11 @@ const ThemeCodeEditorModal: React.FC<{themeName: string}> = ({themeName}) => {
             const formData = new FormData();
             formData.append('file', blob, `${nextThemeName}.zip`);
 
-            const response = await fetch(`${getGhostPaths().apiRoot}/themes/upload/`, {
+            // when saving under a new name, carry over the original theme's
+            // settings so activating the copy keeps the site's design
+            const uploadQuery = isSaveAs ? `?copy_settings_from=${encodeURIComponent(previousThemeName)}` : '';
+
+            const response = await fetch(`${getGhostPaths().apiRoot}/themes/upload/${uploadQuery}`, {
                 method: 'POST',
                 credentials: 'include',
                 headers: {

apps/admin/src/settings/site/theme.acceptance.test.tsx

@@ -241,7 +241,10 @@ describe("Theme settings", () => {
         fakeThemeWorld();
         await fakeThemeDownload("casper");
         await fakeThemeDownload("casper-edited");
-        const uploadApi = fakeAdminEndpoint("POST", "/themes/upload/", { themes: [theme({ name: "casper-edited" })] });
+        // saving under a new name carries over the original theme's settings
+        const uploadApi = fakeAdminEndpoint("POST", "/themes/upload/?copy_settings_from=casper", {
+            themes: [theme({ name: "casper-edited" })],
+        });
         await renderAdminApp("/settings/theme/edit/casper");
 
         const editor = await editorTextbox();

apps/admin/src/tags/detail/tag-detail.acceptance.test.tsx

@@ -133,6 +133,7 @@ describe('Tag detail (tagDetailsReact on)', () => {
 
         await expect.element(page.getByTestId('tag-detail-title')).toHaveTextContent('New tag');
         const nameInput = page.getByLabelText('Name', {exact: true});
+        await expect.element(nameInput).toBeVisible();
         await userEvent.type(nameInput.element(), 'Weekly News');
         await expect.element(page.getByLabelText('Slug', {exact: true})).toHaveValue('weekly-news');
 

apps/ember-admin/.ember-cli

@@ -7,5 +7,14 @@
 
         Setting `disableAnalytics` to true will prevent any data from being sent.
     */
-    "disableAnalytics": true
+    "disableAnalytics": true,
+
+    /**
+        Default to Node's native FS watcher instead of Watchman. Watchman
+        repeatedly trips its "MustScanSubDirs UserDropped" recrawl warning
+        in this monorepo (Docker bind mounts + Vite dev writes), spamming
+        ~6 lines per rebuild. The node watcher is quieter and good enough
+        for our tree size.
+    */
+    "watcher": "node"
 }

apps/ember-admin/lib/asset-delivery/index.js

@@ -101,7 +101,11 @@ module.exports = {
                 } else {
                     fs.ensureSymlinkSync(adminXPath, assetsAdminXPath);
                 }
-            } else  {
+            } else if (this.env === 'production') {
+                // In dev the admin-x apps may not have finished their first
+                // build yet and Nx will trigger another Ember rebuild once
+                // they do. Only flag a missing dist for production where it
+                // indicates a real pipeline failure.
                 console.log(`${app} folder not found`);
             }
         }