@salesforce/ui-bundle-template-app-angular-template-b2x 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/angularextapp/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.6.3",
-    "@salesforce/platform-sdk": "^12.6.3",
+    "@salesforce/angular-plugin-ui-bundle": "^12.7.0",
+    "@salesforce/platform-sdk": "^12.7.0",
     "@spartan-ng/brain": "^1.3.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -60,8 +60,8 @@
     "tailwindcss": "^4.0.0",
     "typescript": "~5.9.2",
     "typescript-eslint": "^8.0.0",
-    "vitest": "^4.1.0",
-    "@salesforce/graphiti": "^12.6.3"
+    "vitest": "^4.1.11",
+    "@salesforce/graphiti": "^12.7.0"
   },
   "overrides": {
     "undici": "^7.28.0"

package/dist/force-app/main/default/uiBundles/angularextapp/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/dist/force-app/main/default/uiBundles/angularextapp/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/dist/force-app/main/default/uiBundles/angularextapp/src/app/features/object-search/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/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-angular-template-b2x",
-  "version": "12.6.3",
+  "version": "12.7.0",
   "description": "Salesforce Angular external app template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "",