[pull] main from TryGhost:main

.github/workflows/ci.yml

@@ -968,6 +968,9 @@ jobs:
           retention-days: 7
           if-no-files-found: error
 
+      - name: Setup Docker Registry Mirrors
+        uses: ./.github/actions/setup-docker-registry-mirrors
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
 
@@ -1175,6 +1178,9 @@ jobs:
       - name: Extract public app artifacts
         run: tar -xzf e2e-public-apps.tar.gz
 
+      - name: Setup Docker Registry Mirrors
+        uses: ./.github/actions/setup-docker-registry-mirrors
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
         with:
@@ -1275,6 +1281,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
+      - name: Setup Docker Registry Mirrors
+        uses: ./.github/actions/setup-docker-registry-mirrors
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
 
@@ -1298,9 +1307,6 @@ jobs:
           image-tags: ${{ needs.job_build_e2e_image.outputs.image-tags }}
           artifact-name: docker-image-e2e
 
-      - name: Setup Docker Registry Mirrors
-        uses: ./.github/actions/setup-docker-registry-mirrors
-
       - uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
       - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
         with:

.secretlintrc.json

@@ -16,7 +16,7 @@
           {
             "name": "credential in URL query string",
             "patterns": [
-              "/[?&](?:token|api[_-]?key|access[_-]?token|auth[_-]?token|client[_-]?secret|secret|password)=(?<CREDENTIAL>(?!p\\.)[^&\\s\"'<>]{16,})/i"
+              "/[?&](?:token|api[_-]?key|access[_-]?token|auth[_-]?token|client[_-]?secret|secret|password)=(?<CREDENTIAL>(?!p\\.|\\$\\{)[^&\\s\"'<>]{16,})/i"
             ]
           },
           {

apps/activitypub/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/activitypub",
-  "version": "3.1.14",
+  "version": "3.1.16",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,13 +39,11 @@
   "devDependencies": {
     "@playwright/test": "1.59.1",
     "@testing-library/react": "14.3.1",
-    "@types/dompurify": "3.2.0",
     "@types/jest": "29.5.14",
     "@types/react": "18.3.28",
     "@types/react-dom": "18.3.7",
     "jest": "29.7.0",
     "tailwindcss": "^4.2.2",
-    "ts-jest": "29.4.9",
     "vite": "5.4.21",
     "vitest": "1.6.1"
   },

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

@@ -28,7 +28,6 @@
         "@codemirror/lang-html": "6.4.11",
         "@codemirror/state": "6.6.0",
         "@dnd-kit/utilities": "^3.2.2",
-        "@radix-ui/react-tooltip": "1.2.8",
         "@storybook/addon-docs": "10.3.5",
         "@storybook/addon-links": "10.3.5",
         "@storybook/react-vite": "10.3.5",
@@ -54,7 +53,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": "10.3.5",
         "tailwindcss": "4.2.1",

apps/admin-x-framework/package.json

@@ -88,7 +88,6 @@
         "glob": "^10.5.0",
         "jsdom": "28.1.0",
         "msw": "2.12.14",
-        "sinon": "18.0.1",
         "typescript": "5.9.3",
         "vite": "5.4.21",
         "vite-plugin-css-injected-by-js": "3.5.2",

apps/admin/package.json

@@ -20,7 +20,6 @@
     "@tryghost/posts": "workspace:*",
     "@tryghost/shade": "workspace:*",
     "@tryghost/stats": "workspace:*",
-    "lodash": "4.18.1",
     "mingo": "2.5.3",
     "react": "18.3.1",
     "react-dom": "18.3.1",

apps/announcement-bar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/announcement-bar",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",
@@ -14,7 +14,6 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@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.10",
+  "version": "1.4.11",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",
@@ -64,7 +64,6 @@
     "@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",
     "@tryghost/i18n": "workspace:*",
     "@vitejs/plugin-react": "4.7.0",
     "@vitest/coverage-v8": "0.34.6",

apps/portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/portal",
-  "version": "2.68.29",
+  "version": "2.68.30",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",
@@ -109,7 +109,6 @@
     ]
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.28.4",
     "@doist/react-interpolate": "2.2.1",
     "@sentry/react": "7.120.4",
     "@testing-library/jest-dom": "6.9.1",

apps/posts/package.json

@@ -55,13 +55,13 @@
         "@tryghost/nql-lang": "0.6.4",
         "@tryghost/shade": "workspace:*",
         "i18n-iso-countries": "7.14.0",
-        "moment": "2.24.0",
         "moment-timezone": "0.5.45",
         "papaparse": "5.5.3",
         "react": "18.3.1",
         "react-dom": "18.3.1",
         "react-router": "7.14.0",
         "sonner": "2.0.7",
+        "temporal-polyfill": "0.3.0",
         "use-debounce": "10.1.1",
         "zod": "4.1.12"
     },

apps/posts/src/hooks/filter-sources/create-combined-value-source.ts

@@ -1,11 +1,12 @@
-import {ValueSource, ValueSourceParams, ValueSourceState} from '@tryghost/shade/patterns';
+import {FilterOption, ValueSource, ValueSourceParams, ValueSourceState} from '@tryghost/shade/patterns';
 import {ValueSourceHook, ValueSourceHookOptions} from './create-remote-value-source';
 import {mergeFilterOptions} from './utils';
 import {useCallback, useMemo} from 'react';
 
 export function createCombinedValueSource<T = string>(
     useFirstSource: ValueSourceHook<T>,
-    useSecondSource: ValueSourceHook<T>
+    useSecondSource: ValueSourceHook<T>,
+    getMissingSelectedOption?: (selectedValue: T) => FilterOption<T>
 ): ValueSourceHook<T> {
     return function useCombinedValueSource(options?: ValueSourceHookOptions): ValueSource<T> {
         const firstSource = useFirstSource(options);
@@ -14,9 +15,19 @@ export function createCombinedValueSource<T = string>(
         const useOptions = useCallback(({query, selectedValues}: ValueSourceParams<T>): ValueSourceState<T> => {
             const firstState = firstSource.useOptions({query, selectedValues});
             const secondState = secondSource.useOptions({query, selectedValues});
+            const mergedOptions = mergeFilterOptions(firstState.options, secondState.options);
+            const fallbackOptions = getMissingSelectedOption ? selectedValues.flatMap((selectedValue) => {
+                const hasMatch = mergedOptions.some(option => option.value === selectedValue);
+
+                if (hasMatch) {
+                    return [];
+                }
+
+                return [getMissingSelectedOption(selectedValue)];
+            }) : [];
 
             return {
-                options: mergeFilterOptions(firstState.options, secondState.options),
+                options: mergeFilterOptions(mergedOptions, fallbackOptions),
                 isInitialLoad: firstState.options.length === 0 &&
                     secondState.options.length === 0 &&
                     (firstState.isInitialLoad || secondState.isInitialLoad),

apps/posts/src/hooks/filter-sources/create-ghost-browse-value-source.ts

@@ -25,6 +25,7 @@ interface CreateGhostBrowseValueSourceConfig<Item, Data> {
     debounceMs?: number;
     selectItems: (data: Data | undefined) => Item[] | undefined;
     toOption: (item: Item) => FilterOption<string>;
+    getMissingSelectedOption?: (selectedValue: string) => FilterOption<string>;
     useQuery: (
         options: {enabled: boolean; searchParams: Record<string, string>}
     ) => InfiniteBrowseResult<Data>;
@@ -53,6 +54,7 @@ export function createGhostBrowseValueSource<Item, Data extends GhostBrowseRespo
     debounceMs,
     selectItems,
     toOption,
+    getMissingSelectedOption,
     useQuery
 }: CreateGhostBrowseValueSourceConfig<Item, Data>) {
     return createRemoteValueSource<Item>({
@@ -93,6 +95,7 @@ export function createGhostBrowseValueSource<Item, Data extends GhostBrowseRespo
             };
         },
         toOption,
+        getMissingSelectedOption,
         debounceMs
     });
 }

apps/posts/src/hooks/filter-sources/create-remote-value-source.ts

@@ -41,6 +41,7 @@ interface RemoteValueSourceConfig<Item, T = string> {
     useBrowse: (query: string, options: ValueSourceHookOptions) => BrowseState<Item>;
     useHydrate?: (selectedValues: T[], options: ValueSourceHookOptions) => HydrateState<Item>;
     toOption: (item: Item) => FilterOption<T>;
+    getMissingSelectedOption?: (selectedValue: T) => FilterOption<T>;
     debounceMs?: number;
 }
 
@@ -52,6 +53,26 @@ export type RemoteValueSource<T = string, Item = unknown> = ValueSource<T> & {
 
 export type RemoteValueSourceHook<T = string, Item = unknown> = (options?: ValueSourceHookOptions) => RemoteValueSource<T, Item>;
 
+function buildFallbackOptions<T>(
+    selectedValues: T[],
+    mergedOptions: FilterOption<T>[],
+    getMissingSelectedOption?: (selectedValue: T) => FilterOption<T>
+): FilterOption<T>[] {
+    if (!getMissingSelectedOption) {
+        return [];
+    }
+
+    return selectedValues.flatMap((selectedValue) => {
+        const hasMatch = mergedOptions.some(option => option.value === selectedValue);
+
+        if (hasMatch) {
+            return [];
+        }
+
+        return [getMissingSelectedOption(selectedValue)];
+    });
+}
+
 export function createRemoteValueSource<Item, T = string>(
     config: RemoteValueSourceConfig<Item, T>
 ): RemoteValueSourceHook<T, Item> {
@@ -88,6 +109,13 @@ export function createRemoteValueSource<Item, T = string>(
             const mergedOptions = useMemo(() => {
                 return mergeFilterOptions(hydratedOptions, visibleOptions);
             }, [hydratedOptions, visibleOptions]);
+            const fallbackOptions = useMemo(() => {
+                return buildFallbackOptions(
+                    selectedValues,
+                    mergedOptions,
+                    config.getMissingSelectedOption
+                );
+            }, [mergedOptions, selectedValues]);
 
             if (!enabled) {
                 return {
@@ -101,7 +129,7 @@ export function createRemoteValueSource<Item, T = string>(
             }
 
             return {
-                options: mergedOptions,
+                options: mergeFilterOptions(fallbackOptions, mergedOptions),
                 isInitialLoad: browse.isLoading && mergedOptions.length === 0,
                 isSearching: !browse.isLoading && browse.isRefreshing && !browse.isLoadingMore,
                 isLoadingMore: browse.isLoadingMore,

apps/posts/src/hooks/filter-sources/use-member-value-source.ts

@@ -17,6 +17,10 @@ const useRemoteMemberValueSource = createGhostBrowseValueSource<Member, MembersI
         order: 'created_at DESC',
         ...(query ? {search: query} : {})
     }),
+    getMissingSelectedOption: value => ({
+        value,
+        label: `ID: ${value}`
+    }),
     selectItems: data => data?.members,
     useQuery: ({enabled, searchParams}) => {
         return useBrowseMembersInfinite({

apps/posts/src/hooks/filter-sources/use-post-resource-value-source.ts

@@ -68,7 +68,11 @@ const usePublishedPageValueSource = createGhostBrowseValueSource<Page, PagesResp
 
 const useCombinedPostResourceValueSource = createCombinedValueSource(
     usePublishedPostValueSource,
-    usePublishedPageValueSource
+    usePublishedPageValueSource,
+    value => ({
+        value,
+        label: `ID: ${value}`
+    })
 );
 
 export function usePostResourceValueSource(): ValueSource<string> {