@salesforce/templates 66.17.1 → 66.17.2

package/lib/templates/project/reactexternalapp/scripts/org-setup-xml.mjs

@@ -39,6 +39,7 @@ const parser = new XMLParser({
   ignoreAttributes: false,
   parseTagValue: false,
   parseAttributeValue: false,
+  commentPropName: '#comment',
 });
 
 /**
@@ -73,22 +74,26 @@ export function assertSafeProfileName(name) {
 }
 
 /**
- * Parse + assert this is a Network metadata document. Returns the parsed
- * `Network` object. Throws NetworkXmlError if the root is missing (e.g. a file
+ * Parse + assert this is a Network metadata document. Returns the full parsed
+ * document. Throws NetworkXmlError if the root is missing (e.g. a file
  * that is not actually network metadata).
  */
-export function parseNetwork(xml) {
+export function parseNetworkDocument(xml) {
   let parsed;
   try {
-    parsed = parser.parse(xml);
+    parsed = parser.parse(xml, true);
   } catch (e) {
     throw new NetworkXmlError(`network metadata is not well-formed XML: ${e.message}`);
   }
   const network = parsed?.[NETWORK_ROOT];
-  if (network == null || typeof network !== 'object') {
+  if (network == null || typeof network !== 'object' || Array.isArray(network)) {
     throw new NetworkXmlError(`expected a <${NETWORK_ROOT}> root node, but none was found`);
   }
-  return network;
+  return parsed;
+}
+
+export function parseNetwork(xml) {
+  return parseNetworkDocument(xml)[NETWORK_ROOT];
 }
 
 /** Normalize a fast-xml-parser child (absent | scalar | array) to an array. */

package/lib/templates/project/reactexternalapp/scripts/org-setup.mjs

@@ -55,6 +55,7 @@ import {
 import { tmpdir } from 'node:os';
 
 import { validateConfig } from './org-setup-config-schema.mjs';
+import { preserveNetworkSenders } from './network-senders.mjs';
 import {
   addProfileToMemberGroups,
   enableSelfRegInXml,
@@ -1149,9 +1150,14 @@ function ensureLogoutUrl(logoutUrl, siteName, targetOrg) {
   writeFileSync(networkXmlPath, result.xml);
   console.log(`  Set <logoutUrl>${absoluteUrl}</logoutUrl> in ${siteName}.network-meta.xml`);
 
-  // Re-deploy ONLY the network file (mirrors enableSelfRegistration). Best-effort:
-  // a non-zero exit (e.g. the org's emailSenderAddress differs from the shipped
-  // value and can't be updated) logs loudly and continues.
+  try {
+    preserveNetworkSenders(ROOT, targetOrg);
+  } catch (e) {
+    console.error(`  ERROR: cannot prepare Network metadata for "${siteName}" — ${e.message}. Skipping logout URL deployment.`);
+    return;
+  }
+
+  // Logout URL deployment is best-effort.
   const deployResult = spawnSync('sf', [
     'project', 'deploy', 'start',
     '--target-org', targetOrg,
@@ -1160,8 +1166,7 @@ function ensureLogoutUrl(logoutUrl, siteName, targetOrg) {
   if (deployResult.status !== 0) {
     console.error(
       `  ERROR: failed to deploy <logoutUrl> for "${siteName}" (sf exit ${deployResult.status ?? 1}). ` +
-      `If the org's Network emailSenderAddress differs from the shipped value it blocks this deploy — ` +
-      `set the logout URL manually in the site's Administration settings.`,
+      `Set the logout URL manually in the site's Administration settings.`,
     );
     return;
   }
@@ -1208,6 +1213,8 @@ function enableSelfRegistration(selfRegConfig, siteName, targetOrg) {
     writeFileSync(networkXmlPath, result.xml);
     console.log(`  Updated ${siteName}.network-meta.xml: selfRegistration=true, selfRegProfile=${selfRegProfile}`);
 
+    preserveNetworkSenders(ROOT, targetOrg);
+
     // Re-deploy only the network file
     const deployResult = spawnSync('sf', [
       'project', 'deploy', 'start',
@@ -2118,6 +2125,7 @@ async function main() {
           throw new StepError(`deploy blocked — ${licenseGate.reason}`);
         }
       }
+      preserveNetworkSenders(ROOT, targetOrg);
       run('Deploy metadata', 'sf', ['project', 'deploy', 'start', '--target-org', targetOrg], {
         timeout: 180000,
       });

package/lib/templates/project/reactinternalapp/CHANGELOG.md

@@ -3,6 +3,135 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.9.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.8.0...v12.9.0) (2026-09-29)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.8.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.7.0...v12.8.0) (2026-09-23)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.7.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.6.3...v12.7.0) (2026-09-22)
+
+
+### Bug Fixes
+
+* **template-sfdx-project:** preserve target network sender addresses @W-24209513@ ([#993](https://github.com/salesforce-experience-platform-emu/webapps/issues/993)) ([fddbfdd](https://github.com/salesforce-experience-platform-emu/webapps/commit/fddbfddcb41270720372b0fd4c486f043d9ba8c5))
+
+
+
+## [12.6.3](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.6.2...v12.6.3) (2026-09-14)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.6.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.6.1...v12.6.2) (2026-09-14)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.6.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.6.0...v12.6.1) (2026-09-11)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.6.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.8...v12.6.0) (2026-09-11)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.8](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.7...v12.5.8) (2026-09-11)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.7](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.6...v12.5.7) (2026-09-11)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.6](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.5...v12.5.6) (2026-09-11)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.5](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.4...v12.5.5) (2026-09-10)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.4](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.3...v12.5.4) (2026-09-09)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.3](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.2...v12.5.3) (2026-09-08)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.1...v12.5.2) (2026-09-08)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.5.0...v12.5.1) (2026-09-07)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.5.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.4.5...v12.5.0) (2026-09-04)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
 ## [12.4.5](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.4.4...v12.4.5) (2026-09-03)
 
 **Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/package-lock.json

@@ -10,8 +10,8 @@
       "hasInstallScript": true,
       "dependencies": {
         "@salesforce/agentforce-conversation-client": "^12.0.0",
-        "@salesforce/platform-sdk": "^12.4.5",
-        "@salesforce/ui-bundle": "^12.4.5",
+        "@salesforce/platform-sdk": "^12.9.0",
+        "@salesforce/ui-bundle": "^12.9.0",
         "@tailwindcss/vite": "^4.1.17",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
@@ -36,8 +36,8 @@
         "@graphql-eslint/eslint-plugin": "^4.1.0",
         "@graphql-tools/utils": "^11.0.0",
         "@playwright/test": "^1.49.0",
-        "@salesforce/graphiti": "^12.4.5",
-        "@salesforce/vite-plugin-ui-bundle": "^12.4.5",
+        "@salesforce/graphiti": "^12.9.0",
+        "@salesforce/vite-plugin-ui-bundle": "^12.9.0",
         "@testing-library/jest-dom": "^6.6.3",
         "@testing-library/react": "^16.1.0",
         "@testing-library/user-event": "^14.5.2",
@@ -45,7 +45,7 @@
         "@types/react": "^19.2.5",
         "@types/react-dom": "^19.2.3",
         "@vitejs/plugin-react": "^5.1.1",
-        "@vitest/ui": "^4.1.0",
+        "@vitest/ui": "^4.1.11",
         "eslint": "^9.39.1",
         "eslint-plugin-react": "^7.37.2",
         "eslint-plugin-react-hooks": "^7.0.1",
@@ -60,7 +60,7 @@
         "typescript-eslint": "^8.46.4",
         "vite": "^7.2.4",
         "vite-plugin-graphql-codegen": "^3.6.3",
-        "vitest": "^4.1.0"
+        "vitest": "^4.1.11"
       },
       "engines": {
         "node": ">=22"

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/package.json

@@ -19,8 +19,8 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/platform-sdk": "^12.4.5",
-    "@salesforce/ui-bundle": "^12.4.5",
+    "@salesforce/platform-sdk": "^12.9.0",
+    "@salesforce/ui-bundle": "^12.9.0",
     "@tailwindcss/vite": "^4.1.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -46,8 +46,8 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/graphiti": "^12.4.5",
-    "@salesforce/vite-plugin-ui-bundle": "^12.4.5",
+    "@salesforce/graphiti": "^12.9.0",
+    "@salesforce/vite-plugin-ui-bundle": "^12.9.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
@@ -55,7 +55,7 @@
     "@types/react": "^19.2.5",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.1",
-    "@vitest/ui": "^4.1.0",
+    "@vitest/ui": "^4.1.11",
     "eslint": "^9.39.1",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^7.0.1",
@@ -70,7 +70,7 @@
     "typescript-eslint": "^8.46.4",
     "vite": "^7.2.4",
     "vite-plugin-graphql-codegen": "^3.6.3",
-    "vitest": "^4.1.0"
+    "vitest": "^4.1.11"
   },
   "overrides": {
     "lodash": "^4.18.1",

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/adapters/sobject/parseResponse.ts

@@ -31,8 +31,7 @@ export function parseSObjectResponse(
 	request: SourceRequest<SObjectSourceConfig>,
 ): SourceResult | null {
 	const queryRoot = (root?.uiapi as Record<string, unknown> | undefined)?.query as
-		| Record<string, RawSourceResult | null | undefined>
-		| undefined;
+		Record<string, RawSourceResult | null | undefined> | undefined;
 
 	const raw = queryRoot?.[request.source.key];
 	if (raw == null) return null;

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/api/distinctValuesService.ts

@@ -64,18 +64,15 @@ export async function fetchDistinctValues(
 
 	const root = response.data as Record<string, unknown> | undefined;
 	const aggregate = (root?.uiapi as Record<string, unknown> | undefined)?.aggregate as
-		| Record<string, unknown>
-		| undefined;
+		Record<string, unknown> | undefined;
 	const objectAgg = aggregate?.[objectName] as
-		| { edges?: Array<{ node?: { aggregate?: Record<string, unknown> } }> }
-		| undefined;
+		{ edges?: Array<{ node?: { aggregate?: Record<string, unknown> } }> } | undefined;
 	const edges = objectAgg?.edges ?? [];
 
 	return edges
 		.map((edge) => {
 			const field = edge?.node?.aggregate?.[fieldName] as
-				| { value?: string | null; displayValue?: string | null; label?: string | null }
-				| undefined;
+				{ value?: string | null; displayValue?: string | null; label?: string | null } | undefined;
 			const value = field?.value;
 			if (value == null || value === "") return null;
 			return { value, label: field?.label ?? field?.displayValue ?? value };

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/components/MergedSearchResults.tsx

@@ -137,7 +137,7 @@ export function MergedSearchResults({
 			    whole-request/network failure). Shown once, above the grid. */}
 			{error && (
 				<Alert variant="destructive" role="alert">
-					<AlertCircle />
+					<AlertCircle aria-hidden="true" />
 					<AlertTitle>Search failed</AlertTitle>
 					<AlertDescription>{error}</AlertDescription>
 				</Alert>
@@ -151,7 +151,7 @@ export function MergedSearchResults({
 					.filter((c) => !!c.error)
 					.map((c) => (
 						<Alert key={c.config.key} variant="destructive" role="alert">
-							<AlertCircle />
+							<AlertCircle aria-hidden="true" />
 							<AlertTitle>Failed to load {c.config.label}</AlertTitle>
 							<AlertDescription>{c.error}</AlertDescription>
 						</Alert>
@@ -171,14 +171,14 @@ export function MergedSearchResults({
 						<Skeleton key={i} className="h-48 w-full rounded-lg" />
 					))}
 				</div>
-			) : isShortQuery ? (
+			) : error ? null : isShortQuery ? (
 				<p className="py-12 text-center text-sm text-muted-foreground">{shortQueryMessage}</p>
 			) : mergedResults.length === 0 ? (
 				<p className="py-12 text-center text-sm text-muted-foreground">
 					{emptyMessage ?? "No results found."}
 				</p>
 			) : (
-				<ul className={gridClassName}>
+				<ul role="list" className={gridClassName}>
 					{mergedResults.map(({ sourceKey, node }, i) => {
 						const source = handle.sources[sourceKey]?.config;
 						if (!source) return null;

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/components/Search.tsx

@@ -82,6 +82,8 @@ interface SearchProps {
 	/** Optional override for the entire header region. */
 	renderHeader?: (handle: SearchHandle) => ReactNode;
 	className?: string;
+	/** Root element tag; use `"main"` when this owns its route's landmark (WCAG 1.3.1). */
+	as?: "div" | "main";
 }
 
 export function Search({
@@ -97,6 +99,7 @@ export function Search({
 	allScopeLabel,
 	renderHeader,
 	className,
+	as: Root = "div",
 }: SearchProps) {
 	// Resolve restrictTo to a lockedScope value, surfacing a clear error if
 	// the (kind, key) pair doesn't match any source. Memoize so it's
@@ -136,7 +139,7 @@ export function Search({
 	const showTotalResults = !merged && sourcesInScope >= 2;
 
 	return (
-		<div className={`max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6 space-y-6 ${className ?? ""}`}>
+		<Root className={`max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6 space-y-6 ${className ?? ""}`}>
 			{renderHeader ? (
 				renderHeader(handle)
 			) : (
@@ -198,6 +201,6 @@ export function Search({
 					)}
 				</>
 			)}
-		</div>
+		</Root>
 	);
 }

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/components/SourceSection.tsx

@@ -152,14 +152,14 @@ export function SourceSection({
 
 					{error && (
 						<Alert variant="destructive" role="alert">
-							<AlertCircle />
+							<AlertCircle aria-hidden="true" />
 							<AlertTitle>Failed to load {config.label}</AlertTitle>
 							<AlertDescription>{error}</AlertDescription>
 						</Alert>
 					)}
 
 					{showResults && (
-						<ul className="divide-y">
+						<ul role="list" className="divide-y">
 							{nodes.map((node, i) => (
 								<li key={getNodeKey(node, idField, i)} className="py-3">
 									{renderResult(node)}
@@ -171,9 +171,9 @@ export function SourceSection({
 					{showEmpty && (
 						<div className="flex flex-col items-center justify-center py-10 text-center">
 							{isShortQuery ? (
-								<Search className="size-10 text-muted-foreground mb-3" />
+								<Search aria-hidden="true" className="size-10 text-muted-foreground mb-3" />
 							) : (
-								<SearchX className="size-10 text-muted-foreground mb-3" />
+								<SearchX aria-hidden="true" className="size-10 text-muted-foreground mb-3" />
 							)}
 							<p className="text-sm text-muted-foreground">
 								{isShortQuery
@@ -195,6 +195,7 @@ export function SourceSection({
 					onPageSizeChange={pagination.setPageSize}
 					disabled={loading || !!error}
 					idPrefix={`page-size-${config.key}`}
+					navLabel={`${config.label} pagination`}
 				/>
 			</div>
 		</section>

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/components/controls/PaginationControls.tsx

@@ -37,6 +37,8 @@ interface PaginationControlsProps {
 	onGoToPage?: (pageIndex: number) => void;
 	disabled?: boolean;
 	idPrefix?: string;
+	/** Accessible name for the pagination `<nav>` landmark; keep it unique per instance (WCAG 1.3.1, landmark-unique). */
+	navLabel?: string;
 }
 
 /**
@@ -76,6 +78,7 @@ export function PaginationControls({
 	onGoToPage,
 	disabled = false,
 	idPrefix = "page-size",
+	navLabel = "Pagination",
 }: PaginationControlsProps) {
 	const handlePageSizeChange = (next: string) => {
 		const size = parseInt(next, 10);
@@ -104,11 +107,7 @@ export function PaginationControls({
 				<Label htmlFor={selectId} className="text-sm font-normal whitespace-nowrap">
 					Results per page:
 				</Label>
-				<Select
-					value={pageSize.toString()}
-					onValueChange={handlePageSizeChange}
-					disabled={disabled}
-				>
+				<Select value={pageSize.toString()} onValueChange={handlePageSizeChange}>
 					<SelectTrigger id={selectId} className="w-16">
 						<SelectValue />
 					</SelectTrigger>
@@ -121,7 +120,7 @@ export function PaginationControls({
 					</SelectContent>
 				</Select>
 			</div>
-			<Pagination className="w-full mx-0 sm:justify-end">
+			<Pagination aria-label={navLabel} className="w-full mx-0 sm:justify-end">
 				<PaginationContent>
 					<PaginationItem>
 						<PaginationPrevious

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/components/controls/SearchBar.tsx

@@ -38,7 +38,10 @@ export function SearchBar({ value, onChange, placeholder = "Search…", classNam
 
 	return (
 		<div className={`relative flex-1 ${className ?? ""}`}>
-			<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+			<Search
+				aria-hidden="true"
+				className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground"
+			/>
 			<Input
 				type="text"
 				value={draft}

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/components/results/CmsResultRow.tsx

@@ -20,6 +20,11 @@ import { Link } from "react-router";
 import type { CmsSourceConfig, CmsSearchItem } from "../../adapters/cms/types";
 import { formatContentTypeLabel, isValidCmsFqn } from "../../adapters/cms/contentTypeUtils";
 
+const EM_BLOCK_SPLIT = /(<(?:em)>[\s\S]*?<\/(?:em)>)/g;
+const EM_BLOCK_EXEC = /^<(?:em)>([\s\S]*?)<\/(?:em)>$/;
+const STRAY_TAG = /<\/?[a-zA-Z][^>]*>/g;
+const ROUTE_TOKEN = /:([A-Za-z_][A-Za-z0-9_]*)/g;
+
 /** Formats an ISO date string for display; echoes the raw string on failure. */
 function formatPublishedDate(dateStr: string): string {
 	const date = new Date(dateStr);
@@ -43,7 +48,7 @@ function resolveRoute(pattern: string, item: CmsSearchItem): string | null {
 		contentType: item.contentType,
 	};
 	let failed = false;
-	const out = pattern.replace(/:([A-Za-z_][A-Za-z0-9_]*)/g, (_match, token: string) => {
+	const out = pattern.replace(ROUTE_TOKEN, (_match, token: string) => {
 		const value = tokens[token];
 		if (value == null || value === "") {
 			failed = true;
@@ -54,6 +59,44 @@ function resolveRoute(pattern: string, item: CmsSearchItem): string | null {
 	return failed ? null : out;
 }
 
+/**
+ * - Decodes every HTML entity the browser knows (named + numeric).
+ * - Runs twice to unwrap the double-encoding CMS search sometimes returns.
+ */
+function decodeEntities(input: string): string {
+	if (typeof document === "undefined") return input;
+	const el = document.createElement("textarea");
+	const pass = (s: string) => {
+		el.innerHTML = s;
+		return el.value;
+	};
+	return pass(pass(input));
+}
+
+/**
+ * Parses a snippet that may contain `<em>…</em>` segments and renders it as highlighted text,
+ * and strips any other HTML tags so their content renders as plain text.
+ */
+function renderHighlightedSnippet(snippet: string): ReactNode[] {
+	const decoded = decodeEntities(snippet);
+	const parts = decoded.split(EM_BLOCK_SPLIT);
+	return parts.map((part, i) => {
+		const emphasisMatch = EM_BLOCK_EXEC.exec(part);
+		if (emphasisMatch) {
+			return (
+				<mark key={i} className="bg-yellow-200 dark:bg-yellow-700/60 rounded-sm px-0.5">
+					{emphasisMatch[1].replace(STRAY_TAG, "")}
+				</mark>
+			);
+		}
+		return part.replace(STRAY_TAG, "");
+	});
+}
+
+function toPlainText(raw: string): string {
+	return decodeEntities(raw).replace(STRAY_TAG, "");
+}
+
 interface CmsResultRowProps {
 	node: unknown;
 	source: CmsSourceConfig;
@@ -71,12 +114,16 @@ export function CmsResultRow({ node, source }: CmsResultRowProps) {
 
 	const content: ReactNode = (
 		<>
-			<span className="font-medium">{item.title ?? "—"}</span>
+			<span className="font-medium">{item.title ? renderHighlightedSnippet(item.title) : "—"}</span>
 			{item.highlightedSnippet && (
-				<p className="text-sm text-muted-foreground">{item.highlightedSnippet}</p>
+				<p className="text-sm text-neutral-600 dark:text-neutral-300">
+					{renderHighlightedSnippet(item.highlightedSnippet)}
+				</p>
 			)}
 			{subtitleParts.length > 0 && (
-				<p className="text-sm text-muted-foreground">{subtitleParts.join(" · ")}</p>
+				<p className="text-sm text-neutral-600 dark:text-neutral-300">
+					{subtitleParts.join(" · ")}
+				</p>
 			)}
 		</>
 	);
@@ -90,7 +137,7 @@ export function CmsResultRow({ node, source }: CmsResultRowProps) {
 			<Link
 				to={href}
 				className="block hover:bg-accent rounded-md px-3 -mx-3 py-1 transition-colors"
-				aria-label={`View content: ${item.title}`}
+				aria-label={`View content: ${item.title ? toPlainText(item.title) : "content"}`}
 			>
 				{content}
 			</Link>

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/components/results/DefaultResultRow.tsx

@@ -86,7 +86,9 @@ export function DefaultResultRow({ node, source }: DefaultResultRowProps) {
 		<>
 			<span className="font-medium">{title ?? "—"}</span>
 			{subtitleParts.length > 0 && (
-				<p className="text-sm text-muted-foreground">{subtitleParts.join(" · ")}</p>
+				<p className="text-sm text-neutral-600 dark:text-neutral-300">
+					{subtitleParts.join(" · ")}
+				</p>
 			)}
 		</>
 	);
@@ -98,6 +100,7 @@ export function DefaultResultRow({ node, source }: DefaultResultRowProps) {
 				<Link
 					to={href}
 					className="block hover:bg-accent rounded-md px-3 -mx-3 py-1 transition-colors"
+					aria-label={`View: ${title ?? "result"}`}
 				>
 					{content}
 				</Link>

package/lib/templates/project/reactinternalapp/_p_/_m_/_w_/_a_/src/_f_/search/types.ts

@@ -31,9 +31,7 @@ export type { CmsSourceConfig };
  * it explicitly.
  */
 export type DisplayField =
-	| string
-	| { name: string; raw: true }
-	| { name: string; subfields: DisplayField[] };
+	string | { name: string; raw: true } | { name: string; subfields: DisplayField[] };
 
 /** Configuration for one SObject source in a search experience. */
 export interface SObjectSourceConfig {