merge tryghost/main

.github/scripts/docker-compose.yml

@@ -27,3 +27,13 @@ services:
     ports:
       - "6379:6379"
     restart: always
+  jaeger:
+      image: jaegertracing/all-in-one:1.58
+      container_name: ghost-jaeger
+      ports:
+        - "4318:4318"
+        - "16686:16686"
+        - "9411:9411"
+      restart: always
+      environment:
+        COLLECTOR_ZIPKIN_HOST_PORT: :9411

.github/workflows/ci.yml

@@ -402,7 +402,7 @@ jobs:
           jq '[{ name: "Boot time", unit: "s", value: .results[0].median, range: ((.results[0].max - .results[0].min) | tostring) }]' < boot-perf.json > boot-perf-formatted.json
 
       - name: Run analysis
-        uses: benchmark-action/[email protected].1
+        uses: benchmark-action/[email protected].3
         with:
           tool: 'customSmallerIsBetter'
           output-file-path: ghost/core/boot-perf-formatted.json

apps/admin-x-activitypub/package.json

@@ -25,17 +25,18 @@
     "lint": "yarn run lint:code && yarn run lint:test",
     "lint:code": "eslint --ext .js,.ts,.cjs,.tsx --cache src",
     "lint:test": "eslint -c test/.eslintrc.cjs --ext .js,.ts,.cjs,.tsx --cache test",
-    "test:unit": "vitest run",
+    "test:unit": "yarn nx build && vitest run",
     "test:acceptance": "NODE_OPTIONS='--experimental-specifier-resolution=node --no-warnings' VITE_TEST=true playwright test",
     "test:acceptance:slowmo": "TIMEOUT=100000 PLAYWRIGHT_SLOWMO=100 yarn test:acceptance --headed",
     "test:acceptance:full": "ALL_BROWSERS=1 yarn test:acceptance",
     "preview": "vite preview"
   },
   "devDependencies": {
+    "@playwright/test": "1.38.1",
     "@testing-library/react": "14.1.0",
     "@tryghost/admin-x-design-system": "0.0.0",
     "@tryghost/admin-x-framework": "0.0.0",
-    "@types/react": "18.3.2",
+    "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "react": "18.3.1",
     "react-dom": "18.3.1"