@salesforce/ui-bundle-template-app-react-template-b2e 12.6.3 → 12.7.0

package/dist/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

package/dist/force-app/main/default/uiBundles/reactinternalapp/package.json

@@ -19,8 +19,8 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/platform-sdk": "^12.6.3",
-    "@salesforce/ui-bundle": "^12.6.3",
+    "@salesforce/platform-sdk": "^12.7.0",
+    "@salesforce/ui-bundle": "^12.7.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.6.3",
-    "@salesforce/vite-plugin-ui-bundle": "^12.6.3",
+    "@salesforce/graphiti": "^12.7.0",
+    "@salesforce/vite-plugin-ui-bundle": "^12.7.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/dist/force-app/main/default/uiBundles/reactinternalapp/src/appLayout.tsx

@@ -1,5 +1,5 @@
 import { AgentforceConversationClient } from "./components/AgentforceConversationClient";
-import { Outlet, Link, useLocation } from "react-router";
+import { Outlet, Link, useLocation, matchPath } from "react-router";
 import { getAllRoutes } from "./router-utils";
 import { useEffect, useId, useRef, useState } from "react";
 
@@ -9,8 +9,10 @@ export default function AppLayout() {
 	const navId = useId();
 	const outletWrapperRef = useRef<HTMLDivElement>(null);
 	const previousPathname = useRef<string | null>(null);
+	const menuButtonRef = useRef<HTMLButtonElement>(null);
 
 	useEffect(() => {
+		if (matchPath("/search", location.pathname)) document.title = "Search | MyApp";
 		if (previousPathname.current !== null && previousPathname.current !== location.pathname) {
 			const wrapper = outletWrapperRef.current;
 			const target = wrapper?.querySelector<HTMLElement>("h1");
@@ -64,6 +66,7 @@ export default function AppLayout() {
 							React App
 						</Link>
 						<button
+							ref={menuButtonRef}
 							onClick={toggleMenu}
 							className="p-2 rounded-md text-gray-700 hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-blue-500"
 							aria-label="Toggle menu"
@@ -94,7 +97,10 @@ export default function AppLayout() {
 									<Link
 										key={item.path}
 										to={item.path}
-										onClick={() => setIsOpen(false)}
+										onClick={() => {
+											setIsOpen(false);
+											if (isActive(item.path)) menuButtonRef.current?.focus();
+										}}
 										aria-current={isActive(item.path) ? "page" : undefined}
 										className={`px-3 py-2 rounded-md text-sm font-medium transition-colors ${
 											isActive(item.path)

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/components/ui/button.tsx

@@ -5,7 +5,7 @@ import { Slot } from 'radix-ui';
 import { cn } from '../../lib/utils';
 
 const buttonVariants = cva(
-  "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 rounded-lg border border-transparent bg-clip-padding text-sm font-medium focus-visible:ring-3 aria-invalid:ring-3 [&_svg:not([class*='size-'])]:size-4 inline-flex items-center justify-center whitespace-nowrap transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none shrink-0 [&_svg]:shrink-0 outline-none group/button select-none",
+  "focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 rounded-lg border border-transparent bg-clip-padding text-sm font-medium focus-visible:ring-3 aria-invalid:ring-3 [&_svg:not([class*='size-'])]:size-4 inline-flex items-center justify-center whitespace-nowrap transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none shrink-0 [&_svg]:shrink-0 outline-none group/button select-none",
   {
     variants: {
       variant: {
@@ -17,7 +17,7 @@ const buttonVariants = cva(
         ghost:
           'hover:bg-muted hover:text-foreground dark:hover:bg-muted/50 aria-expanded:bg-muted aria-expanded:text-foreground',
         destructive:
-          'bg-destructive/10 hover:bg-destructive/20 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/20 text-red-700 dark:text-destructive focus-visible:border-destructive/40 dark:hover:bg-destructive/30',
+          'bg-destructive/10 hover:bg-destructive/20 dark:bg-destructive/20 text-red-700 dark:text-destructive dark:hover:bg-destructive/30',
         link: 'text-primary underline-offset-4 hover:underline',
       },
       size: {

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/components/ui/checkbox.tsx

@@ -14,7 +14,7 @@ function Checkbox({
     <CheckboxPrimitive.Root
       data-slot="checkbox"
       className={cn(
-        'border-input dark:bg-input/30 data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary data-checked:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 flex size-4 items-center justify-center rounded-[4px] border transition-colors group-has-disabled/field:opacity-50 focus-visible:ring-3 aria-invalid:ring-3 peer relative shrink-0 outline-none after:absolute after:-inset-x-3 after:-inset-y-2 disabled:cursor-not-allowed disabled:opacity-50',
+        'border-input dark:bg-input/30 data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary data-checked:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 flex size-4 items-center justify-center rounded-[4px] border transition-colors group-has-disabled/field:opacity-50 focus-visible:ring-3 aria-invalid:ring-3 peer relative shrink-0 outline-none after:absolute after:-inset-x-3 after:-inset-y-2 disabled:cursor-not-allowed disabled:opacity-50',
         className
       )}
       {...props}

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/components/ui/input.tsx

@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
       type={type}
       data-slot="input"
       className={cn(
-        'dark:bg-input/30 border-input focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 disabled:bg-input/50 dark:disabled:bg-input/80 h-8 rounded-lg border bg-transparent px-2.5 py-1 text-base transition-colors file:h-6 file:text-sm file:font-medium focus-visible:ring-3 aria-invalid:ring-3 md:text-sm file:text-foreground placeholder:text-muted-foreground/70 placeholder:italic w-full min-w-0 outline-none file:inline-flex file:border-0 file:bg-transparent disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50',
+        'dark:bg-input/30 border-input focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 disabled:bg-input/50 dark:disabled:bg-input/80 h-8 rounded-lg border bg-transparent px-2.5 py-1 text-base transition-colors file:h-6 file:text-sm file:font-medium focus-visible:ring-3 aria-invalid:ring-3 md:text-sm file:text-foreground placeholder:text-muted-foreground placeholder:italic w-full min-w-0 outline-none file:inline-flex file:border-0 file:bg-transparent disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50',
         className
       )}
       {...props}

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/components/ui/select.tsx

@@ -42,7 +42,7 @@ function SelectTrigger({
       data-slot="select-trigger"
       data-size={size}
       className={cn(
-        "border-input data-placeholder:text-muted-foreground dark:bg-input/30 dark:hover:bg-input/50 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 gap-1.5 rounded-lg border bg-transparent py-2 pr-2 pl-2.5 text-sm transition-colors select-none focus-visible:ring-3 aria-invalid:ring-3 data-[size=default]:h-8 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] *:data-[slot=select-value]:gap-1.5 [&_svg:not([class*='size-'])]:size-4 flex w-fit items-center justify-between whitespace-nowrap outline-none disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        "border-input data-placeholder:text-muted-foreground dark:bg-input/30 dark:hover:bg-input/50 focus-visible:border-ring focus-visible:ring-ring aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 gap-1.5 rounded-lg border bg-transparent py-2 pr-2 pl-2.5 text-sm transition-colors select-none focus-visible:ring-3 aria-invalid:ring-3 data-[size=default]:h-8 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] *:data-[slot=select-value]:gap-1.5 [&_svg:not([class*='size-'])]:size-4 flex w-fit items-center justify-between whitespace-nowrap outline-none disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center [&_svg]:pointer-events-none [&_svg]:shrink-0",
         className
       )}
       {...props}

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/features/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/dist/force-app/main/default/uiBundles/reactinternalapp/src/features/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/dist/force-app/main/default/uiBundles/reactinternalapp/src/features/search/components/MergedSearchResults.tsx

@@ -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/dist/force-app/main/default/uiBundles/reactinternalapp/src/features/search/components/SourceSection.tsx

@@ -159,7 +159,7 @@ export function SourceSection({
 					)}
 
 					{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)}

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/features/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 {

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/pages/AccountObjectDetailPage.tsx

@@ -77,6 +77,7 @@ export default function AccountObjectDetail() {
 	const { recordId } = useParams();
 	const navigate = useNavigate();
 	const mainRef = useRef<HTMLElement>(null);
+	const [completionAnnouncement, setCompletionAnnouncement] = useState("");
 
 	const {
 		data: account,
@@ -97,9 +98,19 @@ export default function AccountObjectDetail() {
 	}, [pageTitle]);
 
 	useEffect(() => {
-		if (loading) return;
-		const heading = mainRef.current?.querySelector<HTMLElement>("h1");
+		if (loading) {
+			setCompletionAnnouncement("");
+			return;
+		}
+		const main = mainRef.current;
+		const heading = main?.querySelector<HTMLElement>("h1");
 		if (heading) {
+			const active = document.activeElement;
+			if (active && active !== document.body && !main?.contains(active)) {
+				setCompletionAnnouncement(heading.textContent ?? "");
+				return;
+			}
+			setCompletionAnnouncement("");
 			if (!heading.hasAttribute("tabindex")) heading.setAttribute("tabindex", "-1");
 			heading.focus();
 		}
@@ -108,7 +119,7 @@ export default function AccountObjectDetail() {
 	return (
 		<main ref={mainRef} className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
 			<div role="status" aria-live="polite" className="sr-only">
-				{loading ? "Loading account" : ""}
+				{loading ? "Loading account" : completionAnnouncement}
 			</div>
 			{loading && <AccountDetailSkeleton />}
 			{error && <AccountDetailError onBack={() => navigate(-1)} />}

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/pages/NotFound.tsx

@@ -1,18 +1,25 @@
-import { Link } from 'react-router';
+/**
+ * Copyright (c) 2026, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+
+import { Link } from "react-router";
 
 export default function NotFound() {
-  return (
-    <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
-      <div className="text-center">
-        <h1 className="text-4xl font-bold text-gray-900 mb-4">404</h1>
-        <p className="text-lg text-gray-600 mb-8">Page not found</p>
-        <Link
-          to="/"
-          className="inline-block px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 transition-colors"
-        >
-          Go to Home
-        </Link>
-      </div>
-    </div>
-  );
+	return (
+		<main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
+			<title>Page Not Found | MyApp</title>
+			<div className="text-center">
+				<h1 className="text-4xl font-bold text-gray-900 mb-4">404</h1>
+				<p className="text-lg text-gray-600 mb-8">Page not found</p>
+				<Link
+					to="/"
+					className="inline-block px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 transition-colors"
+				>
+					Go to Home
+				</Link>
+			</div>
+		</main>
+	);
 }

package/dist/force-app/main/default/uiBundles/reactinternalapp/src/styles/global.css

@@ -75,7 +75,7 @@
   --destructive: oklch(0.577 0.245 27.325);
   --border: oklch(0.922 0 0);
   --input: oklch(0.922 0 0);
-  --ring: oklch(0.708 0 0);
+  --ring: oklch(0.556 0 0);
   --chart-1: oklch(0.646 0.222 41.116);
   --chart-2: oklch(0.6 0.118 184.704);
   --chart-3: oklch(0.398 0.07 227.392);
@@ -127,7 +127,7 @@
 
 @layer base {
   * {
-    @apply border-border outline-ring/50;
+    @apply border-border outline-ring;
   }
   body {
     @apply bg-background text-foreground;

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@salesforce/ui-bundle-template-base-sfdx-project",
-  "version": "12.6.3",
+  "version": "12.7.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/ui-bundle-template-base-sfdx-project",
-      "version": "12.6.3",
+      "version": "12.7.0",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "fast-xml-parser": "^5.9.3",

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/ui-bundle-template-base-sfdx-project",
-  "version": "12.6.3",
+  "version": "12.7.0",
   "description": "Base SFDX project template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "publishConfig": {

package/dist/scripts/network-senders.mjs

@@ -0,0 +1,84 @@
+import { execFileSync } from 'node:child_process';
+import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { join, resolve, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { XMLBuilder } from 'fast-xml-parser';
+import { parseNetworkDocument, NetworkXmlError } from './org-setup-xml.mjs';
+import { escapeSoqlString } from './org-setup-utils.mjs';
+
+const builder = new XMLBuilder({
+  ignoreAttributes: false,
+  commentPropName: '#comment',
+  format: true,
+  indentBy: '    ',
+  suppressEmptyNode: true,
+});
+
+export function preserveNetworkSenders(projectDir, targetOrg, run = execFileSync) {
+  const project = JSON.parse(readFileSync(join(projectDir, 'sfdx-project.json'), 'utf8'));
+  const files = (project.packageDirectories ?? []).flatMap(({ path }) => {
+    const dir = join(projectDir, path, 'main/default/networks');
+    if (!existsSync(dir)) return [];
+    return readdirSync(dir)
+      .filter((name) => name.endsWith('.network-meta.xml'))
+      .map((name) => ({ name: name.slice(0, -'.network-meta.xml'.length), path: join(dir, name) }));
+  });
+  if (!files.length) return;
+
+  const names = [...new Set(files.map(({ name }) => `'${escapeSoqlString(name)}'`))];
+  const response = JSON.parse(run('sf', [
+    'data', 'query', '--target-org', targetOrg,
+    '--query', `SELECT Name, EmailSenderAddress FROM Network WHERE Name IN (${names.join(',')})`,
+    '--json',
+  ], { cwd: projectDir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 60000 }));
+  if (response.status !== 0 || !Array.isArray(response.result?.records) || !response.result.done) {
+    throw new Error('Could not read all target Network sender addresses; deployment stopped.');
+  }
+  const senders = new Map(response.result.records.map((record) => [record.Name, record.EmailSenderAddress]));
+
+  const updates = files.map((file) => {
+    const original = readFileSync(file.path, 'utf8');
+    const document = parseNetworkDocument(original);
+    const network = document.Network;
+    let changed = false;
+    if (senders.has(file.name)) {
+      const sender = senders.get(file.name);
+      if (typeof sender !== 'string' || !sender.trim()) {
+        throw new Error(`The target Network "${file.name}" has no sender address; deployment stopped.`);
+      }
+      if (typeof network.emailSenderAddress !== 'string') {
+        throw new NetworkXmlError(`Expected one emailSenderAddress in ${file.name}.network-meta.xml`);
+      }
+      if (network.emailSenderAddress !== sender) {
+        network.emailSenderAddress = sender;
+        changed = true;
+      }
+    }
+    // Sender changes belong to the site's Administration workspace.
+    if ('newSenderAddress' in network) {
+      delete network.newSenderAddress;
+      changed = true;
+    }
+    return { ...file, xml: changed ? builder.build(document) : original, changed };
+  });
+
+  for (const file of updates) {
+    if (file.changed) writeFileSync(file.path, file.xml);
+  }
+}
+
+if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
+  const args = process.argv.slice(2);
+  if (args.length !== 2 || args[0] !== '--target-org' || !args[1].trim()) {
+    console.error('Usage: node scripts/network-senders.mjs --target-org <alias>');
+    process.exitCode = 1;
+  } else {
+    try {
+      preserveNetworkSenders(resolve(dirname(fileURLToPath(import.meta.url)), '..'), args[1]);
+      console.log('Network metadata prepared with the target org sender addresses.');
+    } catch (error) {
+      console.error(`Network metadata preparation failed: ${error.message}`);
+      process.exitCode = 1;
+    }
+  }
+}

package/dist/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/dist/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/ui-bundle-template-app-react-template-b2e",
-  "version": "12.6.3",
+  "version": "12.7.0",
   "description": "Salesforce React internal app template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "",
@@ -23,10 +23,10 @@
   "devDependencies": {
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "@vitest/coverage-v8": "^4.1.0",
+    "@vitest/coverage-v8": "^4.1.11",
     "react-dom": "^19.2.1",
     "react-router": "^8.0.0",
-    "vitest": "^4.1.0"
+    "vitest": "^4.1.11"
   },
   "nx": {
     "targets": {