@salesforce/templates 66.6.2 → 66.7.1

package/lib/templates/project/reactexternalapp/_p_/_m_/_w_/_a_/src/pages/Home.tsx

@@ -1,12 +1,34 @@
-export default function Home() {
-  return (
-    <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
-      <div className="text-center">
-        <h1 className="text-4xl font-bold text-gray-900 mb-4">Home</h1>
-        <p className="text-lg text-gray-600 mb-8">
-          Welcome to your React application.
-        </p>
-      </div>
-    </div>
-  );
+import { useState } from "react";
+import { useNavigate } from "react-router";
+import { SearchBar } from "../features/object-search/components/SearchBar";
+import { Button } from "../components/ui/button";
+
+export default function HomePage() {
+	const navigate = useNavigate();
+	const [text, setText] = useState("");
+
+	const handleSubmit = (e: React.SyntheticEvent<HTMLFormElement>) => {
+		e.preventDefault();
+		const params = text ? `?q=${encodeURIComponent(text)}` : "";
+		navigate(`/accounts${params}`);
+	};
+
+	return (
+		<div className="max-w-2xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
+			<div className="flex items-center gap-6 mb-6">
+				<h1 className="text-2xl font-bold">Account Search</h1>
+				<Button variant="outline" size="sm" onClick={() => navigate("/accounts")}>
+					Browse All Accounts
+				</Button>
+			</div>
+			<form onSubmit={handleSubmit} className="flex gap-2">
+				<SearchBar
+					placeholder="Search by name, phone, or industry..."
+					value={text}
+					handleChange={setText}
+				/>
+				<Button type="submit">Search</Button>
+			</form>
+		</div>
+	);
 }

package/lib/templates/project/reactexternalapp/_p_/_m_/_w_/_a_/src/routes.tsx

@@ -1,5 +1,5 @@
 import type { RouteObject } from 'react-router';
-import Home from './features/object-search/__examples__/pages/Home';
+import Home from './pages/Home';
 import NotFound from './pages/NotFound';
 import Login from "./features/authentication/pages/Login";
 import Register from "./features/authentication/pages/Register";
@@ -10,8 +10,8 @@ import ChangePassword from "./features/authentication/pages/ChangePassword";
 import AuthenticationRoute from "./features/authentication/layouts/authenticationRouteLayout";
 import PrivateRoute from "./features/authentication/layouts/privateRouteLayout";
 import { ROUTES } from "./features/authentication/authenticationConfig";
-import AccountSearch from "./features/object-search/__examples__/pages/AccountSearch";
-import AccountObjectDetail from "./features/object-search/__examples__/pages/AccountObjectDetailPage";
+import AccountSearch from "./pages/AccountSearch";
+import AccountObjectDetail from "./pages/AccountObjectDetailPage";
 import AuthAppLayout from "./features/authentication/layouts/AuthAppLayout";
 
 export const routes: RouteObject[] = [

package/lib/templates/project/reactexternalapp/_p_/_m_/_w_/_a_/vite.config.ts

@@ -4,7 +4,7 @@ import react from '@vitejs/plugin-react';
 import path from 'path';
 import { resolve } from 'path';
 import tailwindcss from '@tailwindcss/vite';
-import salesforce from '@salesforce/vite-plugin-webapp-experimental';
+import salesforce from '@salesforce/vite-plugin-ui-bundle';
 import codegen from 'vite-plugin-graphql-codegen';
 
 const schemaPath = resolve(__dirname, '../../../../../schema.graphql');

package/lib/templates/project/reactexternalapp/_p_/_m_/classes/{WebAppAuthUtils.cls → UIBundleAuthUtils.cls}

@@ -1,7 +1,7 @@
 /**
  * Utility class for Web Application authentication REST endpoints.
  */
-public without sharing class WebAppAuthUtils {
+public without sharing class UIBundleAuthUtils {
 
     /**
      * Exception for authentication errors with HTTP status code support.

package/lib/templates/project/reactexternalapp/_p_/_m_/classes/{WebAppChangePassword.cls → UIBundleChangePassword.cls}

@@ -10,7 +10,7 @@
  * can change their own password.
  */
 @RestResource(urlMapping='/auth/change-password')
-global with sharing class WebAppChangePassword {
+global with sharing class UIBundleChangePassword {
 
     /**
      * Changes the password for the currently authenticated user.
@@ -36,7 +36,7 @@ global with sharing class WebAppChangePassword {
             }
 
             // Logs are only captured if a Trace Flag is active for the user
-            WebAppAuthUtils.debugLog(ex, LoggingLevel.ERROR);
+            UIBundleAuthUtils.debugLog(ex, LoggingLevel.ERROR);
 
             RestContext.response.statusCode = 500;
             return new ErrorPasswordChangeResponse('Password change failed');

package/lib/templates/project/reactexternalapp/_p_/_m_/classes/{WebAppForgotPassword.cls → UIBundleForgotPassword.cls}

@@ -6,7 +6,7 @@
  * Sends a password reset email to the user's registered email address.
  */
 @RestResource(urlMapping='/auth/forgot-password')
-global with sharing class WebAppForgotPassword {
+global with sharing class UIBundleForgotPassword {
 
     /**
      * Initiates the forgot password process by sending a reset email.
@@ -30,7 +30,7 @@ global with sharing class WebAppForgotPassword {
             return new SuccessForgotPasswordResponse();
         } catch (Exception ex) {
             // Logs are only captured if a Trace Flag is active for the user
-            WebAppAuthUtils.debugLog(ex, LoggingLevel.ERROR);
+            UIBundleAuthUtils.debugLog(ex, LoggingLevel.ERROR);
 
             RestContext.response.statusCode = 500;
             return new ErrorForgotPasswordResponse('Could not send password reset link.');

package/lib/templates/project/reactexternalapp/_p_/_m_/classes/{WebAppLogin.cls → UIBundleLogin.cls}

@@ -8,7 +8,7 @@
  * @see https://developer.salesforce.com/docs/atlas.en-us.apexref.meta/apexref/apex_classes_sites.htm#apex_System_Site_login
  */
 @RestResource(urlMapping='/auth/login')
-global with sharing class WebAppLogin {
+global with sharing class UIBundleLogin {
 
     /**
      * Authenticates a user and returns a redirect URL.
@@ -23,7 +23,7 @@ global with sharing class WebAppLogin {
             validateInput(email, password);
 
             String username = email.trim().toLowerCase();
-            String sanitizedStartUrl = WebAppAuthUtils.getSanitizedStartUrl(startUrl, Site.getPathPrefix());
+            String sanitizedStartUrl = UIBundleAuthUtils.getSanitizedStartUrl(startUrl, Site.getPathPrefix());
 
             PageReference loginResult;
             try {
@@ -41,11 +41,11 @@ global with sharing class WebAppLogin {
                     'Your login attempt has failed. Make sure the username and password are correct.'
                 );
             }
-        } catch (WebAppAuthUtils.AuthException ex) {
+        } catch (UIBundleAuthUtils.AuthException ex) {
             RestContext.response.statusCode = ex.statusCode;
             return new ErrorLoginResponse(ex.messages);
         } catch (Exception ex) {
-            WebAppAuthUtils.debugLog(ex, LoggingLevel.ERROR);
+            UIBundleAuthUtils.debugLog(ex, LoggingLevel.ERROR);
             RestContext.response.statusCode = 500;
             return new ErrorLoginResponse('An unexpected error occurred. Please contact your administrator.');
         }
@@ -55,7 +55,7 @@ global with sharing class WebAppLogin {
      * Validates login input fields.
      * @param email The email to validate.
      * @param password The password to validate.
-     * @throws WebAppAuthUtils.AuthException if validation fails.
+     * @throws UIBundleAuthUtils.AuthException if validation fails.
      */
     private static void validateInput(String email, String password) {
         List<String> errors = new List<String>();
@@ -66,7 +66,7 @@ global with sharing class WebAppLogin {
             errors.add('Password is required.');
         }
         if (!errors.isEmpty()) {
-            throw new WebAppAuthUtils.AuthException(400, errors);
+            throw new UIBundleAuthUtils.AuthException(400, errors);
         }
     }
 

package/lib/templates/project/reactexternalapp/_p_/_m_/classes/{WebAppRegistration.cls → UIBundleRegistration.cls}

@@ -9,7 +9,7 @@
  * Security: Uses 'without sharing' to allow guest users to check for duplicate usernames.
  */
 @RestResource(urlMapping='/auth/register')
-global without sharing class WebAppRegistration {
+global without sharing class UIBundleRegistration {
 
     /**
      * Registers a new external user and logs them in.
@@ -35,11 +35,11 @@ global without sharing class WebAppRegistration {
             validatePassword(u, request.password);
             createUser(u, request.password);
 
-            String startUrl = WebAppAuthUtils.getSanitizedStartUrl(request.startUrl, Site.getPathPrefix());
+            String startUrl = UIBundleAuthUtils.getSanitizedStartUrl(request.startUrl, Site.getPathPrefix());
             PageReference pageRef = Site.login(request.email, request.password, startUrl);
 
             return new SuccessRegistrationResponse(pageRef?.getUrl());
-        } catch (WebAppAuthUtils.AuthException ex) {
+        } catch (UIBundleAuthUtils.AuthException ex) {
             Database.rollback(sp);
             RestContext.response.statusCode = ex.statusCode;
             return new ErrorRegistrationResponse(ex.messages);
@@ -95,7 +95,7 @@ global without sharing class WebAppRegistration {
 
         /**
          * Trims fields and validates required fields and business rules.
-         * @throws WebAppAuthUtils.AuthException if validation fails.
+         * @throws UIBundleAuthUtils.AuthException if validation fails.
          */
         public void validate() {
             email = email?.trim()?.toLowerCase();
@@ -112,7 +112,7 @@ global without sharing class WebAppRegistration {
                 errors.add('A user with this email already exists.');
             }
             if (!errors.isEmpty()) {
-                throw new WebAppAuthUtils.AuthException(400, errors);
+                throw new UIBundleAuthUtils.AuthException(400, errors);
             }
         }
     }
@@ -121,13 +121,13 @@ global without sharing class WebAppRegistration {
      * Validates password against org password policy.
      * @param user The user record.
      * @param password The password to validate.
-     * @throws WebAppAuthUtils.AuthException if password does not meet requirements.
+     * @throws UIBundleAuthUtils.AuthException if password does not meet requirements.
      */
     private static void validatePassword(User user, String password) {
         try {
             Site.validatePassword(user, password, password);
         } catch (System.SecurityException ex) {
-            throw new WebAppAuthUtils.AuthException(400, ex.getMessage());
+            throw new UIBundleAuthUtils.AuthException(400, ex.getMessage());
         }
     }
 
@@ -136,17 +136,17 @@ global without sharing class WebAppRegistration {
      * @param u The user record.
      * @param password The password for the new user.
      * @return The new user's ID.
-     * @throws WebAppAuthUtils.AuthException if user creation fails.
+     * @throws UIBundleAuthUtils.AuthException if user creation fails.
      */
     private static String createUser(User u, String password) {
         String userId;
         try {
             userId = Site.createExternalUser(u, null, password);
         } catch (Site.ExternalUserCreateException ex) {
-            throw new WebAppAuthUtils.AuthException(500, ex.getDisplayMessages());
+            throw new UIBundleAuthUtils.AuthException(500, ex.getDisplayMessages());
         }
         if (userId == null) {
-            throw new WebAppAuthUtils.AuthException(500, 'Could not register new user.');
+            throw new UIBundleAuthUtils.AuthException(500, 'Could not register new user.');
         }
         return userId;
     }

package/lib/templates/project/reactexternalapp/_p_/_m_/networks/{reactexternalapp.network → reactexternalapp.network-meta.xml}

@@ -5,7 +5,7 @@
     <changePasswordTemplate>unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
     <communityRoles/>
     <disableReputationRecordConversations>true</disableReputationRecordConversations>
-    <emailSenderAddress>trialorgfarmforu@salesforce.com.invalid.invalid</emailSenderAddress>
+    <emailSenderAddress>admin@company.com</emailSenderAddress>
     <emailSenderName>reactexternalapp</emailSenderName>
     <embeddedLoginEnabled>false</embeddedLoginEnabled>
     <enableApexCDNCaching>true</enableApexCDNCaching>
@@ -44,7 +44,7 @@
         <loginPageOverrideSetting>Designer</loginPageOverrideSetting>
         <selfRegProfilePageOverrideSetting>Designer</selfRegProfilePageOverrideSetting>
     </networkPageOverrides>
-    <newSenderAddress>trialorgfarmforu@salesforce.com</newSenderAddress>
+    <newSenderAddress>admin@company.com</newSenderAddress>
     <picassoSite>reactexternalapp1</picassoSite>
     <selfRegistration>false</selfRegistration>
     <sendWelcomeEmail>true</sendWelcomeEmail>

package/lib/templates/project/reactexternalapp/package.json

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

package/lib/templates/project/reactexternalapp/scripts/graphql-search.sh

@@ -60,8 +60,8 @@ if [ ! -f "$SCHEMA" ]; then
   echo "ERROR: schema.graphql not found at $SCHEMA"
   echo "  Make sure you are running from the SFDX project root, or pass the path explicitly:"
   echo "    bash $0 --schema <path/to/schema.graphql> <EntityName>"
-  echo "  If the file is missing entirely, generate it from the webapp dir:"
-  echo "    cd force-app/main/default/webapplications/<app-name> && npm run graphql:schema"
+  echo "  If the file is missing entirely, generate it from the ui-bundle dir:"
+  echo "    cd force-app/main/default/uiBundles/<app-name> && npm run graphql:schema"
   exit 1
 fi
 
@@ -73,8 +73,8 @@ fi
 
 if [ ! -s "$SCHEMA" ]; then
   echo "ERROR: schema.graphql is empty at $SCHEMA"
-  echo "  Regenerate it from the webapp dir:"
-  echo "    cd force-app/main/default/webapplications/<app-name> && npm run graphql:schema"
+  echo "  Regenerate it from the ui-bundle dir:"
+  echo "    cd force-app/main/default/uiBundles/<app-name> && npm run graphql:schema"
   exit 1
 fi
 

package/lib/templates/project/reactexternalapp/scripts/setup-cli.mjs

@@ -1,23 +1,23 @@
 #!/usr/bin/env node
 /**
- * One-command setup: login, deploy, optional permset/data, GraphQL schema/codegen, web app build.
+ * One-command setup: login, deploy, optional permset/data, GraphQL schema/codegen, UI bundle build.
  * Use this script to make setup easier for each app generated from this template.
  *
  * Usage:
  *   node scripts/setup-cli.mjs --target-org <alias>           # interactive step picker (all selected)
  *   node scripts/setup-cli.mjs --target-org <alias> --yes     # skip picker, run all steps
  *   node scripts/setup-cli.mjs --target-org afv5 --skip-login
- *   node scripts/setup-cli.mjs --target-org afv5 --skip-data --skip-webapp-build
- *   node scripts/setup-cli.mjs --target-org myorg --webapp-name my-app
+ *   node scripts/setup-cli.mjs --target-org afv5 --skip-data --skip-ui-bundle-build
+ *   node scripts/setup-cli.mjs --target-org myorg --ui-bundle-name my-app
  *
  * Steps (in order):
  *   1. login     — sf org login web only if org not already connected (skip with --skip-login)
- *   2. webapp    — (all web apps) npm install && npm run build so dist exists for deploy (skip with --skip-webapp-build)
+ *   2. uiBundle  — (all UI bundles) npm install && npm run build so dist exists for deploy (skip with --skip-ui-bundle-build)
  *   3. deploy    — sf project deploy start --target-org <alias> (requires dist for entity deployment)
  *   4. permset   — sf org assign permset for each *.permissionset-meta.xml (skip with --skip-permset; override via --permset-name)
  *   5. data      — prepare unique fields + sf data import tree (skipped if no data dir/plan)
- *   6. graphql   — (in webapp) npm run graphql:schema then npm run graphql:codegen
- *   7. dev       — (in webapp) npm run dev — launch dev server (skip with --skip-dev)
+ *   6. graphql   — (in UI bundle) npm run graphql:schema then npm run graphql:codegen
+ *   7. dev       — (in UI bundle) npm run dev — launch dev server (skip with --skip-dev)
  */
 
 import { spawnSync } from 'node:child_process';
@@ -44,14 +44,14 @@ function resolveSfdxSource() {
 }
 
 const SFDX_SOURCE = resolveSfdxSource();
-const WEBAPPLICATIONS_DIR = resolve(SFDX_SOURCE, 'webapplications');
+const UIBUNDLES_DIR = resolve(SFDX_SOURCE, 'uiBundles');
 const DATA_DIR = resolve(SFDX_SOURCE, 'data');
 const DATA_PLAN = resolve(SFDX_SOURCE, 'data/data-plan.json');
 
 function parseArgs() {
   const args = process.argv.slice(2);
   let targetOrg = null;
-  let webappName = null;
+  let uiBundleName = null;
   /** If non-empty, only these names are assigned; otherwise all discovered from the project. */
   const permsetNamesExplicit = [];
   let yes = false;
@@ -61,14 +61,14 @@ function parseArgs() {
     skipPermset: false,
     skipData: false,
     skipGraphql: false,
-    skipWebappBuild: false,
+    skipUIBundleBuild: 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] === '--webapp-name' && args[i + 1]) {
-      webappName = args[++i];
+    } else if (args[i] === '--ui-bundle-name' && args[i + 1]) {
+      uiBundleName = args[++i];
     } else if (args[i] === '--permset-name' && args[i + 1]) {
       permsetNamesExplicit.push(args[++i]);
     } else if (args[i] === '--skip-login') flags.skipLogin = true;
@@ -76,7 +76,7 @@ function parseArgs() {
     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-ui-bundle-build') flags.skipUIBundleBuild = true;
     else if (args[i] === '--skip-dev') flags.skipDev = true;
     else if (args[i] === '--yes' || args[i] === '-y') yes = true;
     else if (args[i] === '--help' || args[i] === '-h') {
@@ -90,14 +90,14 @@ Required:
   --target-org <alias>   Target Salesforce org alias (e.g. myorg)
 
 Options:
-  --webapp-name <name>   Web app folder name under webapplications/ (default: auto-detect)
+  --ui-bundle-name <name> UI bundle folder name under uiBundles/ (default: auto-detect)
   --permset-name <name>  Assign only this permission set (repeatable). Default: all sets under permissionsets/
   --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-ui-bundle-build Do not npm install / build the UI bundle
   --skip-dev             Do not launch the dev server at the end
   -y, --yes              Skip interactive step picker; run all enabled steps immediately
   -h, --help             Show this help
@@ -109,35 +109,35 @@ Options:
     console.error('Error: --target-org <alias> is required.');
     process.exit(1);
   }
-  return { targetOrg, webappName, permsetNamesExplicit, yes, ...flags };
+  return { targetOrg, uiBundleName, permsetNamesExplicit, yes, ...flags };
 }
 
-function discoverAllWebappDirs(webappName) {
-  if (!existsSync(WEBAPPLICATIONS_DIR)) {
-    console.error(`Error: webapplications directory not found: ${WEBAPPLICATIONS_DIR}`);
+function discoverAllUIBundleDirs(uiBundleName) {
+  if (!existsSync(UIBUNDLES_DIR)) {
+    console.error(`Error: uiBundles directory not found: ${UIBUNDLES_DIR}`);
     process.exit(1);
   }
-  const entries = readdirSync(WEBAPPLICATIONS_DIR, { withFileTypes: true });
+  const entries = readdirSync(UIBUNDLES_DIR, { withFileTypes: true });
   const dirs = entries.filter((e) => e.isDirectory() && !e.name.startsWith('.'));
   if (dirs.length === 0) {
-    console.error(`Error: No web app folder found under ${WEBAPPLICATIONS_DIR}`);
+    console.error(`Error: No UI bundle folder found under ${UIBUNDLES_DIR}`);
     process.exit(1);
   }
-  if (webappName) {
-    const requested = dirs.find((d) => d.name === webappName);
+  if (uiBundleName) {
+    const requested = dirs.find((d) => d.name === uiBundleName);
     if (!requested) {
-      console.error(`Error: Web app directory not found: ${webappName}`);
+      console.error(`Error: UI bundle directory not found: ${uiBundleName}`);
       process.exit(1);
     }
-    return [resolve(WEBAPPLICATIONS_DIR, requested.name)];
+    return [resolve(UIBUNDLES_DIR, requested.name)];
   }
-  return dirs.map((d) => resolve(WEBAPPLICATIONS_DIR, d.name));
+  return dirs.map((d) => resolve(UIBUNDLES_DIR, d.name));
 }
 
-function discoverWebappDir(webappName) {
-  const all = discoverAllWebappDirs(webappName);
-  if (all.length > 1 && !webappName) {
-    console.log(`Multiple web apps found; using first: ${all[0].split(/[/\\]/).pop()}`);
+function discoverUIBundleDir(uiBundleName) {
+  const all = discoverAllUIBundleDirs(uiBundleName);
+  if (all.length > 1 && !uiBundleName) {
+    console.log(`Multiple UI bundles found; using first: ${all[0].split(/[/\\]/).pop()}`);
   }
   return all[0];
 }
@@ -294,7 +294,7 @@ function run(name, cmd, args, opts = {}) {
 async function main() {
   const {
     targetOrg,
-    webappName,
+    uiBundleName,
     permsetNamesExplicit,
     yes,
     skipLogin: argSkipLogin,
@@ -302,7 +302,7 @@ async function main() {
     skipPermset: argSkipPermset,
     skipData: argSkipData,
     skipGraphql: argSkipGraphql,
-    skipWebappBuild: argSkipWebappBuild,
+    skipUIBundleBuild: argSkipUIBundleBuild,
     skipDev: argSkipDev,
   } = parseArgs();
 
@@ -319,7 +319,7 @@ async function main() {
 
   const stepDefs = [
     { key: 'login', label: 'Login — org authentication', enabled: !argSkipLogin, available: true },
-    { key: 'webappBuild', label: 'Webapp Build — npm install + build (pre-deploy)', enabled: !argSkipWebappBuild, available: true },
+    { key: 'uiBundleBuild', label: 'UI Bundle Build — npm install + build (pre-deploy)', enabled: !argSkipUIBundleBuild, available: true },
     { key: 'deploy', label: 'Deploy — sf project deploy start', enabled: !argSkipDeploy, available: true },
     { key: 'permset', label: permsetStepLabel, enabled: !argSkipPermset, available: true },
     { key: 'data', label: 'Data — delete + import records via Apex', enabled: !argSkipData && hasDataPlan, available: hasDataPlan },
@@ -334,26 +334,26 @@ async function main() {
   });
 
   const skipLogin = !on.login;
-  const skipWebappBuild = !on.webappBuild;
+  const skipUIBundleBuild = !on.uiBundleBuild;
   const skipDeploy = !on.deploy;
   const skipPermset = !on.permset;
   const skipData = !on.data;
   const skipGraphql = !on.graphql;
   const skipDev = !on.dev;
 
-  const needsWebapp = !skipWebappBuild || !skipGraphql || !skipDev;
-  const webappDir = needsWebapp ? discoverWebappDir(webappName) : null;
+  const needsUIBundle = !skipUIBundleBuild || !skipGraphql || !skipDev;
+  const uiBundleDir = needsUIBundle ? discoverUIBundleDir(uiBundleName) : null;
   const doData = !skipData;
 
-  console.log('Setup — target org:', targetOrg, '| web app:', webappDir ?? '(none)');
+  console.log('Setup — target org:', targetOrg, '| UI bundle:', uiBundleDir ?? '(none)');
   console.log(
-    'Steps: login=%s deploy=%s permset=%s data=%s graphql=%s webapp=%s dev=%s',
+    'Steps: login=%s deploy=%s permset=%s data=%s graphql=%s uiBundle=%s dev=%s',
     !skipLogin,
     !skipDeploy,
     !skipPermset,
     doData,
     !skipGraphql,
-    !skipWebappBuild,
+    !skipUIBundleBuild,
     !skipDev
   );
 
@@ -366,13 +366,13 @@ async function main() {
     }
   }
 
-  // Build all web apps before deploy so dist exists for entity deployment
-  if (!skipDeploy && !skipWebappBuild) {
-    const allWebappDirs = discoverAllWebappDirs(webappName);
-    for (const dir of allWebappDirs) {
+  // Build all UI Bundles before deploy so dist exists for entity deployment
+  if (!skipDeploy && !skipUIBundleBuild) {
+    const allUIBundleDirs = discoverAllUIBundleDirs(uiBundleName);
+    for (const dir of allUIBundleDirs) {
       const name = dir.split(/[/\\]/).pop();
-      run(`Web app install (${name})`, 'npm', ['install'], { cwd: dir });
-      run(`Web app build (${name})`, 'npm', ['run', 'build'], { cwd: dir });
+      run(`UI Bundle install (${name})`, 'npm', ['install'], { cwd: dir });
+      run(`UI Bundle build (${name})`, 'npm', ['run', 'build'], { cwd: dir });
     }
   }
 
@@ -535,25 +535,25 @@ async function main() {
     if (existsSync(tmpApex)) unlinkSync(tmpApex);
   }
 
-  if (!skipGraphql || !skipWebappBuild) {
-    run('Web app npm install', 'npm', ['install'], { cwd: webappDir });
+  if (!skipGraphql || !skipUIBundleBuild) {
+    run('UI Bundle npm install', 'npm', ['install'], { cwd: uiBundleDir });
   }
 
   if (!skipGraphql) {
     run('Set default org for schema', 'sf', ['config', 'set', 'target-org', targetOrg, '--global']);
-    run('GraphQL schema (introspect)', 'npm', ['run', 'graphql:schema'], { cwd: webappDir });
-    run('GraphQL codegen', 'npm', ['run', 'graphql:codegen'], { cwd: webappDir });
+    run('GraphQL schema (introspect)', 'npm', ['run', 'graphql:schema'], { cwd: uiBundleDir });
+    run('GraphQL codegen', 'npm', ['run', 'graphql:codegen'], { cwd: uiBundleDir });
   }
 
-  if (!skipWebappBuild) {
-    run('Web app build', 'npm', ['run', 'build'], { cwd: webappDir });
+  if (!skipUIBundleBuild) {
+    run('UI Bundle build', 'npm', ['run', 'build'], { cwd: uiBundleDir });
   }
 
   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: webappDir });
+    run('Dev server', 'npm', ['run', 'dev'], { cwd: uiBundleDir });
   }
 }
 

package/lib/templates/project/reactexternalapp/scripts/sf-project-setup.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
  * Run from SFDX project root: install dependencies, build, and launch the dev server
- * for the web app in force-app/main/default/webapplications/.
+ * for the UI bundle in force-app/main/default/uiBundles/.
  *
  * Usage: npm run sf-project-setup
  * (from the directory that contains force-app/ and sfdx-project.json)
@@ -15,7 +15,7 @@ import { readdirSync, existsSync, readFileSync } from 'node:fs';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ROOT = resolve(__dirname, '..');
 
-function resolveWebapplicationsDir() {
+function resolveUIBundlesDir() {
   const sfdxPath = resolve(ROOT, 'sfdx-project.json');
   if (!existsSync(sfdxPath)) {
     console.error('Error: sfdx-project.json not found at project root.');
@@ -27,25 +27,25 @@ function resolveWebapplicationsDir() {
     console.error('Error: No packageDirectories[].path found in sfdx-project.json.');
     process.exit(1);
   }
-  return resolve(ROOT, pkgDir, 'main', 'default', 'webapplications');
+  return resolve(ROOT, pkgDir, 'main', 'default', 'uiBundles');
 }
 
-function discoverWebappDir() {
-  const webapplicationsDir = resolveWebapplicationsDir();
-  if (!existsSync(webapplicationsDir)) {
-    console.error(`Error: webapplications directory not found: ${webapplicationsDir}`);
+function discoverUIBundleDir() {
+  const uiBundlesDir = resolveUIBundlesDir();
+  if (!existsSync(uiBundlesDir)) {
+    console.error(`Error: uiBundles directory not found: ${uiBundlesDir}`);
     process.exit(1);
   }
-  const entries = readdirSync(webapplicationsDir, { withFileTypes: true });
+  const entries = readdirSync(uiBundlesDir, { withFileTypes: true });
   const dirs = entries.filter((e) => e.isDirectory() && !e.name.startsWith('.'));
   if (dirs.length === 0) {
-    console.error(`Error: No web app folder found under ${webapplicationsDir}`);
+    console.error(`Error: No UI bundle folder found under ${uiBundlesDir}`);
     process.exit(1);
   }
   if (dirs.length > 1) {
-    console.log(`Multiple web apps found; using first: ${dirs[0].name}`);
+    console.log(`Multiple UI bundles found; using first: ${dirs[0].name}`);
   }
-  return resolve(webapplicationsDir, dirs[0].name);
+  return resolve(uiBundlesDir, dirs[0].name);
 }
 
 function run(label, cmd, args, opts) {
@@ -56,11 +56,11 @@ function run(label, cmd, args, opts) {
   }
 }
 
-const webappDir = discoverWebappDir();
+const uiBundleDir = discoverUIBundleDir();
 console.log('SFDX project root:', ROOT);
-console.log('Web app directory:', webappDir);
+console.log('UI bundle directory:', uiBundleDir);
 
-run('npm install', 'npm', ['install'], { cwd: webappDir });
-run('npm run build', 'npm', ['run', 'build'], { cwd: webappDir });
+run('npm install', 'npm', ['install', '--registry', 'https://registry.npmjs.org/'], { cwd: uiBundleDir });
+run('npm run build', 'npm', ['run', 'build'], { cwd: uiBundleDir });
 console.log('\n--- Launching dev server (Ctrl+C to stop) ---\n');
-run('npm run dev', 'npm', ['run', 'dev'], { cwd: webappDir });
+run('npm run dev', 'npm', ['run', 'dev'], { cwd: uiBundleDir });