@salesforce/webapp-template-app-react-sample-b2e-experimental 1.84.0 → 1.85.0

package/dist/.a4drules/skills/{webapp-react-add-component → webapp-react}/SKILL.md

@@ -1,9 +1,11 @@
 ---
-name: webapp-react-add-component
-description: Creates React components, pages, headers, and footers using shadcn UI and Tailwind CSS. Use when the user asks to create a component, add a widget, build a UI element, add a page, create a new page, add a section (e.g. "add a contacts page"), add a header, add a footer, add a navigation bar, or add anything to the web application.
+name: webapp-react
+description: Use when editing any React code in the web application — creating or modifying components, pages, layout, headers, footers, or any TSX/JSX files. Follow this skill for add component, add page, header/footer, and general React UI implementation patterns (shadcn UI and Tailwind CSS).
 ---
 
-# Add React Component
+# React Web App (Components, Pages, Layout)
+
+Use this skill whenever you are editing React/TSX code in the web app (creating or modifying components, pages, header/footer, or layout).
 
 ## Step 1 — Identify the type of component
 

package/dist/.a4drules/skills/{webapp-react-add-component → webapp-react}/implementation/header-footer.md

@@ -116,6 +116,14 @@ AppLayout (appLayout.tsx)
 - **Icons:** `lucide-react`; add `aria-hidden="true"` on decorative icons
 - **Design tokens:** `bg-background`, `text-foreground`, `text-muted-foreground`, `border`, `bg-primary`
 
+### Mobile hamburger / Menu icon — Must be functional
+
+If the header includes a hamburger or `Menu` icon for mobile:
+
+- **Do not** add a Menu/hamburger icon that does nothing. It must toggle a visible mobile menu.
+- **Required:** (1) State: `const [isOpen, setIsOpen] = useState(false)`. (2) Button: `onClick={() => setIsOpen(!isOpen)}`, `aria-label="Toggle menu"`. (3) Conditional panel: `{isOpen && ( <div>...nav links...</div> )}` with responsive visibility (e.g. `md:hidden`). (4) Close on navigate: each link in the panel should `onClick={() => setIsOpen(false)}`.
+- Implement in `appLayout.tsx` (or the component that owns the header). Use the `Menu` icon from `lucide-react`.
+
 ### Confirm — Header / Footer
 
 - Header and footer appear on every page (navigate to at least two routes)

package/dist/.a4drules/skills/{webapp-react-add-component → webapp-react}/implementation/page.md

@@ -2,13 +2,14 @@
 
 ### Rules
 
-1. **`routes.tsx` is the only route registry** — never add routes in `app.tsx` or inside page files.
-2. **All pages are children of the AppLayout route** — do not create top-level routes that bypass the layout shell.
-3. **Default export per page** — each page file has exactly one default-export component.
-4. **Path aliases in all imports** — use `@/pages/...`, `@/components/...`; no deep relative paths.
-5. **No inline styles** — Tailwind utility classes and design tokens only.
-6. **Catch-all last** — `path: '*'` (NotFound) must always remain the last child in the layout route.
-7. **Never modify `appLayout.tsx`** when adding a page — layout changes are a separate concern.
+1. **Edit the component that owns the UI, never output raw HTML** — When editing the home page or any page content, modify the actual `.tsx` file that renders the target. If the target is inside a child component (e.g. `<GlobalSearchInput />` in `Home.tsx`), edit the child's file (e.g. `GlobalSearchInput.tsx`), not the parent. Do not wrap the component with extra elements in the parent; go into the component and change its JSX. Do not paste or generate raw HTML.
+2. **`routes.tsx` is the only route registry** — never add routes in `app.tsx` or inside page files.
+3. **All pages are children of the AppLayout route** — do not create top-level routes that bypass the layout shell.
+4. **Default export per page** — each page file has exactly one default-export component.
+5. **Path aliases in all imports** — use `@/pages/...`, `@/components/...`; no deep relative paths.
+6. **No inline styles** — Tailwind utility classes and design tokens only.
+7. **Catch-all last** — `path: '*'` (NotFound) must always remain the last child in the layout route.
+8. **Never modify `appLayout.tsx`** when adding a page — layout changes are a separate concern.
 
 ### Step 1 — Create the page file
 

package/dist/.a4drules/skills/webapp-ui-ux/SKILL.md

@@ -1,11 +1,13 @@
 ---
-name: ui-ux
-description: Comprehensive design guide for React + Tailwind + shadcn/ui applications. Searchable database with priority-based recommendations for styles, color palettes, font pairings, UX guidelines, and chart types.
+name: webapp-ui-ux
+description: Use when editing any UI code in the web application — styling, layout, design, appearance, Tailwind, shadcn, colors, typography, icons, or visual/UX changes. Comprehensive design guide and searchable database for React + Tailwind + shadcn/ui (styles, color palettes, font pairings, UX guidelines, chart types).
 ---
 
-# ui-ux
+# Web App UI/UX
 
-Comprehensive design guide for React + Tailwind + shadcn/ui applications. Contains 67 styles, 96 color palettes, 57 font pairings, 99 UX guidelines, and 25 chart types. Searchable database with priority-based recommendations.
+Use this skill whenever you are editing UI code in the web application — styling, layout, design, appearance, Tailwind, shadcn, colors, typography, icons, or any visual/UX change.
+
+Comprehensive design guide for React + Tailwind + shadcn/ui. Contains 67 styles, 96 color palettes, 57 font pairings, 99 UX guidelines, and 25 chart types. Searchable database with priority-based recommendations.
 
 ## Prerequisites
 
@@ -200,9 +202,10 @@ These are frequently overlooked issues that make UI look unprofessional:
 
 | Rule | Do | Don't |
 |------|----|----- |
-| **No emoji icons** | Use SVG icons (Heroicons, Lucide, Simple Icons) | Use emojis like 🎨 🚀 ⚙️ as UI icons |
+| **Icons: Lucide only** | Use **lucide-react** for all UI icons: `import { IconName } from 'lucide-react'` | Use Heroicons, react-icons, or other icon libraries; use emojis as icons |
+| **No emojis ever** | Use words + Lucide icons for labels, empty states, tooltips, headings | Use emojis anywhere in UI or user-facing text (e.g. 🎨 🚀 ⚙️) |
 | **Stable hover states** | Use color/opacity transitions on hover | Use scale transforms that shift layout |
-| **Correct brand logos** | Research official SVG from Simple Icons | Guess or use incorrect logo paths |
+| **Correct brand logos** | Research official SVG from Simple Icons (when needed outside Lucide) | Guess or use incorrect logo paths |
 | **Consistent icon sizing** | Use fixed viewBox (24x24) with w-6 h-6 | Mix different icon sizes randomly |
 
 ### Interaction & Cursor
@@ -237,8 +240,8 @@ These are frequently overlooked issues that make UI look unprofessional:
 Before delivering UI code, verify these items:
 
 ### Visual Quality
-- [ ] No emojis used as icons (use SVG instead)
-- [ ] All icons from consistent icon set (Heroicons/Lucide)
+- [ ] No emojis anywhere (UI, labels, empty states, tooltips—use words + Lucide icons only)
+- [ ] All icons from **lucide-react** only (no Heroicons, react-icons, or emojis)
 - [ ] Brand logos are correct (verified from Simple Icons)
 - [ ] Hover states don't cause layout shift
 - [ ] Use theme colors directly (bg-primary) not var() wrapper

package/dist/.a4drules/webapp-react.md

@@ -18,6 +18,15 @@ For layout, navigation, and generation rules, see **webapp.md**.
 - Dev server: `npm run dev`
 - Build: `npm run build`
 
+## Routing (React Router)
+
+Use a **single** router package for the app. When using `createBrowserRouter` and `RouterProvider` from `react-router`, all routing imports must come from **`react-router`** — not from `react-router-dom`.
+
+- ✅ `import { createBrowserRouter, RouterProvider, Link, useNavigate, useLocation, Outlet } from 'react-router';`
+- ❌ `import { Link } from 'react-router-dom';` when the app uses `RouterProvider` from `react-router`
+
+Mixing packages causes "Cannot destructure property 'basename' of ... as it is null" because `Link`/hooks from `react-router-dom` read a different context than the one provided by `RouterProvider` from `react-router`.
+
 ## Component Library (MANDATORY)
 
 Use **shadcn/ui** for UI components:
@@ -28,6 +37,42 @@ import { Card, CardHeader, CardContent } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
 ```
 
+## Icons & No Emojis (MANDATORY)
+
+- **Icons:** Use **lucide-react** only. Do not use Heroicons, Simple Icons, or other icon libraries in the web app.
+  - ✅ `import { Menu, Settings, Bell } from 'lucide-react';` then `<Menu className="w-5 h-5" />`
+  - ❌ Any emoji character as an icon or visual element (e.g. 🎨 🚀 ⚙️ 🔔)
+  - ❌ Other icon libraries (e.g. `@heroicons/react`, `react-icons`, custom SVG icon sets)
+- **No emojis ever:** Do not use emojis anywhere in the app: no emojis in UI labels, buttons, headings, empty states, tooltips, or any user-facing text. Use words and lucide-react icons instead.
+  - ✅ "Settings" with `<Settings />` icon
+  - ❌ "⚙️ Settings" or "Settings 🔧"
+- For icon usage patterns and naming, see the **webapp-ui-ux** skill (`.a4drules/skills/webapp-ui-ux/`, especially `data/icons.csv`).
+
+## Editing UI — Source Files Only (CRITICAL)
+
+When asked to edit the home page, a section, or any on-screen UI:
+
+- **Always edit the actual React/TSX source files.** Never output, paste, or generate raw HTML. The UI is built from components; the agent must locate the component file(s) that render the target area and change **JSX in those files**.
+- **Do not** replace JSX with HTML strings, and do not copy browser-rendered DOM (e.g. expanded `<div>`, `data-slot`, long class strings) into the codebase. That is the output of React + shadcn; the source is `.tsx` with `<Card>`, `<Input>`, etc.
+- **Edit inside the component that owns the UI.** If the element to change is rendered by a **child component** (e.g. `<GlobalSearchInput />` in `Home.tsx`), make the edit **inside that component's file** (e.g. `GlobalSearchInput.tsx`). Do **not** only wrap the component with extra elements in the parent (e.g. adding a `<section>` or `<div>` around `<GlobalSearchInput />`). The parent composes components; the visual/content change belongs in the component that actually renders that part of the UI.
+- **Where to edit:**
+  - **Home page content:** `src/pages/Home.tsx` — but if the target is inside a child (e.g. `<GlobalSearchInput />`), edit the child's file, not the parent.
+  - **Layout, header, nav:** `src/appLayout.tsx`.
+  - **Feature-specific UI (e.g. search, list):** open the **specific component file** that renders the target (e.g. `GlobalSearchInput.tsx` for the search input UI).
+- **Steps:** (1) Identify which **component** owns the section (follow the import: e.g. `GlobalSearchInput` → its file). (2) Open that component's file and modify the JSX there. (3) Only change the parent (e.g. `Home.tsx`) if the change is layout/ordering of components, not the internals of a child. Do not emit a standalone HTML snippet as the “edit.”
+
+## Mobile Nav / Hamburger — Must Be Functional
+
+When adding a navigation menu that includes a hamburger (or Menu icon) for mobile:
+
+- **Do not** add a hamburger/Menu icon that does nothing. The icon must **toggle a visible mobile menu**.
+- **Required implementation:**
+  1. **State:** e.g. `const [isOpen, setIsOpen] = useState(false);`
+  2. **Toggle button:** The hamburger/Menu button must have `onClick={() => setIsOpen(!isOpen)}` and `aria-label="Toggle menu"` (or equivalent).
+  3. **Conditional panel:** A mobile-only menu panel that renders when `isOpen` is true, e.g. `{isOpen && ( <div className="..."> ... nav links ... </div> )}`. Use responsive classes (e.g. `md:hidden`) so the panel is shown only on small screens if the desktop nav is separate.
+  4. **Close on navigation:** Each nav link in the mobile panel should call `onClick={() => setIsOpen(false)}` (or similar) so the menu closes when the user navigates.
+- Implement this in `appLayout.tsx` (or the component that owns the header/nav). See existing apps for the full pattern (state + button + conditional panel + link onClick).
+
 ## Styling
 
 - Use **Tailwind CSS** utility classes
@@ -137,11 +182,20 @@ window.location.reload();
 - ❌ Using LWC patterns (`@wire`, LDS) in React
 - ❌ Hardcoded Salesforce IDs or URLs
 - ❌ Missing error handling for async operations
+- ❌ Mixing `react-router` and `react-router-dom` (e.g. `RouterProvider` from `react-router` but `Link` from `react-router-dom`) — use one package for all routing imports
+- ❌ Using emojis anywhere in the app (labels, icons, empty states, headings, tooltips)
+- ❌ Using any icon library other than **lucide-react** (no Heroicons, react-icons, or emoji-as-icon)
+- ❌ Outputting or pasting raw HTML when editing UI — always edit the React/TSX source files (e.g. `Home.tsx`, `appLayout.tsx`, feature components)
+- ❌ Adding a hamburger or Menu icon for mobile nav without implementing toggle state, conditional menu panel, and close-on-navigate
 
 ## Quality Checklist
 
 - [ ] Entry point maintained (`app.tsx`)
 - [ ] Uses shadcn/ui and Tailwind
+- [ ] Icons from **lucide-react** only; no emojis anywhere in UI or user-facing text
+- [ ] UI changes made by editing .tsx source files (never by pasting raw HTML)
+- [ ] If mobile hamburger exists: it has toggle state, conditional menu panel, and close on link click
+- [ ] All routing imports from same package as router (e.g. `react-router` only)
 - [ ] DataSDK used for all Salesforce API calls
 - [ ] Proper error handling with try/catch
 - [ ] Loading and error states implemented

package/dist/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.85.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.84.1...v1.85.0) (2026-03-10)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.84.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.84.0...v1.84.1) (2026-03-10)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 # [1.84.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.83.0...v1.84.0) (2026-03-09)
 
 

package/dist/README.md

@@ -58,6 +58,30 @@ Replace `<alias>` with your target org alias.
 sf data import tree --plan force-app/main/default/data/data-plan.json --target-org <alias>
 ```
 
+## Using setup-cli.mjs
+
+When this app is built (e.g. from the monorepo or from a published package), a `setup-cli.mjs` script is included at the project root. It runs the full setup in one go: login (if needed), deploy metadata, assign the `Property_Management_Access` permission set, prepare and import sample data, fetch GraphQL schema and run codegen, build the web app, and optionally start the dev server.
+
+Run from the **project root** (the directory that contains `force-app/`, `sfdx-project.json`, and `setup-cli.mjs`):
+
+```bash
+node setup-cli.mjs --target-org <alias>
+```
+
+Common options:
+
+| Option                | Description                                                      |
+| --------------------- | ---------------------------------------------------------------- |
+| `--skip-login`        | Skip browser login (org already authenticated)                   |
+| `--skip-data`         | Skip data preparation and import                                 |
+| `--skip-graphql`      | Skip GraphQL schema fetch and codegen                            |
+| `--skip-webapp-build` | Skip `npm install` and web app build                             |
+| `--skip-dev`          | Do not start the dev server at the end                           |
+| `--permset <name>`    | Permission set to assign (default: `Property_Management_Access`) |
+| `--app <name>`        | Web app folder name when multiple exist                          |
+
+For all options: `node setup-cli.mjs --help`.
+
 ## Configure Your Salesforce DX Project
 
 The `sfdx-project.json` file contains useful configuration information for your project. See [Salesforce DX Project Configuration](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_config.htm) in the _Salesforce DX Developer Guide_ for details about this file.

package/dist/force-app/main/default/data/Property_Image__c.json

@@ -138,7 +138,7 @@
         "referenceId": "ImageRef12"
       },
       "Name": "Beverly Hills Estate Primary",
-      "Property__c": "@PropertyRef11",
+      "Property__c": "@PropertyRef10",
       "Image_URL__c": "https://images.unsplash.com/photo-1613490493576-7fde63acd811?w=800&h=600&fit=crop",
       "Image_Type__c": "Primary",
       "Display_Order__c": 1,

package/dist/force-app/main/default/data/Property_Listing__c.json

@@ -90,7 +90,7 @@
         "referenceId": "ListingRef7"
       },
       "Name": "Beverly Hills Estate",
-      "Property__c": "@PropertyRef11",
+      "Property__c": "@PropertyRef10",
       "Listing_Price__c": 9200000.0,
       "Listing_Status__c": "Active",
       "Featured__c": true,

package/dist/force-app/main/default/data/prepare-import-unique-fields.js

@@ -0,0 +1,85 @@
+#!/usr/bin/env node
+/**
+ * Updates unique fields in data JSON files so "sf data import tree" can be run
+ * repeatedly (e.g. after org already has data). Run before: node prepare-import-unique-fields.js
+ */
+const fs = require("fs");
+const path = require("path");
+const dataDir = __dirname;
+const runId = Date.now();
+const runSuffix2 = String(runId % 100).padStart(2, "0"); // 00-99 for Company_Code__c (10-char limit)
+
+// Contact: Email + LastName — unique so re-runs don't hit DUPLICATES_DETECTED (matching may use name)
+const contactPath = path.join(dataDir, "Contact.json");
+let contact = JSON.parse(fs.readFileSync(contactPath, "utf8"));
+contact.records.forEach((r, i) => {
+	if (r.Email && r.Email.includes("@"))
+		r.Email = r.Email.replace(/\+[0-9]+@/, "@").replace("@", "+" + runId + "@");
+	if (r.LastName)
+		r.LastName = r.LastName.replace(/\s*\[[0-9-]+\]$/, "") + " [" + runId + "-" + i + "]";
+});
+fs.writeFileSync(contactPath, JSON.stringify(contact, null, 2));
+
+// Agent__c: License_Number__c — strip any existing suffix and add run id + index (each record must be unique)
+const agentPath = path.join(dataDir, "Agent__c.json");
+let agent = JSON.parse(fs.readFileSync(agentPath, "utf8"));
+agent.records.forEach((r, i) => {
+	if (r.License_Number__c)
+		r.License_Number__c =
+			r.License_Number__c.replace(/-[0-9]+(-[0-9]+)?$/, "") + "-" + runId + "-" + i;
+});
+fs.writeFileSync(agentPath, JSON.stringify(agent, null, 2));
+
+// Property_Management_Company__c: Company_Code__c — max 10 chars, use 8-char base + 2-digit suffix
+const companyPath = path.join(dataDir, "Property_Management_Company__c.json");
+let company = JSON.parse(fs.readFileSync(companyPath, "utf8"));
+company.records.forEach((r) => {
+	if (r.Company_Code__c) r.Company_Code__c = r.Company_Code__c.slice(0, 8) + runSuffix2; // 8-char base + 2-digit = 10 chars max
+});
+fs.writeFileSync(companyPath, JSON.stringify(company, null, 2));
+
+// Property_Owner__c: Email__c — add +runId before @
+const ownerPath = path.join(dataDir, "Property_Owner__c.json");
+let owner = JSON.parse(fs.readFileSync(ownerPath, "utf8"));
+owner.records.forEach((r) => {
+	if (r.Email__c && r.Email__c.includes("@"))
+		r.Email__c = r.Email__c.replace(/\+[0-9]+@/, "@").replace("@", "+" + runId + "@");
+});
+fs.writeFileSync(ownerPath, JSON.stringify(owner, null, 2));
+
+// Remap @TenantRefN in dependent files to only use refs that exist in Tenant__c.json (fix UnresolvableRefsError)
+const tenantPath = path.join(dataDir, "Tenant__c.json");
+const tenantData = JSON.parse(fs.readFileSync(tenantPath, "utf8"));
+const validTenantRefs = tenantData.records.map((r) => r.attributes?.referenceId).filter(Boolean);
+if (validTenantRefs.length === 0) throw new Error("Tenant__c.json has no referenceIds");
+
+function remapTenantRef(refValue) {
+	if (typeof refValue !== "string" || !refValue.startsWith("@TenantRef")) return refValue;
+	const match = refValue.match(/^@(TenantRef)(\d+)$/);
+	if (!match) return refValue;
+	const n = parseInt(match[2], 10);
+	const idx = (n - 1) % validTenantRefs.length;
+	return "@" + validTenantRefs[idx];
+}
+
+const leasePath = path.join(dataDir, "Lease__c.json");
+let lease = JSON.parse(fs.readFileSync(leasePath, "utf8"));
+lease.records.forEach((r) => {
+	if (r.Tenant__c) r.Tenant__c = remapTenantRef(r.Tenant__c);
+});
+fs.writeFileSync(leasePath, JSON.stringify(lease, null, 2));
+
+const maintPath = path.join(dataDir, "Maintenance_Request__c.json");
+let maint = JSON.parse(fs.readFileSync(maintPath, "utf8"));
+maint.records.forEach((r) => {
+	if (r.User__c && String(r.User__c).startsWith("@TenantRef"))
+		r.User__c = remapTenantRef(r.User__c);
+});
+fs.writeFileSync(maintPath, JSON.stringify(maint, null, 2));
+
+console.log(
+	"Unique fields updated: runId=%s companySuffix=%s validTenants=%s",
+	runId,
+	runSuffix2,
+	validTenantRefs.length,
+);

package/dist/force-app/main/default/permissionsets/Property_Management_Access.permissionset-meta.xml

@@ -367,43 +367,36 @@
         <field>Agent__c.License_Number__c</field>
         <readable>true</readable>
     </fieldPermissions>
-
     <fieldPermissions>
         <editable>true</editable>
         <field>Agent__c.License_Expiry__c</field>
         <readable>true</readable>
     </fieldPermissions>
-
     <fieldPermissions>
         <editable>true</editable>
         <field>Agent__c.Agent_Type__c</field>
         <readable>true</readable>
     </fieldPermissions>
-
     <fieldPermissions>
         <editable>true</editable>
         <field>Agent__c.Territory__c</field>
         <readable>true</readable>
     </fieldPermissions>
-
     <fieldPermissions>
         <editable>true</editable>
         <field>Agent__c.Emergency_Alt__c</field>
         <readable>true</readable>
     </fieldPermissions>
-
     <fieldPermissions>
         <editable>true</editable>
         <field>Agent__c.Language__c</field>
         <readable>true</readable>
     </fieldPermissions>
-
     <fieldPermissions>
         <editable>true</editable>
         <field>Agent__c.Availability__c</field>
         <readable>true</readable>
     </fieldPermissions>
-
     <fieldPermissions>
         <editable>true</editable>
         <field>Agent__c.Office_Location__c</field>

package/dist/force-app/main/default/webapplications/appreactsampleb2e/package.json

@@ -15,9 +15,9 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/agentforce-conversation-client": "^1.84.0",
-    "@salesforce/sdk-data": "^1.84.0",
-    "@salesforce/webapp-experimental": "^1.84.0",
+    "@salesforce/agentforce-conversation-client": "^1.85.0",
+    "@salesforce/sdk-data": "^1.85.0",
+    "@salesforce/webapp-experimental": "^1.85.0",
     "@tailwindcss/vite": "^4.1.17",
     "@tanstack/react-form": "^1.28.4",
     "class-variance-authority": "^0.7.1",
@@ -42,7 +42,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.84.0",
+    "@salesforce/vite-plugin-webapp-experimental": "^1.85.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/api/applications.ts

@@ -1,10 +1,11 @@
-import { getDataSDK, gql } from "@salesforce/sdk-data";
-import type { Application } from "../lib/types";
+import { gql } from "@salesforce/sdk-data";
+import type { Application } from "../lib/types.js";
 import type {
 	GetApplicationsQuery,
 	UpdateApplicationStatusMutationVariables,
 	UpdateApplicationStatusMutation,
-} from "./graphql-operations-types";
+} from "./graphql-operations-types.js";
+import { executeGraphQL } from "./graphqlClient.js";
 
 // Query to get all applications
 const GET_APPLICATIONS = gql`
@@ -73,15 +74,8 @@ const UPDATE_APPLICATION_STATUS = gql`
 
 export async function getApplications(): Promise<Application[]> {
 	try {
-		const data = await getDataSDK();
-		const result = await data.graphql?.<GetApplicationsQuery>(GET_APPLICATIONS);
-
-		if (result?.errors?.length) {
-			const errorMessages = result.errors.map((e) => e.message).join("; ");
-			throw new Error(`GraphQL Error: ${errorMessages}`);
-		}
-
-		const edges = result?.data?.uiapi?.query?.Application__c?.edges || [];
+		const data = await executeGraphQL<GetApplicationsQuery>(GET_APPLICATIONS);
+		const edges = data?.uiapi?.query?.Application__c?.edges || [];
 
 		return edges
 			.map((edge) => {
@@ -123,18 +117,11 @@ export async function updateApplicationStatus(
 		},
 	};
 	try {
-		const data = await getDataSDK();
-		const result = await data.graphql?.<
+		const data = await executeGraphQL<
 			UpdateApplicationStatusMutation,
 			UpdateApplicationStatusMutationVariables
 		>(UPDATE_APPLICATION_STATUS, variables);
-
-		if (result?.errors?.length) {
-			const errorMessages = result.errors.map((e) => e.message).join("; ");
-			throw new Error(`GraphQL Error: ${errorMessages}`);
-		}
-
-		return !!result?.data?.uiapi?.Application__cUpdate?.success;
+		return !!data?.uiapi?.Application__cUpdate?.success;
 	} catch (error) {
 		console.error("Error updating application status:", error);
 		return false;

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/api/dashboard.ts

@@ -1,11 +1,12 @@
-import { getDataSDK, gql } from "@salesforce/sdk-data";
-import type { DashboardMetrics, Application } from "../lib/types";
+import { gql } from "@salesforce/sdk-data";
+import type { DashboardMetrics, Application } from "../lib/types.js";
 import type {
 	GetDashboardMetricsQuery,
 	GetOpenApplicationsQuery,
 	GetOpenApplicationsQueryVariables,
 	GetUserInfoQuery,
-} from "./graphql-operations-types";
+} from "./graphql-operations-types.js";
+import { executeGraphQL } from "./graphqlClient.js";
 
 // Query to get property counts for dashboard metrics
 const GET_DASHBOARD_METRICS = gql`
@@ -99,18 +100,10 @@ const GET_USER_INFO = gql`
 
 // Fetch dashboard metrics
 export async function getDashboardMetrics(): Promise<{
-	properties: any[];
-	maintenanceRequests: any[];
+	properties: unknown[];
+	maintenanceRequests: unknown[];
 }> {
-	const data = await getDataSDK();
-	const result = await data.graphql?.<GetDashboardMetricsQuery>(GET_DASHBOARD_METRICS);
-
-	if (result?.errors?.length) {
-		const errorMessages = result.errors.map((e) => e.message).join("; ");
-		throw new Error(`GraphQL Error: ${errorMessages}`);
-	}
-
-	const response = result?.data;
+	const response = await executeGraphQL<GetDashboardMetricsQuery>(GET_DASHBOARD_METRICS);
 	const properties = response?.uiapi?.query?.allProperties?.edges?.map((edge) => edge?.node) || [];
 	const maintenanceRequests =
 		response?.uiapi?.query?.maintenanceRequests?.edges?.map((edge) => edge?.node) || [];
@@ -120,36 +113,21 @@ export async function getDashboardMetrics(): Promise<{
 // Fetch open applications
 export async function getOpenApplications(first: number = 5): Promise<Application[]> {
 	const variables: GetOpenApplicationsQueryVariables = { first };
-	const data = await getDataSDK();
-	const result = await data.graphql?.<GetOpenApplicationsQuery, GetOpenApplicationsQueryVariables>(
+	const data = await executeGraphQL<GetOpenApplicationsQuery, GetOpenApplicationsQueryVariables>(
 		GET_OPEN_APPLICATIONS,
 		variables,
 	);
-
-	if (result?.errors?.length) {
-		const errorMessages = result.errors.map((e) => e.message).join("; ");
-		throw new Error(`GraphQL Error: ${errorMessages}`);
-	}
-
 	const apps =
-		result?.data?.uiapi?.query?.Application__c?.edges?.map((edge) =>
-			transformApplication(edge?.node),
-		) || [];
+		data?.uiapi?.query?.Application__c?.edges?.map((edge) => transformApplication(edge?.node)) ||
+		[];
 	return apps;
 }
 
 // Fetch current user information
 export async function getUserInfo(): Promise<{ name: string; id: string } | null> {
 	try {
-		const data = await getDataSDK();
-		const result = await data.graphql?.<GetUserInfoQuery>(GET_USER_INFO);
-
-		if (result?.errors?.length) {
-			const errorMessages = result.errors.map((e) => e.message).join("; ");
-			throw new Error(`GraphQL Error: ${errorMessages}`);
-		}
-
-		const user = result?.data?.uiapi?.query?.User?.edges?.[0]?.node;
+		const data = await executeGraphQL<GetUserInfoQuery>(GET_USER_INFO);
+		const user = data?.uiapi?.query?.User?.edges?.[0]?.node;
 		if (user) {
 			return {
 				id: user.Id,

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/api/graphqlClient.ts

@@ -0,0 +1,22 @@
+/**
+ * Thin GraphQL client: getDataSDK + data.graphql with centralized error handling.
+ * Use with gql-tagged queries and generated operation types for type-safe calls.
+ */
+import { getDataSDK } from "@salesforce/sdk-data";
+
+export async function executeGraphQL<TData, TVariables = Record<string, unknown>>(
+	query: string | { kind: string; definitions: unknown[] },
+	variables?: TVariables,
+): Promise<TData> {
+	const data = await getDataSDK();
+	// SDK types graphql() first param as string; at runtime it may accept gql DocumentNode too
+	const response = await data.graphql?.<TData>(
+		query as unknown as string,
+		variables as Record<string, unknown>,
+	);
+	if (response?.errors?.length) {
+		const msg = response.errors.map((e) => e.message).join("; ");
+		throw new Error(`GraphQL Error: ${msg}`);
+	}
+	return (response?.data ?? {}) as TData;
+}

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/api/maintenance.ts

@@ -1,5 +1,5 @@
-import { getDataSDK, gql } from "@salesforce/sdk-data";
-import type { MaintenanceRequest } from "../lib/types";
+import { gql } from "@salesforce/sdk-data";
+import type { MaintenanceRequest } from "../lib/types.js";
 import type {
 	GetMaintenanceRequestsQuery,
 	GetMaintenanceRequestsQueryVariables,
@@ -7,7 +7,8 @@ import type {
 	GetAllMaintenanceRequestsQueryVariables,
 	UpdateMaintenanceStatusMutation,
 	UpdateMaintenanceStatusMutationVariables,
-} from "./graphql-operations-types";
+} from "./graphql-operations-types.js";
+import { executeGraphQL } from "./graphqlClient.js";
 
 // Query to get recent maintenance requests
 const GET_MAINTENANCE_REQUESTS = gql`
@@ -149,19 +150,12 @@ const UPDATE_MAINTENANCE_STATUS = gql`
 // Fetch maintenance requests for dashboard
 export async function getMaintenanceRequests(first: number = 5): Promise<MaintenanceRequest[]> {
 	const variables: GetMaintenanceRequestsQueryVariables = { first };
-	const data = await getDataSDK();
-	const result = await data.graphql?.<
+	const data = await executeGraphQL<
 		GetMaintenanceRequestsQuery,
 		GetMaintenanceRequestsQueryVariables
 	>(GET_MAINTENANCE_REQUESTS, variables);
-
-	if (result?.errors?.length) {
-		const errorMessages = result.errors.map((e) => e.message).join("; ");
-		throw new Error(`GraphQL Error: ${errorMessages}`);
-	}
-
 	const requests =
-		result?.data?.uiapi?.query?.Maintenance_Request__c?.edges?.map((edge) =>
+		data?.uiapi?.query?.Maintenance_Request__c?.edges?.map((edge) =>
 			transformMaintenanceRequest(edge?.node),
 		) || [];
 	return requests;
@@ -172,19 +166,12 @@ export async function getAllMaintenanceRequests(
 	first: number = 100,
 ): Promise<MaintenanceRequest[]> {
 	const variables: GetAllMaintenanceRequestsQueryVariables = { first };
-	const data = await getDataSDK();
-	const result = await data.graphql?.<
+	const data = await executeGraphQL<
 		GetAllMaintenanceRequestsQuery,
 		GetAllMaintenanceRequestsQueryVariables
 	>(GET_ALL_MAINTENANCE_REQUESTS, variables);
-
-	if (result?.errors?.length) {
-		const errorMessages = result.errors.map((e) => e.message).join("; ");
-		throw new Error(`GraphQL Error: ${errorMessages}`);
-	}
-
 	const requests =
-		result?.data?.uiapi?.query?.Maintenance_Request__c?.edges?.map((edge: any) =>
+		data?.uiapi?.query?.Maintenance_Request__c?.edges?.map((edge) =>
 			transformMaintenanceTaskFull(edge?.node),
 		) || [];
 	return requests;
@@ -275,18 +262,11 @@ export async function updateMaintenanceStatus(requestId: string, status: string)
 		},
 	};
 	try {
-		const data = await getDataSDK();
-		const result = await data.graphql?.<
+		const data = await executeGraphQL<
 			UpdateMaintenanceStatusMutation,
 			UpdateMaintenanceStatusMutationVariables
 		>(UPDATE_MAINTENANCE_STATUS, variables);
-
-		if (result?.errors?.length) {
-			const errorMessages = result.errors.map((e) => e.message).join("; ");
-			throw new Error(`GraphQL Error: ${errorMessages}`);
-		}
-
-		return !!result?.data?.uiapi?.Maintenance_Request__cUpdate?.success;
+		return !!data?.uiapi?.Maintenance_Request__cUpdate?.success;
 	} catch (error) {
 		console.error("Error updating maintenance status:", error);
 		return false;

package/dist/force-app/main/default/webapplications/appreactsampleb2e/src/api/properties.ts

@@ -1,6 +1,10 @@
-import { getDataSDK, gql } from "@salesforce/sdk-data";
-import type { Property } from "../lib/types";
-import type { GetPropertiesQueryVariables, GetPropertiesQuery } from "./graphql-operations-types";
+import { gql } from "@salesforce/sdk-data";
+import type { Property } from "../lib/types.js";
+import type {
+	GetPropertiesQueryVariables,
+	GetPropertiesQuery,
+} from "./graphql-operations-types.js";
+import { executeGraphQL } from "./graphqlClient.js";
 
 // GraphQL query to get properties with pagination
 const GET_PROPERTIES_PAGINATED = gql`
@@ -97,19 +101,10 @@ export async function getProperties(first: number = 12, after?: string): Promise
 	if (after) {
 		variables.after = after;
 	}
-
-	const data = await getDataSDK();
-	const result = await data.graphql?.<GetPropertiesQuery, GetPropertiesQueryVariables>(
+	const response = await executeGraphQL<GetPropertiesQuery, GetPropertiesQueryVariables>(
 		GET_PROPERTIES_PAGINATED,
 		variables,
 	);
-
-	if (result?.errors?.length) {
-		const errorMessages = result.errors.map((e) => e.message).join("; ");
-		throw new Error(`GraphQL Error: ${errorMessages}`);
-	}
-
-	const response = result?.data;
 	const edges = response?.uiapi?.query?.Property__c?.edges || [];
 	const pageInfo = response?.uiapi?.query?.Property__c?.pageInfo || {
 		hasNextPage: false,

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.84.0",
+  "version": "1.85.0",
   "description": "Base SFDX project template",
   "private": true,
   "files": [

package/dist/setup-cli.mjs

@@ -0,0 +1,271 @@
+#!/usr/bin/env node
+/**
+ * One-command setup: login, deploy, data import, GraphQL schema/codegen, web app build.
+ * Provided by the property management feature. Run from the SFDX project root (e.g. dist/).
+ *
+ * Usage:
+ *   node setup-cli.mjs --target-org <alias>   # run all steps
+ *   node setup-cli.mjs --target-org afv5 --skip-login
+ *   node setup-cli.mjs --target-org afv5 --skip-data --skip-webapp-build
+ *   node setup-cli.mjs --target-org myorg --app appreactsampleb2x   # when multiple web apps
+ *
+ * Steps (in order):
+ *   1. login     — sf org login web only if org not already connected (skip with --skip-login)
+ *   2. deploy    — sf project deploy start --target-org <alias>
+ *   3. permset   — sf org assign permset (default: Property_Management_Access; override with --permset)
+ *   4. data      — prepare unique fields + sf data import tree (skipped if no data-plan.json)
+ *   5. graphql   — (in webapp) npm run graphql:schema then npm run graphql:codegen
+ *   6. webapp    — (in webapp) npm install && npm run build
+ *   7. dev       — (in webapp) npm run dev — launch dev server (skip with --skip-dev)
+ */
+
+import { spawnSync } from "node:child_process";
+import { readdirSync, existsSync } from "node:fs";
+import { resolve, dirname, basename } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+/** SFDX project root: when run from dist/, the script lives in dist/ and force-app is under dist/ */
+const ROOT = __dirname;
+const WEBAPPLICATIONS_DIR = resolve(ROOT, "force-app/main/default/webapplications");
+const DATA_DIR = resolve(ROOT, "force-app/main/default/data");
+const DATA_PLAN = resolve(DATA_DIR, "data-plan.json");
+const PREPARE_SCRIPT = resolve(DATA_DIR, "prepare-import-unique-fields.js");
+
+function parseArgs() {
+	const args = process.argv.slice(2);
+	let targetOrg = null;
+	let appName = null;
+	let permsetName = "Property_Management_Access";
+	const flags = {
+		skipLogin: false,
+		skipDeploy: false,
+		skipPermset: false,
+		skipData: false,
+		skipGraphql: false,
+		skipWebappBuild: false,
+		skipDev: false,
+	};
+	for (let i = 0; i < args.length; i++) {
+		if (args[i] === "--target-org" && args[i + 1]) {
+			targetOrg = args[++i];
+		} else if (args[i] === "--app" && args[i + 1]) {
+			appName = args[++i];
+		} else if (args[i] === "--permset" && args[i + 1]) {
+			permsetName = args[++i];
+		} else if (args[i] === "--skip-login") flags.skipLogin = true;
+		else if (args[i] === "--skip-deploy") flags.skipDeploy = true;
+		else if (args[i] === "--skip-permset") flags.skipPermset = true;
+		else if (args[i] === "--skip-data") flags.skipData = true;
+		else if (args[i] === "--skip-graphql") flags.skipGraphql = true;
+		else if (args[i] === "--skip-webapp-build") flags.skipWebappBuild = true;
+		else if (args[i] === "--skip-dev") flags.skipDev = true;
+		else if (args[i] === "--help" || args[i] === "-h") {
+			console.log(`
+Setup CLI (property management feature)
+
+Usage:
+  node setup-cli.mjs --target-org <alias> [options]
+
+Required:
+  --target-org <alias>   Target Salesforce org alias (e.g. afv5)
+
+Options:
+  --app <name>           Web app folder name (default: auto-detect if only one in force-app/.../webapplications/)
+  --permset <name>       Permission set to assign (default: Property_Management_Access)
+  --skip-login           Skip login step (login is auto-skipped if org is already connected)
+  --skip-deploy          Do not deploy metadata
+  --skip-permset         Do not assign permission set
+  --skip-data            Do not prepare data or run data import
+  --skip-graphql         Do not fetch schema or run GraphQL codegen
+  --skip-webapp-build    Do not npm install / build the web application
+  --skip-dev             Do not launch the dev server at the end
+  -h, --help             Show this help
+`);
+			process.exit(0);
+		}
+	}
+	if (!targetOrg) {
+		console.error("Error: --target-org <alias> is required.");
+		process.exit(1);
+	}
+	return { targetOrg, appName, permsetName, ...flags };
+}
+
+function discoverWebAppDir(appNameOverride) {
+	if (appNameOverride) {
+		const dir = resolve(WEBAPPLICATIONS_DIR, appNameOverride);
+		if (!existsSync(dir)) {
+			console.error(`Error: Web app directory not found: ${dir}`);
+			process.exit(1);
+		}
+		return dir;
+	}
+	if (!existsSync(WEBAPPLICATIONS_DIR)) {
+		console.error(`Error: Web applications directory not found: ${WEBAPPLICATIONS_DIR}`);
+		process.exit(1);
+	}
+	const entries = readdirSync(WEBAPPLICATIONS_DIR, { withFileTypes: true });
+	const dirs = entries.filter((e) => e.isDirectory());
+	if (dirs.length === 0) {
+		console.error(
+			"Error: No web application folder found under force-app/main/default/webapplications/",
+		);
+		process.exit(1);
+	}
+	if (dirs.length > 1) {
+		console.error(
+			"Error: Multiple web applications found. Specify one with --app <name>. Choices:",
+			dirs.map((d) => d.name).join(", "),
+		);
+		process.exit(1);
+	}
+	return resolve(WEBAPPLICATIONS_DIR, dirs[0].name);
+}
+
+function isOrgConnected(targetOrg) {
+	const result = spawnSync("sf", ["org", "display", "--target-org", targetOrg, "--json"], {
+		cwd: ROOT,
+		stdio: "pipe",
+		shell: true,
+	});
+	return result.status === 0;
+}
+
+function run(name, cmd, args, opts = {}) {
+	const { cwd = ROOT, optional = false } = opts;
+	console.log("\n---", name, "---");
+	const result = spawnSync(cmd, args, {
+		cwd,
+		stdio: "inherit",
+		shell: true,
+		...(opts.timeout && { timeout: opts.timeout }),
+	});
+	if (result.status !== 0 && !optional) {
+		console.error(`\nSetup failed at step: ${name}`);
+		process.exit(result.status ?? 1);
+	}
+	return result;
+}
+
+function main() {
+	const {
+		targetOrg,
+		appName: appNameOverride,
+		permsetName,
+		skipLogin,
+		skipDeploy,
+		skipPermset,
+		skipData,
+		skipGraphql,
+		skipWebappBuild,
+		skipDev,
+	} = parseArgs();
+
+	const WEBAPP_DIR = discoverWebAppDir(appNameOverride);
+	const webAppName = appNameOverride || basename(WEBAPP_DIR);
+
+	console.log("Setup — target org:", targetOrg, "| web app:", webAppName);
+	console.log(
+		"Steps: login=%s deploy=%s permset=%s data=%s graphql=%s webapp=%s dev=%s",
+		!skipLogin,
+		!skipDeploy,
+		!skipPermset,
+		!skipData,
+		!skipGraphql,
+		!skipWebappBuild,
+		!skipDev,
+	);
+
+	if (!skipLogin) {
+		if (isOrgConnected(targetOrg)) {
+			console.log("\n--- Login ---");
+			console.log(`Org ${targetOrg} is already authenticated; skipping browser login.`);
+		} else {
+			run("Login (browser)", "sf", ["org", "login", "web", "--alias", targetOrg], {
+				optional: true,
+			});
+		}
+	}
+
+	if (!skipDeploy) {
+		run("Deploy metadata", "sf", ["project", "deploy", "start", "--target-org", targetOrg], {
+			timeout: 180000,
+		});
+	}
+
+	if (!skipPermset) {
+		console.log("\n--- Assign permission set ---");
+		const permsetResult = spawnSync(
+			"sf",
+			["org", "assign", "permset", "--name", permsetName, "--target-org", targetOrg],
+			{
+				cwd: ROOT,
+				stdio: "pipe",
+				shell: true,
+			},
+		);
+		if (permsetResult.status === 0) {
+			console.log("Permission set assigned.");
+		} else {
+			const out =
+				(permsetResult.stderr?.toString() || "") + (permsetResult.stdout?.toString() || "");
+			if (out.includes("Duplicate") && out.includes("PermissionSet")) {
+				console.log("Permission set already assigned; skipping.");
+			} else {
+				process.stdout.write(permsetResult.stdout?.toString() || "");
+				process.stderr.write(permsetResult.stderr?.toString() || "");
+				console.error("\nSetup failed at step: Assign permission set");
+				process.exit(permsetResult.status ?? 1);
+			}
+		}
+	}
+
+	const hasDataPlan = existsSync(DATA_PLAN);
+	const hasPrepareScript = existsSync(PREPARE_SCRIPT);
+
+	if (!skipData) {
+		if (hasPrepareScript) {
+			run("Prepare data (unique fields)", "node", [PREPARE_SCRIPT], { cwd: DATA_DIR });
+		} else {
+			console.log("\n--- Prepare data ---");
+			console.log("No prepare-import-unique-fields.js found; skipping.");
+		}
+		if (hasDataPlan) {
+			run(
+				"Data import tree",
+				"sf",
+				["data", "import", "tree", "--plan", DATA_PLAN, "--target-org", targetOrg],
+				{
+					timeout: 120000,
+				},
+			);
+		} else {
+			console.log("\n--- Data import ---");
+			console.log("No data-plan.json found; skipping data import.");
+		}
+	}
+
+	if (!skipGraphql || !skipWebappBuild) {
+		run("Web app npm install", "npm", ["install"], { cwd: WEBAPP_DIR });
+	}
+
+	if (!skipGraphql) {
+		run("Set default org for schema", "sf", ["config", "set", "target-org", targetOrg, "--global"]);
+		run("GraphQL schema (introspect)", "npm", ["run", "graphql:schema"], { cwd: WEBAPP_DIR });
+		run("GraphQL codegen", "npm", ["run", "graphql:codegen"], { cwd: WEBAPP_DIR });
+	}
+
+	if (!skipWebappBuild) {
+		run("Web app build", "npm", ["run", "build"], { cwd: WEBAPP_DIR });
+	}
+
+	console.log("\n--- Setup complete ---");
+
+	if (!skipDev) {
+		console.log("\n--- Launching dev server (Ctrl+C to stop) ---\n");
+		run("Dev server", "npm", ["run", "dev"], { cwd: WEBAPP_DIR });
+	}
+}
+
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-app-react-sample-b2e-experimental",
-  "version": "1.84.0",
+  "version": "1.85.0",
   "description": "B2E starter app template",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "",
@@ -16,8 +16,8 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@salesforce/webapp-experimental": "^1.84.0",
-    "@salesforce/webapp-template-feature-react-global-search-experimental": "^1.84.0"
+    "@salesforce/webapp-experimental": "^1.85.0",
+    "@salesforce/webapp-template-feature-react-global-search-experimental": "^1.85.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",