@salesforce/templates 66.3.3 → 66.4.1

package/README.md

@@ -10,6 +10,16 @@ This repository provides:
 
 - [@salesforce/templates](https://www.npmjs.com/package/@salesforce/templates) to support the library and [Salesforce VS Code extensions](https://github.com/forcedotcom/salesforcedx-vscode/).
 
+### Consumer build requirements (e.g. salesforcedx-vscode)
+
+Repos that **bundle** `@salesforce/templates` (e.g. with esbuild) and use a templates manifest must:
+
+1. **Copy built-in templates into the bundle output** before the bundle step that runs `generateTemplatesManifest`. The published package includes templates at `lib/templates`. You can copy from that path, or use the exported path:
+   - `getBuiltinTemplatesPath` (returns the resolved path to `lib/templates` when not on the web platform; `undefined` on web).
+2. **Wireit / task order**: Ensure the script that populates `dist/templates` (or your equivalent) runs **before** the `vscode:bundle` (or similar) task. Otherwise the bundle step will fail with `ENOENT: no such file or directory, scandir '.../dist/templates'`.
+
+Template paths inside the package are kept short (via placeholders in `lib/templates`) so they stay within Windows path limits used by `pack:verify`.
+
 ## Getting Started
 
 If you're interested in contributing, take a look at the [CONTRIBUTING](CONTRIBUTING.md) guide.

package/lib/generators/baseGenerator.d.ts

@@ -34,7 +34,7 @@ export declare abstract class BaseGenerator<TOptions extends TemplateOptions> ex
     protected outputdir: string;
     protected apiversion: string;
     private customTemplatesRootPath;
-    private readonly _templatesRootPath;
+    protected readonly templatesRootPath: string | undefined;
     /**
      * The constructor for the SfGenerator.
      *

package/lib/generators/baseGenerator.js

@@ -136,7 +136,7 @@ class BaseGenerator extends NotYeoman {
         var _a, _b;
         super(context, cwd);
         this.options = options;
-        this._templatesRootPath = context === null || context === void 0 ? void 0 : context.templatesRootPath;
+        this.templatesRootPath = context === null || context === void 0 ? void 0 : context.templatesRootPath;
         this.apiversion = (_a = options.apiversion) !== null && _a !== void 0 ? _a : getDefaultApiVersion();
         this.outputdir = (_b = options.outputdir) !== null && _b !== void 0 ? _b : this._cwd;
         this.validateOptions();
@@ -147,7 +147,7 @@ class BaseGenerator extends NotYeoman {
      */
     sourceRootWithPartialPath(partialPath) {
         var _a, _b;
-        this.builtInTemplatesRootPath = path.join((_b = (_a = this._templatesRootPath) !== null && _a !== void 0 ? _a : constants_1.dirnameTemplatesDefault) !== null && _b !== void 0 ? _b : '', partialPath);
+        this.builtInTemplatesRootPath = path.join((_b = (_a = this.templatesRootPath) !== null && _a !== void 0 ? _a : constants_1.dirnameTemplatesDefault) !== null && _b !== void 0 ? _b : '', partialPath);
         // set generator source directory to custom templates root if available
         if (!this.customTemplatesRootPath) {
             this.sourceRoot(path.join(this.builtInTemplatesRootPath));

package/lib/generators/baseGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseGenerator.js","sourceRoot":"","sources":["../../src/generators/baseGenerator.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AA2BH,kFAiCC;AAKD,oDAEC;;AAjED,6BAA6B;AAC7B,6BAA6B;AAC7B,6BAA6B;AAC7B,kCAA8B;AAC9B,kDAG4B;AAkB5B,SAAsB,mCAAmC;iEACvD,aAAsB,EACtB,sBAAsB,GAAG,KAAK,EAC9B,KAAoB,MAAM;QAE1B,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,+CAA+C;YAC/C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;YACnC,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,KAAK,IAAI,GAAG,EAAE,CAAC;gBAClD,MAAM,EAAE,0BAA0B,EAAE,GAAG,2CACrC,yBAAyB,EAC1B,CAAC;gBACF,OAAO,MAAM,0BAA0B,CAAC,GAAG,EAAE,sBAAsB,EAAE,EAAE,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAAgB,CAAC;YAC7B,IAAI,GAAG,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBACnC,MAAM,KAAK,CAAC;YACd,CAAC;YAED,MAAM,kBAAkB,GAAG,aAAa,CAAC;YACzC,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACtC,OAAO,kBAAkB,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,UAAG,CAAC,QAAQ,CAAC,+BAA+B,EAAE,kBAAkB,CAAC,CAClE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;CAAA;AAED;;GAEG;AACH,SAAgB,oBAAoB;IAClC,OAAO,+BAAmB,CAAC;AAC7B,CAAC;AAED,MAAe,SAAS;IAYtB,YAAmB,OAA0B,EAAE,GAAY;;QAXpD,YAAO,GAAY;YACxB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,EAAE;SACX,CAAC;QAOA,IAAI,CAAC,GAAG,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,mCAAI,MAAM,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,oBAAoB,GACxB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,mCAAI,mCAAuB,CAAC;QACxD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QACzD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IAEM,eAAe,CAAC,GAAG,IAAc;QACtC,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QAElC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,eAAe,CAAC,QAAiB;QACtC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAE/C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,IAAI,CAAC;IAC5C,CAAC;IAEM,UAAU,CAAC,QAAiB;QACjC,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEM,YAAY,CAAC,GAAG,IAAc;QACnC,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QAElC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEY,MAAM,CACjB,MAAc,EACd,WAAmB,EACnB,IAA8B;;YAE9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAClE,MAAM,QAAQ,GAAG,IAAA,YAAM,EAAC,QAAQ,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAC;YAE9C,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAC3D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ;qBACrC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;qBAC7B,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBACrB,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;wBACxC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;wBACzC,OAAO;oBACT,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;wBAC1C,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;oBACxC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACzC,CAAC;gBAED,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBACtC,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxD,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;KAAA;IAEO,QAAQ,CAAC,IAAmB,EAAE,IAAY;QAChD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACF;AAED,MAAsB,aAEpB,SAAQ,SAAS;IAUjB;;;;;OAKG;IACH,YACS,OAAiB,EACxB,OAA0B,EAC1B,GAAY;;QAEZ,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAJb,YAAO,GAAP,OAAO,CAAU;QAKxB,IAAI,CAAC,kBAAkB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,CAAC;QACrD,IAAI,CAAC,UAAU,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,oBAAoB,EAAE,CAAC;QAC/D,IAAI,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,mCAAI,IAAI,CAAC,IAAI,CAAC;QAChD,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACI,yBAAyB,CAAC,WAAmB;;QAClD,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACvC,MAAA,MAAA,IAAI,CAAC,kBAAkB,mCAAI,mCAAuB,mCAAI,EAAE,EACxD,WAAW,CACZ,CAAC;QACF,uEAAuE;QACvE,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,IACE,IAAI,CAAC,GAAG,CAAC,UAAU,CACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,WAAW,CAAC,CACrD,EACD,CAAC;gBACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;IACH,CAAC;IAEM,YAAY,CAAC,GAAG,KAAe;QACpC,iEAAiE;QACjE,uFAAuF;QACvF,qDAAqD;QACrD,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,+DAA+D;YAC/D,OAAO,KAAK,CAAC,YAAY,CACvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAyB,EAAE,GAAG,KAAK,CAAC,CACpD,CAAC;QACJ,CAAC;IACH,CAAC;IAEY,GAAG,CAAC,IAIhB;;;YACC,MAAM,GAAG,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,mCAAI,IAAI,CAAC,IAAI,CAAC;YACnC,IAAI,CAAC,uBAAuB,GAAG,MAAM,mCAAmC,CACtE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,gCAAgC,EACtC,KAAK,EACL,IAAI,CAAC,GAAG,CACT,CAAC;YAEF,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEtB,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAClE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACpD,MAAM,SAAS,GAAG,UAAG,CAAC,QAAQ,CAAC,WAAW,EAAE;gBAC1C,SAAS;gBACT;oBACE,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,IAAI,EAAE,CAAC;oBACjE,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,EAAE,CAAC;oBACtE,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,IAAI,EAAE,CAAC;oBACtE,GAAG,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC;iBAChE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI;aACpB,CAAC,CAAC;YAEH,OAAO;gBACL,SAAS;gBACT,OAAO;gBACP,SAAS;aACV,CAAC;QACJ,CAAC;KAAA;CAUF;AA7GD,sCA6GC"}
+{"version":3,"file":"baseGenerator.js","sourceRoot":"","sources":["../../src/generators/baseGenerator.ts"],"names":[],"mappings":"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"}

package/lib/generators/lightningComponentGenerator.js

@@ -25,9 +25,7 @@ class LightningComponentGenerator extends baseGenerator_1.BaseGenerator {
                 throw new Error(i18n_1.nls.localize('MissingAuraDir'));
             }
         }
-        if (utils_1.CreateUtil.getCommandTemplatesInSubdirs('lightningcomponent', {
-            subdir: this.options.type,
-        }).indexOf(this.options.template) < 0) {
+        if (utils_1.CreateUtil.getCommandTemplatesInSubdirs('lightningcomponent', { subdir: this.options.type }, this._fs, this.templatesRootPath).indexOf(this.options.template) < 0) {
             throw new Error(i18n_1.nls.localize('MissingLightningComponentTemplate', [
                 this.options.template,
                 this.options.type,

package/lib/generators/lightningComponentGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"lightningComponentGenerator.js","sourceRoot":"","sources":["../../src/generators/lightningComponentGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lightningComponentGenerator.js","sourceRoot":"","sources":["../../src/generators/lightningComponentGenerator.ts"],"names":[],"mappings":"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"}

package/lib/templates/project/reactb2e/AGENT.md

@@ -26,6 +26,8 @@ Used for SFDX metadata (LWC, Aura, etc.). Scripts here are for the base SFDX tem
 | `npm run prettier` | Format supported metadata files |
 | `npm run prettier:verify` | Check Prettier |
 
+**One-command setup:** From project root run `node scripts/setup-cli.mjs --target-org <alias>` to run login (if needed), deploy, optional permset/data import, GraphQL schema/codegen, web app build, and optionally the dev server. Use `node scripts/setup-cli.mjs --help` for options (e.g. `--skip-login`, `--skip-data`, `--webapp-name`).
+
 Root **does not** run the React app. The root `npm run build` is a no-op for the base SFDX project.
 
 ### 2. React web app (where you do most work)

package/lib/templates/project/reactb2e/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.
 
+# [1.84.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.83.0...v1.84.0) (2026-03-09)
+
+
+### Features
+
+* **template:** add setup-cli and prepare-import-unique-fields scripts ([#240](https://github.com/salesforce-experience-platform-emu/webapps/issues/240)) ([5cad14c](https://github.com/salesforce-experience-platform-emu/webapps/commit/5cad14c9be8176b2faf2429fe8e8a56383aac1ae))
+
+
+
+
+
+# [1.83.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.82.0...v1.83.0) (2026-03-09)
+
+
+### Features
+
+* dedupe with feature skills, rename to webapp-react-* where relevant @W-21338965@ ([#233](https://github.com/salesforce-experience-platform-emu/webapps/issues/233)) ([9e4e4d8](https://github.com/salesforce-experience-platform-emu/webapps/commit/9e4e4d80f4a33575412e1940a8cbfaae6c035a12))
+
+
+
+
+
+# [1.82.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.81.0...v1.82.0) (2026-03-09)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.81.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.80.1...v1.81.0) (2026-03-09)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.80.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.80.0...v1.80.1) (2026-03-09)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.80.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.79.2...v1.80.0) (2026-03-07)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.79.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.79.1...v1.79.2) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.79.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.79.0...v1.79.1) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.79.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.78.0...v1.79.0) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.78.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.77.0...v1.78.0) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.77.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.76.1...v1.77.0) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.76.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.76.0...v1.76.1) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.76.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.75.1...v1.76.0) (2026-03-06)
+
+
+### Features
+
+* (template) add skills for base-app ([#208](https://github.com/salesforce-experience-platform-emu/webapps/issues/208)) ([dd5f7c5](https://github.com/salesforce-experience-platform-emu/webapps/commit/dd5f7c59b0d711cade589620c434836f016c5417))
+
+
+
+
+
+## [1.75.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.75.0...v1.75.1) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.75.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.74.0...v1.75.0) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.74.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.73.1...v1.74.0) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.73.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.73.0...v1.73.1) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.73.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.72.0...v1.73.0) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.72.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.71.3...v1.72.0) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.71.3](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.71.2...v1.71.3) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 ## [1.71.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.71.1...v1.71.2) (2026-03-05)
 
 **Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e → _p_/_m_/_w_/_a_}/package.json

@@ -15,9 +15,9 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/agentforce-conversation-client": "^1.71.2",
-    "@salesforce/sdk-data": "^1.71.2",
-    "@salesforce/webapp-experimental": "^1.71.2",
+    "@salesforce/agentforce-conversation-client": "^1.84.0",
+    "@salesforce/sdk-data": "^1.84.0",
+    "@salesforce/webapp-experimental": "^1.84.0",
     "@tailwindcss/vite": "^4.1.17",
     "@tanstack/react-form": "^1.28.4",
     "class-variance-authority": "^0.7.1",
@@ -28,7 +28,7 @@
     "react-dom": "^19.2.0",
     "react-router": "^7.10.1",
     "shadcn": "^3.8.5",
-    "tailwind-merge": "^3.4.0",
+    "tailwind-merge": "^3.5.0",
     "tailwindcss": "^4.1.17",
     "tw-animate-css": "^1.4.0",
     "zod": "^4.3.6"
@@ -41,7 +41,7 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/vite-plugin-webapp-experimental": "^1.71.2",
+    "@salesforce/vite-plugin-webapp-experimental": "^1.84.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",

package/lib/templates/project/{reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/features/global-search/components/detail → reactb2e/_p_/_m_/_w_/_a_/src/_f_/_gs_/_c_/_det_}/DetailForm.tsx

@@ -13,7 +13,7 @@ import {
 	type PicklistOption,
 	type TransformedLayoutItem,
 } from "../../utils/layoutTransformUtils";
-import { FieldValueDisplay } from "./formatted";
+import { FieldValueDisplay } from "./formatted/FieldValueDisplay";
 import { Section } from "./Section";
 import { SectionRow } from "./SectionRow";
 

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e/src/features/global-search/components/detail → _p_/_m_/_w_/_a_/src/_f_/_gs_/_c_/_det_}/UiApiDetailForm.tsx

@@ -75,7 +75,7 @@ export function UiApiDetailForm({
 
 	const objectInfo: ObjectInfo | null = useMemo(() => {
 		if (!metadata?.fields) return null;
-		const apiName = typeof metadata.apiName === "string" ? metadata.apiName : undefined;
+		const apiName = metadata.ApiName;
 		return {
 			apiName,
 			fields: Object.fromEntries(
@@ -83,7 +83,7 @@ export function UiApiDetailForm({
 					name,
 					{
 						compoundFieldName: f.compoundFieldName ?? undefined,
-						dataType: f.dataType,
+						dataType: f.dataType ?? "",
 					},
 				]),
 			),

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e/src/features/global-search/components → _p_/_m_/_w_/_a_/src/_f_/_gs_/_c_}/search/GlobalSearchInput.tsx

@@ -11,7 +11,7 @@ import { Card, CardContent } from "../../../../components/ui/card";
 import { Input } from "../../../../components/ui/input";
 import { Button } from "../../../../components/ui/button";
 import { Search } from "lucide-react";
-import { OBJECT_API_NAMES } from "../../../../constants";
+import { OBJECT_API_NAMES } from "../../constants";
 import { useObjectInfoBatch } from "../../hooks/useObjectInfoBatch";
 
 const BROWSE_SEGMENT = "browse__all";

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e/src/features/global-search/components → _p_/_m_/_w_/_a_/src/_f_/_gs_/_c_}/search/SearchResultCard.tsx

@@ -34,7 +34,7 @@ import {
 import type { Column, SearchResultRecordData } from "../../types/search/searchResults";
 import { getNestedFieldValue } from "../../utils/fieldUtils";
 import ResultCardFields from "./ResultCardFields";
-import { OBJECT_API_NAMES } from "../../../../constants";
+import { OBJECT_API_NAMES } from "../../constants";
 
 interface SearchResultCardProps {
 	record: SearchResultRecordData;

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e/src/features/global-search → _p_/_m_/_w_/_a_/src/_f_/_gs_}/api/objectDetailService.ts

@@ -36,17 +36,9 @@ export function extractFieldsFromLayout(
 	return optionalFields;
 }
 
-/**
- * Fetches the Full/View layout for an object (REST). Used by detail view to render sections/rows/items.
- *
- * @param objectApiName - Object API name.
- * @param recordTypeId - Record type Id (default master).
- * @param signal - Optional abort signal.
- */
 export async function getLayout(
 	objectApiName: string,
 	recordTypeId: string = DEFAULT_RECORD_TYPE_ID,
-	signal?: AbortSignal,
 ): Promise<LayoutResponse> {
 	const params = new URLSearchParams({
 		layoutType: "Full",
@@ -54,14 +46,10 @@ export async function getLayout(
 		recordTypeId,
 	});
 	return fetchAndValidate(
-		(abortSignal) =>
-			uiApiClient.get(`/layout/${safeEncodePath(objectApiName)}?${params.toString()}`, {
-				signal: abortSignal,
-			}),
+		() => uiApiClient.get(`/layout/${safeEncodePath(objectApiName)}?${params.toString()}`),
 		{
 			schema: LayoutResponseSchema,
 			errorContext: `layout for ${objectApiName}`,
-			signal,
 		},
 	);
 }
@@ -86,24 +74,13 @@ function optionalFieldsToColumns(optionalFields: string[]): Column[] {
 	}));
 }
 
-/**
- * Fetches everything needed for the detail page: layout (REST), object metadata (GraphQL), single record (GraphQL).
- * Layout drives which fields are requested; getRecordByIdGraphQL fetches that field set by Id.
- *
- * @param objectApiName - Object API name.
- * @param recordId - Record Id.
- * @param recordTypeId - Record type (default master).
- * @param signal - Optional abort signal.
- * @returns { layout, record, objectMetadata } for DetailForm / UiApiDetailForm.
- */
 export async function getRecordDetail(
 	objectApiName: string,
 	recordId: string,
 	recordTypeId: string = DEFAULT_RECORD_TYPE_ID,
-	signal?: AbortSignal,
 ): Promise<RecordDetailResult> {
-	const layout = await getLayout(objectApiName, recordTypeId, signal);
-	const objectMetadata = await objectInfoService.getObjectInfoBatch(objectApiName, signal);
+	const layout = await getLayout(objectApiName, recordTypeId);
+	const objectMetadata = await objectInfoService.getObjectInfoBatch(objectApiName);
 	const firstResult = objectMetadata?.results?.[0]?.result;
 	if (!firstResult) {
 		throw new Error(`Object metadata not found for ${objectApiName}`);

package/lib/templates/project/reactb2e/_p_/_m_/_w_/_a_/src/_f_/_gs_/api/objectInfoGraphQLService.ts

@@ -0,0 +1,137 @@
+/**
+ * Object metadata GraphQL service (uiapi.objectInfos).
+ *
+ * Single endpoint for object describe and picklist values. Used by objectInfoService
+ * to implement getObjectInfoBatch and getPicklistValues. Not used directly by UI.
+ *
+ * @module api/objectInfoGraphQLService
+ */
+
+import { getDataSDK, gql } from "@salesforce/sdk-data";
+import type {
+	GetObjectInfosQuery,
+	GetObjectInfosQueryVariables,
+	GetPicklistValuesQuery,
+	GetPicklistValuesQueryVariables,
+	ObjectInfoInput,
+} from "../types/schema";
+
+/**
+ * Builds objectInfos query (metadata only). Uses apiNames only — do not pass objectInfoInputs.
+ */
+const OBJECT_INFOS_QUERY = gql`
+	query GetObjectInfos($apiNames: [String!]!) {
+		uiapi {
+			objectInfos(apiNames: $apiNames) {
+				ApiName
+				label
+				labelPlural
+				nameFields
+				defaultRecordTypeId
+				keyPrefix
+				layoutable
+				queryable
+				searchable
+				updateable
+				deletable
+				createable
+				custom
+				mruEnabled
+				feedEnabled
+				fields {
+					ApiName
+					label
+					dataType
+					relationshipName
+					reference
+					compound
+					compoundFieldName
+					compoundComponentName
+					controllingFields
+					controllerName
+					referenceToInfos {
+						ApiName
+						nameFields
+					}
+				}
+				recordTypeInfos {
+					recordTypeId
+					name
+					master
+					available
+					defaultRecordTypeMapping
+				}
+				themeInfo {
+					color
+					iconUrl
+				}
+				childRelationships {
+					relationshipName
+					fieldName
+					childObjectApiName
+				}
+				dependentFields {
+					controllingField
+				}
+			}
+		}
+	}
+`;
+
+/**
+ * Builds objectInfos query with picklist values (API v65.0+).
+ * Schema requires objectInfos to be called with either apiNames or objectInfoInputs, not both.
+ * This query uses objectInfoInputs only.
+ * Optimized to only fetch fields used by extractPicklistValuesFromGraphQLObjectInfo.
+ */
+const PICKLIST_VALUES_QUERY = gql`
+	query GetPicklistValues($objectInfoInputs: [ObjectInfoInput!]!) {
+		uiapi {
+			objectInfos(objectInfoInputs: $objectInfoInputs) {
+				ApiName
+				fields {
+					ApiName
+					... on PicklistField {
+						picklistValuesByRecordTypeIDs {
+							recordTypeID
+							defaultValue {
+								value
+							}
+							picklistValues {
+								label
+								value
+								validFor
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+`;
+
+export async function queryForObjectInfos(apiNames: string[]): Promise<GetObjectInfosQuery> {
+	return runQuery<GetObjectInfosQuery, GetObjectInfosQueryVariables>(OBJECT_INFOS_QUERY, {
+		apiNames,
+	});
+}
+
+export async function queryForPicklistValues(
+	objectInfoInputs: ObjectInfoInput[],
+): Promise<GetPicklistValuesQuery> {
+	return runQuery<GetPicklistValuesQuery, GetPicklistValuesQueryVariables>(PICKLIST_VALUES_QUERY, {
+		objectInfoInputs,
+	});
+}
+
+async function runQuery<Q, V>(query: string, variables: V): Promise<Q> {
+	const data = await getDataSDK();
+	const response = await data.graphql?.<Q, V>(query, variables);
+
+	if (response?.errors?.length) {
+		const errorMessages = response.errors.map((e) => e.message).join("; ");
+		throw new Error(`GraphQL Error: ${errorMessages}`);
+	}
+
+	return response?.data ?? ({} as Q);
+}