@salesforce/templates 66.17.3 → 66.17.4

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

@@ -14118,9 +14118,9 @@
       }
     },
     "node_modules/ip-address": {
-      "version": "10.7.4",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.4.tgz",
-      "integrity": "sha512-DWBMKyeM25D70nrIiTkgQth59/G+naKOTep6huF9j+GmeK3DMD60Zvxg5d5qQnz+38AHgou6ean2LECX+lrKDg==",
+      "version": "10.7.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.5.tgz",
+      "integrity": "sha512-t2v0rkILYv9WXmSL7TpAaU3HXgaFYOPUcH3QHgwQ++gpJuH3bqyMy4Fvt/DJCTKwzH3Cf+bAp5W/mFL39KPLzA==",
       "dev": true,
       "license": "MIT",
       "engines": {

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

@@ -3,6 +3,175 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.12.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.12.0...v12.12.1) (2026-10-20)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.12.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.11.0...v12.12.0) (2026-10-14)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.11.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.10.0...v12.11.0) (2026-10-07)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [12.10.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.9.0...v12.10.0) (2026-10-06)
+
+**Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project
+
+
+
+
+
+## [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
+
+
+
+
+
 ## [12.4.4](https://github.com/salesforce-experience-platform-emu/webapps/compare/v12.4.3...v12.4.4) (2026-09-03)
 
 **Note:** Version bump only for package @salesforce/ui-bundle-template-base-sfdx-project

package/lib/templates/project/angularintapp/README.md

@@ -1,69 +1,107 @@
-# Salesforce DX Project: Next Steps
+# Angular Internal App
 
-Now that you’ve created a Salesforce DX project, what’s next? Here are some documentation resources to get you started.
+An internal Angular starter template for the Salesforce platform. Includes an Agentforce conversation client and object search across Salesforce records; intended for internal (non-Experience Cloud) deployment via a CustomApplication in the Lightning Experience App Launcher. Built with Angular (standalone components), Spartan NG (`@spartan-ng/brain` primitives with helm UI components copied into `src/app/shared/`), Tailwind CSS, Lucide icons (`@ng-icons/lucide`), and TypeScript.
 
-## Web app: install, build, and dev server
+## What's included
 
-From the **SFDX project root** (this directory), run:
+This project ships the UI Bundle plus a CustomApplication that surfaces it in the Lightning Experience App Launcher. No additional data-model metadata (objects, Apex, etc.) is included — bring your own data model.
+
+```
+force-app/main/default/
+├── applications/                 # CustomApplication (App Launcher entry)
+├── permissionsets/               # Permission sets
+└── uiBundles/
+    └── angularintapp/            # Angular UI Bundle (source, config, tests)
+```
+
+## Getting started
+
+Install project dependencies and start the local dev server:
 
 ```bash
+npm install
 npm run sf-project-setup
 ```
 
-This installs dependencies in the UI Bundle, builds it, and starts the Vite dev server. Use this after cloning or extracting the project.
+This installs the UI Bundle dependencies, builds the app, and starts the Salesforce Angular dev server (`sf-angular-serve`). For manual build and test instructions, see the [UI Bundle README](force-app/main/default/uiBundles/angularintapp/README.md).
+
+## Add features
+
+Use the features CLI to install additional UI features into the UI Bundle.
+
+List all available features:
+
+```bash
+npx @salesforce/ui-bundle-features-experimental list
+```
+
+Get details about a specific feature (description, dependencies, files, and integration examples):
+
+```bash
+npx @salesforce/ui-bundle-features-experimental describe <feature-name>
+```
+
+Install a feature:
 
-## Set up the org
+```bash
+npx @salesforce/ui-bundle-features-experimental install <feature-name> --ui-bundle-dir angularintapp
+```
+
+After installation, the CLI will list any `__example__` files that need manual integration. Read each example file to see the integration pattern, apply it to the target file, then delete the example file.
+
+## Deploy
+
+### Deploy everything (CustomApplication + UI Bundle)
+
+```bash
+cd force-app/main/default/uiBundles/angularintapp && npm install && npm run build && cd -
+sf project deploy start --source-dir force-app --target-org <alias>
+```
 
-`npm run setup` configures a target org from this project in one command: it logs in
-(a required precondition — auto-skipped if the org is already connected), deploys
-metadata, assigns permission sets, imports sample data, refreshes the GraphQL
-schema/types, and builds the UI Bundle. When `--target-org` is omitted it uses your
-default org or, in an interactive terminal, prompts you to pick one.
+### Deploy the UI Bundle only
 
 ```bash
-npm run setup -- --target-org <alias>     # or omit --target-org to use the default / pick
+cd force-app/main/default/uiBundles/angularintapp && npm install && npm run build && cd -
+sf project deploy start --source-dir force-app/main/default/uiBundles --target-org <alias>
 ```
 
-Setup does **not** start the dev server. Once the org is set up, use `dev:preview` to
-refresh the GraphQL types against the org and launch the Vite dev server on its own:
+Replace `<alias>` with your target org alias.
+
+## Setup scripts
+
+Two npm scripts at the project root streamline getting started and deployment.
+
+**`npm run sf-project-setup`** — installs the UI Bundle dependencies, builds the app, and starts the dev server (see [Getting started](#getting-started)).
+
+**`npm run setup`** — runs the full deployment setup in one command: org login (a required precondition, auto-skipped if already connected), UI Bundle build, deploy metadata, fetch GraphQL schema, and run codegen. It no longer starts the dev server — run `npm run dev:preview` for that:
 
 ```bash
-npm run dev:preview
+# Install project dependencies first (required before running setup)
+npm install
+
+npm run setup -- --target-org <alias>
 ```
 
-### Setup configuration (`scripts/org-setup.config.json`)
-
-`org-setup.config.json` controls which steps run and how. Every top-level section is
-optional; an absent section hides its step. It is validated against a shared schema
-at build/CI time and again at the start of every `npm run setup`, so a malformed
-config fails fast rather than misbehaving.
-
-```jsonc
-{
-  "permsetAssignments": {
-    "assignments": {
-      "My_Access": { "assignee": "currentUser" }
-    }
-  },
-  "role": { "assignee": "currentUser", "roleName": "Admin" },
-  "selfRegistration": {
-    "selfRegProfile": "My Prospect Profile",
-    "accountName": "My Self-Registration"
-  }
-}
+Running without flags presents an interactive step picker. Pass `--yes` to skip it and run all steps immediately:
+
+```bash
+npm run setup -- --target-org <alias> --yes
 ```
 
-When a `selfRegistration` section is present, setup runs a **license pre-check**
-before configuring self-registration: it derives the required `UserLicense` from the
-configured `selfRegProfile` (matched on the stable `LicenseDefinitionKey`, not the
-display name) and, if the org lacks that license or has no available seats, **warns
-and skips** self-registration instead of reporting success — so prospect login can't
-silently fail on an under-provisioned org. No separate license field is configured;
-the requirement always follows the profile the flow assigns.
+Common options:
+
+| Option                    | Description                                     |
+| ------------------------- | ----------------------------------------------- |
+| `--target-org <alias>`    | Target org. If omitted, uses default org/prompt |
+| `--skip-deploy`           | Do not deploy metadata                          |
+| `--skip-graphql`          | Skip GraphQL schema fetch and codegen           |
+| `--skip-ui-bundle-build`  | Skip `npm install` and UI Bundle build          |
+| `--ui-bundle-name <name>` | UI Bundle folder name when multiple exist       |
+| `-y, --yes`               | Skip interactive step picker; run all steps     |
 
-## How Do You Plan to Deploy Your Changes?
+> Login is a required precondition (no `--skip-login`), and the dev server is no longer part of setup (no `--skip-dev`); both flags are accepted but ignored. To start the dev server after setup, run `npm run dev:preview`.
 
-Do you want to deploy a set of changes, or create a self-contained application? Choose a [development model](https://developer.salesforce.com/tools/vscode/en/user-guide/development-models).
+For all options: `npm run setup -- --help`.
 
 ## Configure Your Salesforce DX Project
 

package/lib/templates/project/angularintapp/_p_/_m_/_w_/_a_/README.md

@@ -1,6 +1,6 @@
 # Base Angular App
 
-Base Angular App is a template application that demonstrates how to build an Angular UI Bundle on the Salesforce platform with the Angular CLI, TypeScript, Tailwind, and the Salesforce UI Bundle SDK. It provides a minimal shell (home, 404), routing with standalone components and signals, so feature apps can extend it via the patches pipeline.
+Base Angular App is a template application that demonstrates how to build an Angular UI Bundle on the Salesforce platform with the Angular CLI, TypeScript, Tailwind, Spartan NG (shadcn/ui for Angular), and the Salesforce UI Bundle SDK. It provides a minimal shell (home, 404), routing with standalone components and signals, so feature apps can extend it via the patches pipeline.
 
 This UI Bundle lives inside an SFDX project. The project root is the directory that contains `force-app/` and `sfdx-project.json`. Run the commands in the sections below from the paths indicated.
 

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

@@ -18,8 +18,8 @@
         "@ng-icons/core": "^32.2.0",
         "@ng-icons/lucide": "^32.2.0",
         "@salesforce/agentforce-conversation-client": "^12.0.0",
-        "@salesforce/angular-plugin-ui-bundle": "^12.4.4",
-        "@salesforce/platform-sdk": "^12.4.4",
+        "@salesforce/angular-plugin-ui-bundle": "^12.12.1",
+        "@salesforce/platform-sdk": "^12.12.1",
         "@spartan-ng/brain": "^1.3.1",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
@@ -38,7 +38,7 @@
         "@graphql-codegen/typescript-operations": "^5.0.6",
         "@graphql-eslint/eslint-plugin": "^4.1.0",
         "@playwright/test": "^1.49.0",
-        "@salesforce/graphiti": "^12.4.4",
+        "@salesforce/graphiti": "^12.12.1",
         "@spartan-ng/cli": "^1.3.1",
         "@tailwindcss/postcss": "^4.0.0",
         "angular-eslint": "^21.0.0",
@@ -51,7 +51,7 @@
         "tailwindcss": "^4.0.0",
         "typescript": "~5.9.2",
         "typescript-eslint": "^8.0.0",
-        "vitest": "^4.1.0"
+        "vitest": "^4.1.11"
       },
       "engines": {
         "node": ">=22"
@@ -14137,9 +14137,9 @@
       }
     },
     "node_modules/ip-address": {
-      "version": "10.7.4",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.4.tgz",
-      "integrity": "sha512-DWBMKyeM25D70nrIiTkgQth59/G+naKOTep6huF9j+GmeK3DMD60Zvxg5d5qQnz+38AHgou6ean2LECX+lrKDg==",
+      "version": "10.7.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.5.tgz",
+      "integrity": "sha512-t2v0rkILYv9WXmSL7TpAaU3HXgaFYOPUcH3QHgwQ++gpJuH3bqyMy4Fvt/DJCTKwzH3Cf+bAp5W/mFL39KPLzA==",
       "dev": true,
       "license": "MIT",
       "engines": {

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

@@ -28,8 +28,8 @@
     "@angular/router": "^21.2.0",
     "@ng-icons/core": "^32.2.0",
     "@ng-icons/lucide": "^32.2.0",
-    "@salesforce/angular-plugin-ui-bundle": "^12.4.4",
-    "@salesforce/platform-sdk": "^12.4.4",
+    "@salesforce/angular-plugin-ui-bundle": "^12.12.1",
+    "@salesforce/platform-sdk": "^12.12.1",
     "@spartan-ng/brain": "^1.3.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -61,8 +61,8 @@
     "tailwindcss": "^4.0.0",
     "typescript": "~5.9.2",
     "typescript-eslint": "^8.0.0",
-    "vitest": "^4.1.0",
-    "@salesforce/graphiti": "^12.4.4"
+    "vitest": "^4.1.11",
+    "@salesforce/graphiti": "^12.12.1"
   },
   "overrides": {
     "undici": "^7.28.0"

package/lib/templates/project/angularintapp/_p_/_m_/_w_/_a_/src/app/_f_/_os_/api/object-search.service.ts

@@ -49,11 +49,9 @@ export class ObjectSearchService {
 		} as TVariables);
 
 		const uiapi = (data as Record<string, unknown>)?.["uiapi"] as
-			| Record<string, unknown>
-			| undefined;
+			Record<string, unknown> | undefined;
 		const queryResult = (uiapi?.["query"] as Record<string, unknown> | undefined)?.[objectName] as
-			| TResult
-			| undefined;
+			TResult | undefined;
 
 		if (!queryResult) {
 			throw new Error(`No ${objectName} data returned`);
@@ -73,8 +71,7 @@ export class ObjectSearchService {
 		const data = await this.client.execute<TQuery>(query);
 
 		const uiapi = (data as Record<string, unknown>)?.["uiapi"] as
-			| Record<string, unknown>
-			| undefined;
+			Record<string, unknown> | undefined;
 		const aggregate = (uiapi?.["aggregate"] as Record<string, unknown> | undefined)?.[
 			objectName
 		] as { edges?: Array<{ node?: { aggregate?: Record<string, unknown> } }> } | undefined;

package/lib/templates/project/angularintapp/_p_/_m_/_w_/_a_/src/app/api/graphql-operations-types.ts

@@ -7,8 +7,7 @@ export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> =
 	[_ in K]?: never;
 };
 export type Incremental<T> =
-	| T
-	| { [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never };
+	T | { [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
 	ID: { input: string; output: string };

package/lib/templates/project/angularintapp/_p_/_m_/_w_/_a_/src/app/components/ui/button/button.ts

@@ -18,14 +18,7 @@ import { SpinnerComponent } from '../spinner/spinner';
 
 export type AppButtonAppearance = 'filled' | 'outlined' | 'text' | 'destructive';
 export type AppButtonSize =
-	| 'default'
-	| 'xs'
-	| 'sm'
-	| 'lg'
-	| 'icon'
-	| 'icon-xs'
-	| 'icon-sm'
-	| 'icon-lg';
+	'default' | 'xs' | 'sm' | 'lg' | 'icon' | 'icon-xs' | 'icon-sm' | 'icon-lg';
 
 const APPEARANCE_TO_VARIANT: Record<AppButtonAppearance, string> = {
 	filled: 'default',

package/lib/templates/project/angularintapp/_p_/_m_/_w_/_a_/src/app/components/ui/dialog/dialog.html

@@ -10,7 +10,7 @@
 		<div hlmDialogHeader>
 			<ng-content select="[header]" />
 		</div>
-		<div class="text-sm">
+		<div class="min-w-0 text-sm">
 			<ng-content />
 		</div>
 		<div hlmDialogFooter>

package/lib/templates/project/angularintapp/_p_/_m_/_w_/_a_/src/app/components/ui/icon/icon.ts

@@ -12,13 +12,16 @@ import {
 	lucideChevronDown,
 	lucideChevronRight,
 	lucideCircleAlert,
+	lucideFile,
 	lucideFileQuestion,
 	lucideGlobe,
+	lucideImage,
 	lucideListFilter,
 	lucideLogIn,
 	lucideLogOut,
 	lucideSearch,
 	lucideSearchX,
+	lucideUpload,
 	lucideUser,
 	lucideUserPen,
 	lucideUserPlus,
@@ -43,6 +46,9 @@ export const APP_ICONS = {
 	notFound: lucideFileQuestion,
 	globe: lucideGlobe,
 	check: lucideCheck,
+	image: lucideImage,
+	upload: lucideUpload,
+	file: lucideFile,
 } as const;
 
 export type AppIconName = keyof typeof APP_ICONS;

package/lib/templates/project/angularintapp/package.json

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

package/lib/templates/project/angularintapp/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/lib/templates/project/angularintapp/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/angularintapp/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/reactexternalapp/_p_/_m_/_w_/_a_/package-lock.json

@@ -16999,9 +16999,9 @@
       }
     },
     "node_modules/ip-address": {
-      "version": "10.7.4",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.4.tgz",
-      "integrity": "sha512-DWBMKyeM25D70nrIiTkgQth59/G+naKOTep6huF9j+GmeK3DMD60Zvxg5d5qQnz+38AHgou6ean2LECX+lrKDg==",
+      "version": "10.7.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.5.tgz",
+      "integrity": "sha512-t2v0rkILYv9WXmSL7TpAaU3HXgaFYOPUcH3QHgwQ++gpJuH3bqyMy4Fvt/DJCTKwzH3Cf+bAp5W/mFL39KPLzA==",
       "license": "MIT",
       "engines": {
         "node": ">= 12"

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

@@ -16921,9 +16921,9 @@
       }
     },
     "node_modules/ip-address": {
-      "version": "10.7.4",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.4.tgz",
-      "integrity": "sha512-DWBMKyeM25D70nrIiTkgQth59/G+naKOTep6huF9j+GmeK3DMD60Zvxg5d5qQnz+38AHgou6ean2LECX+lrKDg==",
+      "version": "10.7.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.5.tgz",
+      "integrity": "sha512-t2v0rkILYv9WXmSL7TpAaU3HXgaFYOPUcH3QHgwQ++gpJuH3bqyMy4Fvt/DJCTKwzH3Cf+bAp5W/mFL39KPLzA==",
       "license": "MIT",
       "engines": {
         "node": ">= 12"

package/lib/templates/uiBundles/angularbasic/package-lock.json

@@ -14118,9 +14118,9 @@
       }
     },
     "node_modules/ip-address": {
-      "version": "10.7.4",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.4.tgz",
-      "integrity": "sha512-DWBMKyeM25D70nrIiTkgQth59/G+naKOTep6huF9j+GmeK3DMD60Zvxg5d5qQnz+38AHgou6ean2LECX+lrKDg==",
+      "version": "10.7.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.5.tgz",
+      "integrity": "sha512-t2v0rkILYv9WXmSL7TpAaU3HXgaFYOPUcH3QHgwQ++gpJuH3bqyMy4Fvt/DJCTKwzH3Cf+bAp5W/mFL39KPLzA==",
       "dev": true,
       "license": "MIT",
       "engines": {

package/lib/templates/uiBundles/reactbasic/package-lock.json

@@ -16902,9 +16902,9 @@
       }
     },
     "node_modules/ip-address": {
-      "version": "10.7.4",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.4.tgz",
-      "integrity": "sha512-DWBMKyeM25D70nrIiTkgQth59/G+naKOTep6huF9j+GmeK3DMD60Zvxg5d5qQnz+38AHgou6ean2LECX+lrKDg==",
+      "version": "10.7.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.5.tgz",
+      "integrity": "sha512-t2v0rkILYv9WXmSL7TpAaU3HXgaFYOPUcH3QHgwQ++gpJuH3bqyMy4Fvt/DJCTKwzH3Cf+bAp5W/mFL39KPLzA==",
       "license": "MIT",
       "engines": {
         "node": ">= 12"

package/lib/templates/uiBundles/vuebasic/package-lock.json

@@ -9884,9 +9884,9 @@
       }
     },
     "node_modules/ip-address": {
-      "version": "10.7.4",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.4.tgz",
-      "integrity": "sha512-DWBMKyeM25D70nrIiTkgQth59/G+naKOTep6huF9j+GmeK3DMD60Zvxg5d5qQnz+38AHgou6ean2LECX+lrKDg==",
+      "version": "10.7.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.5.tgz",
+      "integrity": "sha512-t2v0rkILYv9WXmSL7TpAaU3HXgaFYOPUcH3QHgwQ++gpJuH3bqyMy4Fvt/DJCTKwzH3Cf+bAp5W/mFL39KPLzA==",
       "dev": true,
       "license": "MIT",
       "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/templates",
-  "version": "66.17.3",
+  "version": "66.17.4",
   "description": "Salesforce JS library for templates",
   "bugs": "https://github.com/forcedotcom/salesforcedx-templates/issues",
   "repository": {
@@ -16,7 +16,7 @@
     "/messages"
   ],
   "dependencies": {
-    "@salesforce/kit": "^4.0.0",
+    "@salesforce/kit": "^4.0.1",
     "ejs": "^3.1.10",
     "got": "^11.8.6",
     "hpagent": "^1.2.0",
@@ -30,7 +30,7 @@
     "@salesforce/dev-scripts": "^14.0.0",
     "@salesforce/prettier-config": "^0.0.4",
     "@tony.ganchev/eslint-plugin-header": "^3.4.4",
-    "@salesforce/ui-bundle-template-app-angular-template-b2e": "^12.4.4",
+    "@salesforce/ui-bundle-template-app-angular-template-b2e": "^12.12.1",
     "@salesforce/ui-bundle-template-app-angular-template-b2x": "^12.12.0",
     "@salesforce/ui-bundle-template-app-react-template-b2e": "^12.9.0",
     "@salesforce/ui-bundle-template-app-react-template-b2x": "^12.9.0",