[pull] main from TryGhost:main

.github/renovate.json5

@@ -225,6 +225,37 @@
             ]
         },
 
+        // Group each pinned-version pnpm catalog into a single PR per catalog.
+        //
+        // The named catalogs in pnpm-workspace.yaml (react17, eslint9,
+        // tailwind3) each hold a version lane we deliberately keep separate
+        // from the main `catalog:` — e.g. eslint 9 lives in `eslint9` while the
+        // default catalog stays on eslint 8. Renovate tags every catalog dep
+        // with a depType of `pnpm.catalog.<name>`, so matching the depType
+        // groups the whole catalog without restating its package list and stays
+        // correct as entries are added or removed in pnpm-workspace.yaml.
+        //
+        // These also override the shared preset's `group:monorepos` rules,
+        // which would otherwise group e.g. eslint + @eslint/js *by name* and
+        // mix the default-catalog (v8) and eslint9-catalog (v9) bumps into one
+        // PR. Matching by depType keeps each lane in its own reviewable PR.
+        //
+        // The main `catalog:` is intentionally left ungrouped: its entries are
+        // independent, so grouping them would only couple unrelated bumps and
+        // let one risky update block the rest.
+        {
+            "groupName": "react17 catalog",
+            "matchDepTypes": ["pnpm.catalog.react17"]
+        },
+        {
+            "groupName": "eslint9 catalog",
+            "matchDepTypes": ["pnpm.catalog.eslint9"]
+        },
+        {
+            "groupName": "tailwind3 catalog",
+            "matchDepTypes": ["pnpm.catalog.tailwind3"]
+        },
+
         // Always automerge these packages:
         {
             "matchPackageNames": [

apps/activitypub/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/activitypub",
-  "version": "3.1.30",
+  "version": "3.1.32",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -38,14 +38,14 @@
   },
   "devDependencies": {
     "@playwright/test": "catalog:",
-    "@testing-library/react": "14.3.1",
+    "@testing-library/react": "catalog:",
     "@types/jest": "catalog:",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
     "eslint": "catalog:",
-    "eslint-plugin-react-hooks": "4.6.2",
+    "eslint-plugin-react-hooks": "catalog:",
     "eslint-plugin-react-refresh": "catalog:",
-    "eslint-plugin-tailwindcss": "4.0.0-beta.0",
+    "eslint-plugin-tailwindcss": "catalog:",
     "jest": "29.7.0",
     "jsdom": "catalog:",
     "tailwindcss": "catalog:",
@@ -80,15 +80,15 @@
   },
   "dependencies": {
     "@hookform/resolvers": "5.4.0",
-    "@radix-ui/react-form": "0.1.8",
+    "@radix-ui/react-form": "catalog:",
     "@tanstack/react-query": "catalog:",
     "@tryghost/admin-x-framework": "workspace:*",
     "@tryghost/shade": "workspace:*",
     "clsx": "catalog:",
     "dompurify": "catalog:",
     "html2canvas-objectfit-fix": "1.2.0",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
+    "react": "catalog:",
+    "react-dom": "catalog:",
     "react-hook-form": "7.72.1",
     "react-router": "catalog:",
     "sonner": "catalog:",

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

@@ -32,7 +32,7 @@
         "@storybook/addon-links": "catalog:",
         "@storybook/react-vite": "catalog:",
         "@tailwindcss/postcss": "catalog:",
-        "@testing-library/react": "14.3.1",
+        "@testing-library/react": "catalog:",
         "@testing-library/react-hooks": "8.0.1",
         "@types/lodash-es": "4.17.12",
         "@types/react": "catalog:",
@@ -44,16 +44,16 @@
         "c8": "catalog:",
         "chai": "catalog:",
         "eslint": "catalog:",
-        "eslint-plugin-react-hooks": "4.6.2",
+        "eslint-plugin-react-hooks": "catalog:",
         "eslint-plugin-react-refresh": "catalog:",
-        "eslint-plugin-tailwindcss": "4.0.0-beta.0",
+        "eslint-plugin-tailwindcss": "catalog:",
         "glob": "catalog:",
         "jsdom": "catalog:",
         "lodash-es": "4.18.1",
         "postcss": "catalog:",
         "postcss-import": "16.1.1",
-        "react": "18.3.1",
-        "react-dom": "18.3.1",
+        "react": "catalog:",
+        "react-dom": "catalog:",
         "sinon": "catalog:",
         "storybook": "catalog:",
         "tailwindcss": "catalog:",
@@ -66,22 +66,22 @@
     "dependencies": {
         "@dnd-kit/core": "6.3.1",
         "@dnd-kit/sortable": "7.0.2",
-        "@ebay/nice-modal-react": "1.2.13",
-        "@radix-ui/react-avatar": "1.1.11",
-        "@radix-ui/react-checkbox": "1.3.3",
-        "@radix-ui/react-form": "0.1.8",
-        "@radix-ui/react-popover": "1.1.15",
+        "@ebay/nice-modal-react": "catalog:",
+        "@radix-ui/react-avatar": "catalog:",
+        "@radix-ui/react-checkbox": "catalog:",
+        "@radix-ui/react-form": "catalog:",
+        "@radix-ui/react-popover": "catalog:",
         "@radix-ui/react-radio-group": "1.3.8",
-        "@radix-ui/react-separator": "1.1.8",
-        "@radix-ui/react-switch": "1.2.6",
-        "@radix-ui/react-tabs": "1.1.13",
-        "@radix-ui/react-tooltip": "1.2.8",
+        "@radix-ui/react-separator": "catalog:",
+        "@radix-ui/react-switch": "catalog:",
+        "@radix-ui/react-tabs": "catalog:",
+        "@radix-ui/react-tooltip": "catalog:",
         "@sentry/react": "catalog:",
         "@tryghost/shade": "workspace:*",
         "@uiw/react-codemirror": "4.25.10",
         "clsx": "catalog:",
         "react-colorful": "5.6.1",
-        "react-hot-toast": "2.6.0",
+        "react-hot-toast": "catalog:",
         "react-select": "5.10.2"
     },
     "peerDependencies": {

apps/admin-x-framework/package.json

@@ -74,18 +74,18 @@
     ],
     "devDependencies": {
         "@playwright/test": "catalog:",
-        "@testing-library/jest-dom": "5.17.0",
-        "@testing-library/react": "14.3.1",
+        "@testing-library/jest-dom": "catalog:",
+        "@testing-library/react": "catalog:",
         "@tryghost/koenig-lexical": "catalog:",
         "@types/react": "catalog:",
         "@types/react-dom": "catalog:",
         "@vitejs/plugin-react": "catalog:",
         "@vitest/coverage-v8": "catalog:",
         "c8": "catalog:",
         "eslint": "catalog:",
-        "eslint-plugin-react-hooks": "4.6.2",
+        "eslint-plugin-react-hooks": "catalog:",
         "eslint-plugin-react-refresh": "catalog:",
-        "eslint-plugin-tailwindcss": "4.0.0-beta.0",
+        "eslint-plugin-tailwindcss": "catalog:",
         "glob": "catalog:",
         "jsdom": "catalog:",
         "msw": "catalog:",
@@ -97,16 +97,16 @@
         "vitest": "catalog:"
     },
     "dependencies": {
-        "@ebay/nice-modal-react": "1.2.13",
+        "@ebay/nice-modal-react": "catalog:",
         "@sentry/react": "catalog:",
         "@tanstack/react-query": "catalog:",
         "@tinybirdco/charts": "0.3.0",
         "@tryghost/admin-x-design-system": "workspace:*",
         "@tryghost/shade": "workspace:*",
         "bson-objectid": "catalog:",
-        "react": "18.3.1",
-        "react-dom": "18.3.1",
-        "react-hot-toast": "2.6.0",
+        "react": "catalog:",
+        "react-dom": "catalog:",
+        "react-hot-toast": "catalog:",
         "react-router": "catalog:"
     },
     "peerDependencies": {

apps/admin-x-settings/package.json

@@ -49,7 +49,7 @@
     "@codemirror/search": "6.7.0",
     "@codemirror/lang-yaml": "6.1.3",
     "@dnd-kit/sortable": "7.0.2",
-    "@ebay/nice-modal-react": "1.2.13",
+    "@ebay/nice-modal-react": "catalog:",
     "@sentry/react": "catalog:",
     "@tanstack/react-query": "catalog:",
     "@tryghost/color-utils": "catalog:",
@@ -63,18 +63,18 @@
     "clsx": "catalog:",
     "jszip": "3.10.1",
     "lucide-react": "catalog:",
-    "mingo": "2.5.3",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
-    "react-hot-toast": "2.6.0",
+    "mingo": "catalog:",
+    "react": "catalog:",
+    "react-dom": "catalog:",
+    "react-hot-toast": "catalog:",
     "react-select": "5.10.2",
     "sonner": "catalog:",
     "validator": "catalog:"
   },
   "devDependencies": {
     "@playwright/test": "catalog:",
-    "@testing-library/jest-dom": "6.9.1",
-    "@testing-library/react": "14.3.1",
+    "@testing-library/jest-dom": "catalog:",
+    "@testing-library/react": "catalog:",
     "@tryghost/admin-x-design-system": "workspace:*",
     "@tryghost/admin-x-framework": "workspace:*",
     "@tryghost/custom-fonts": "catalog:",
@@ -85,9 +85,9 @@
     "@types/validator": "catalog:",
     "@vitest/coverage-v8": "catalog:",
     "eslint": "catalog:",
-    "eslint-plugin-react-hooks": "4.6.2",
+    "eslint-plugin-react-hooks": "catalog:",
     "eslint-plugin-react-refresh": "catalog:",
-    "eslint-plugin-tailwindcss": "4.0.0-beta.0",
+    "eslint-plugin-tailwindcss": "catalog:",
     "jsdom": "catalog:",
     "tailwindcss": "catalog:",
     "vite": "catalog:",

apps/admin/package.json

@@ -21,26 +21,26 @@
     "@tryghost/posts": "workspace:*",
     "@tryghost/shade": "workspace:*",
     "@tryghost/stats": "workspace:*",
-    "mingo": "2.5.3",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
+    "mingo": "catalog:",
+    "react": "catalog:",
+    "react-dom": "catalog:",
     "zod": "catalog:"
   },
   "devDependencies": {
     "@eslint/js": "catalog:eslint9",
     "@tailwindcss/vite": "catalog:",
     "@tanstack/react-query": "catalog:",
-    "@testing-library/jest-dom": "6.9.1",
-    "@testing-library/react": "14.3.1",
+    "@testing-library/jest-dom": "catalog:",
+    "@testing-library/react": "catalog:",
     "@types/node": "catalog:",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
     "@vitejs/plugin-react-swc": "4.1.0",
     "eslint": "catalog:eslint9",
     "eslint-plugin-no-relative-import-paths": "1.6.1",
-    "eslint-plugin-react-hooks": "5.2.0",
+    "eslint-plugin-react-hooks": "catalog:",
     "eslint-plugin-react-refresh": "catalog:",
-    "eslint-plugin-tailwindcss": "4.0.0-beta.0",
+    "eslint-plugin-tailwindcss": "catalog:",
     "globals": "17.6.0",
     "jest-extended": "7.0.0",
     "jsdom": "catalog:",

apps/announcement-bar/package.json

@@ -14,8 +14,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "react": "catalog:react17",
+    "react-dom": "catalog:react17"
   },
   "scripts": {
     "dev": "concurrently --kill-others --names preview,build \"vite preview -l silent\" \"pnpm build:watch\"",

apps/comments-ui/package.json

@@ -56,14 +56,14 @@
     "@tiptap/pm": "2.26.3",
     "@tiptap/react": "2.26.3",
     "@tryghost/debug": "catalog:",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "catalog:react17",
+    "react-dom": "catalog:react17",
     "react-string-replace": "2.0.1"
   },
   "devDependencies": {
     "@playwright/test": "catalog:",
-    "@testing-library/jest-dom": "5.17.0",
-    "@testing-library/react": "12.1.5",
+    "@testing-library/jest-dom": "catalog:",
+    "@testing-library/react": "catalog:react17",
     "@tryghost/i18n": "workspace:*",
     "@tryghost/nql": "catalog:",
     "@vitejs/plugin-react": "catalog:",
@@ -73,7 +73,7 @@
     "concurrently": "catalog:",
     "eslint": "catalog:",
     "eslint-plugin-i18next": "6.1.4",
-    "eslint-plugin-tailwindcss": "3.18.2",
+    "eslint-plugin-tailwindcss": "catalog:tailwind3",
     "jsdom": "catalog:",
     "moment": "2.30.1",
     "postcss": "catalog:",

apps/portal/package.json

@@ -111,8 +111,8 @@
   "devDependencies": {
     "@doist/react-interpolate": "2.2.2",
     "@sentry/react": "catalog:",
-    "@testing-library/jest-dom": "6.9.1",
-    "@testing-library/react": "12.1.5",
+    "@testing-library/jest-dom": "catalog:",
+    "@testing-library/react": "catalog:react17",
     "@testing-library/user-event": "14.6.1",
     "@tryghost/i18n": "workspace:*",
     "@typescript-eslint/eslint-plugin": "8.49.0",
@@ -125,8 +125,8 @@
     "eslint": "catalog:",
     "eslint-plugin-i18next": "6.1.4",
     "jsdom": "catalog:",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "catalog:react17",
+    "react-dom": "catalog:react17",
     "vite": "catalog:",
     "vite-plugin-css-injected-by-js": "3.5.2",
     "vite-plugin-svgr": "catalog:",

apps/posts/package.json

@@ -40,25 +40,25 @@
         "@playwright/test": "catalog:",
         "@tanstack/react-query": "catalog:",
         "@tanstack/react-virtual": "3.13.25",
-        "@testing-library/jest-dom": "6.9.1",
-        "@testing-library/react": "14.3.1",
+        "@testing-library/jest-dom": "catalog:",
+        "@testing-library/react": "catalog:",
         "@types/jest": "catalog:",
         "@types/papaparse": "5.5.2",
         "@types/react": "catalog:",
         "@types/validator": "catalog:",
         "@vitest/coverage-v8": "catalog:",
         "eslint": "catalog:",
-        "eslint-plugin-react-hooks": "4.6.2",
+        "eslint-plugin-react-hooks": "catalog:",
         "eslint-plugin-react-refresh": "catalog:",
-        "eslint-plugin-tailwindcss": "4.0.0-beta.0",
+        "eslint-plugin-tailwindcss": "catalog:",
         "jsdom": "catalog:",
         "msw": "catalog:",
         "tailwindcss": "catalog:",
         "vite": "catalog:",
         "vitest": "catalog:"
     },
     "dependencies": {
-        "@ebay/nice-modal-react": "1.2.13",
+        "@ebay/nice-modal-react": "catalog:",
         "@tryghost/color-utils": "catalog:",
         "@tryghost/admin-x-framework": "workspace:*",
         "@tryghost/koenig-lexical": "catalog:",
@@ -70,8 +70,8 @@
         "lucide-react": "catalog:",
         "moment-timezone": "0.5.45",
         "papaparse": "5.5.3",
-        "react": "18.3.1",
-        "react-dom": "18.3.1",
+        "react": "catalog:",
+        "react-dom": "catalog:",
         "react-router": "catalog:",
         "sonner": "catalog:",
         "temporal-polyfill": "0.3.2",