@salesforce/templates 65.5.1 → 65.5.2

package/lib/generators/webApplicationGenerator.js

@@ -22,7 +22,7 @@ class WebApplicationGenerator extends baseGenerator_1.BaseGenerator {
         utils_1.CreateUtil.checkInputs(this.options.webappname);
         utils_1.CreateUtil.checkInputs(this.options.template);
         const fileparts = path.resolve(this.outputdir).split(path.sep);
-        if (!this.options.internal && !fileparts.includes('webApplications')) {
+        if (!this.options.internal && !fileparts.includes('webapplications')) {
             throw new Error(i18n_1.nls.localize('MissingWebApplicationsDir'));
         }
     }
@@ -44,22 +44,18 @@ class WebApplicationGenerator extends baseGenerator_1.BaseGenerator {
     generateDefault(webappDir, webappname, masterLabel) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             this.sourceRootWithPartialPath(path.join('webapplication', 'webappbasic'));
-            yield this.render(this.templatePath('_webapplication.webApplication-meta.xml'), this.destinationPath(path.join(webappDir, `${webappname}.webApplication-meta.xml`)), { apiVersion: this.apiversion, masterLabel });
-            yield this.render(this.templatePath('index.html'), this.destinationPath(path.join(webappDir, 'index.html')), { masterLabel });
-            // Copy the rest of the files over
+            yield this.render(this.templatePath('_webapplication.webapplication-meta.xml'), this.destinationPath(path.join(webappDir, `${webappname}.webapplication-meta.xml`)), { apiVersion: this.apiversion, masterLabel });
             const templatePath = this.sourceRoot();
-            yield this.copyDirectoryRecursive(templatePath, webappDir, new Set(['_webapplication.webApplication-meta.xml']));
+            yield this.copyDirectoryRecursive(templatePath, webappDir, new Set(['_webapplication.webapplication-meta.xml']));
         });
     }
     generateReactBasic(webappDir, webappname, masterLabel) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             this.sourceRootWithPartialPath(path.join('webapplication', 'reactbasic'));
-            yield this.render(this.templatePath('_webapplication.webApplication-meta.xml'), this.destinationPath(path.join(webappDir, `${webappname}.webApplication-meta.xml`)), { apiVersion: this.apiversion, masterLabel });
-            yield this.render(this.templatePath('index.html'), this.destinationPath(path.join(webappDir, 'index.html')), { masterLabel });
+            yield this.render(this.templatePath('_webapplication.webapplication-meta.xml'), this.destinationPath(path.join(webappDir, `${webappname}.webapplication-meta.xml`)), { apiVersion: this.apiversion, masterLabel });
             yield this.render(this.templatePath('package.json'), this.destinationPath(path.join(webappDir, 'package.json')), { webappname });
-            // Copy the rest of the files over
             const templatePath = this.sourceRoot();
-            yield this.copyDirectoryRecursive(templatePath, webappDir, new Set(['_webapplication.webApplication-meta.xml']));
+            yield this.copyDirectoryRecursive(templatePath, webappDir, new Set(['_webapplication.webapplication-meta.xml', 'package.json']));
         });
     }
     copyDirectoryRecursive(sourceDir_1, destDir_1) {
@@ -76,14 +72,10 @@ class WebApplicationGenerator extends baseGenerator_1.BaseGenerator {
                 if (excludeFiles.has(entry.name)) {
                     continue;
                 }
-                // Skip files that already exist
-                if (fs.existsSync(destPath)) {
-                    continue;
-                }
                 if (entry.isDirectory()) {
                     yield this.copyDirectoryRecursive(sourcePath, destPath, excludeFiles);
                 }
-                else {
+                else if (!fs.existsSync(destPath)) {
                     // Copy file and track it
                     const content = yield (0, promises_1.readFile)(sourcePath);
                     yield (0, promises_1.mkdir)(path.dirname(destPath), { recursive: true });

package/lib/generators/webApplicationGenerator.js.map

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

package/lib/i18n/i18n.js

@@ -26,7 +26,7 @@ exports.messages = {
     MissingWaveTemplatesDir: "Analytics templates must have a parent folder named 'waveTemplates'.",
     MissingAuraDir: "Lightning bundles must have a parent folder named 'aura'.",
     MissingLWCDir: "Lightning bundles must have a parent folder named 'lwc'.",
-    MissingWebApplicationsDir: "Web applications must have a parent folder named 'webApplications'.",
+    MissingWebApplicationsDir: "Web applications must have a parent folder named 'webapplications'.",
     MissingFlexipagesDir: "FlexiPages must have a parent folder named 'flexipages'.",
     MissingLightningComponentTemplate: 'Template %s not available for component type %s.',
     localCustomTemplateDoNotExist: 'Local custom templates folder %s does not exist',

package/lib/templates/webapplication/reactbasic/.prettierrc

@@ -1,11 +1,11 @@
 {
-    "semi": true,
-    "trailingComma": "es5",
-    "singleQuote": true,
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "bracketSpacing": true,
-    "arrowParens": "avoid",
-    "endOfLine": "lf"
-}
+  "semi": true,
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "endOfLine": "lf"
+}

package/lib/templates/webapplication/{webappbasic/_webapplication.webApplication-meta.xml → reactbasic/_webapplication.webapplication-meta.xml}

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <WebApplication xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion><%= apiVersion %></apiVersion>
     <masterLabel><%= masterLabel %></masterLabel>
     <description>A Salesforce web application.</description>
-    <active>true</active>
+    <isActive>true</isActive>
+    <version>1</version>
 </WebApplication>

package/lib/templates/webapplication/reactbasic/eslint.config.js

@@ -1,10 +1,10 @@
 import js from '@eslint/js';
-import globals from 'globals';
-import reactHooks from 'eslint-plugin-react-hooks';
-import reactRefresh from 'eslint-plugin-react-refresh';
 import tseslint from '@typescript-eslint/eslint-plugin';
 import tsparser from '@typescript-eslint/parser';
 import react from 'eslint-plugin-react';
+import reactHooks from 'eslint-plugin-react-hooks';
+import reactRefresh from 'eslint-plugin-react-refresh';
+import globals from 'globals';
 
 export default [
   // Global ignores
@@ -110,4 +110,4 @@ export default [
       '@typescript-eslint/no-explicit-any': 'off',
     },
   },
-];
+];

package/lib/templates/webapplication/reactbasic/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%= masterLabel %></title>
+    <title>Welcome to React App</title>
   </head>
   <body>
     <div id="root"></div>

package/lib/templates/webapplication/reactbasic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "base-react-app",
   "private": true,
-  "version": "1.0.6",
+  "version": "1.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -11,7 +11,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@salesforce/webapp-experimental": "^0.2.0",
+    "@salesforce/webapp-experimental": "*",
     "@tailwindcss/vite": "^4.1.17",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
-    "@salesforce/vite-plugin-webapp-experimental": "^0.2.0",
+    "@salesforce/vite-plugin-webapp-experimental": "*",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",

package/lib/templates/webapplication/reactbasic/src/api/graphql-operations-types.ts

@@ -0,0 +1,127 @@
+export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
+export type Exact<T extends { [key: string]: unknown }> = {
+  [K in keyof T]: T[K];
+};
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & {
+  [SubKey in K]?: Maybe<T[SubKey]>;
+};
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
+  [SubKey in K]: Maybe<T[SubKey]>;
+};
+export type MakeEmpty<
+  T extends { [key: string]: unknown },
+  K extends keyof T,
+> = { [_ in K]?: never };
+export type Incremental<T> =
+  | T
+  | {
+      [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never;
+    };
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+  ID: { input: string; output: string };
+  String: { input: string; output: string };
+  Boolean: { input: boolean; output: boolean };
+  Int: { input: number; output: number };
+  Float: { input: number; output: number };
+  Base64: { input: any; output: any };
+  /** An arbitrary precision signed decimal */
+  BigDecimal: { input: any; output: any };
+  /** An arbitrary precision signed integer */
+  BigInteger: { input: any; output: any };
+  /** An 8-bit signed integer */
+  Byte: { input: any; output: any };
+  /** A UTF-16 code unit; a character on Unicode's BMP */
+  Char: { input: any; output: any };
+  Currency: { input: any; output: any };
+  Date: { input: any; output: any };
+  DateTime: { input: any; output: any };
+  Double: { input: any; output: any };
+  Email: { input: any; output: any };
+  EncryptedString: { input: any; output: any };
+  /** Can be set to an ID or a Reference to the result of another mutation operation. */
+  IdOrRef: { input: any; output: any };
+  JSON: { input: any; output: any };
+  Latitude: { input: any; output: any };
+  /** A 64-bit signed integer */
+  Long: { input: any; output: any };
+  LongTextArea: { input: any; output: any };
+  Longitude: { input: any; output: any };
+  MultiPicklist: { input: any; output: any };
+  Percent: { input: any; output: any };
+  PhoneNumber: { input: any; output: any };
+  Picklist: { input: any; output: any };
+  RichTextArea: { input: any; output: any };
+  /** A 16-bit signed integer */
+  Short: { input: any; output: any };
+  TextArea: { input: any; output: any };
+  Time: { input: any; output: any };
+  Url: { input: any; output: any };
+};
+
+export enum DataType {
+  Address = 'ADDRESS',
+  Anytype = 'ANYTYPE',
+  Base64 = 'BASE64',
+  Boolean = 'BOOLEAN',
+  Combobox = 'COMBOBOX',
+  Complexvalue = 'COMPLEXVALUE',
+  Currency = 'CURRENCY',
+  Date = 'DATE',
+  Datetime = 'DATETIME',
+  Double = 'DOUBLE',
+  Email = 'EMAIL',
+  Encryptedstring = 'ENCRYPTEDSTRING',
+  Int = 'INT',
+  Json = 'JSON',
+  Junctionidlist = 'JUNCTIONIDLIST',
+  Location = 'LOCATION',
+  Long = 'LONG',
+  Multipicklist = 'MULTIPICKLIST',
+  Percent = 'PERCENT',
+  Phone = 'PHONE',
+  Picklist = 'PICKLIST',
+  Reference = 'REFERENCE',
+  String = 'STRING',
+  Textarea = 'TEXTAREA',
+  Time = 'TIME',
+  Url = 'URL',
+}
+
+export enum FieldExtraTypeInfo {
+  ExternalLookup = 'EXTERNAL_LOOKUP',
+  ImageUrl = 'IMAGE_URL',
+  IndirectLookup = 'INDIRECT_LOOKUP',
+  Personname = 'PERSONNAME',
+  Plaintextarea = 'PLAINTEXTAREA',
+  Richtextarea = 'RICHTEXTAREA',
+  SwitchablePersonname = 'SWITCHABLE_PERSONNAME',
+}
+
+export enum ResultOrder {
+  Asc = 'ASC',
+  Desc = 'DESC',
+}
+
+export type GetHighRevenueAccountsQueryVariables = Exact<{
+  minRevenue?: InputMaybe<Scalars['Currency']['input']>;
+}>;
+
+export type GetHighRevenueAccountsQuery = {
+  uiapi: {
+    query: {
+      Account?: {
+        edges?: Array<{
+          node?: {
+            Id: string;
+            Name?: { value?: string | null } | null;
+            AnnualRevenue?: { value?: any | null } | null;
+            Industry?: { value?: any | null } | null;
+            Website?: { value?: any | null } | null;
+          } | null;
+        } | null> | null;
+      } | null;
+    };
+  };
+};

package/lib/templates/webapplication/reactbasic/src/api/utils/query/highRevenueAccountsQuery.graphql

@@ -0,0 +1,29 @@
+query GetHighRevenueAccounts($minRevenue: Currency) {
+  uiapi {
+    query {
+      Account(
+        where: { AnnualRevenue: { gt: $minRevenue } }
+        orderBy: { AnnualRevenue: { order: DESC } }
+        first: 50
+      ) {
+        edges {
+          node {
+            Id
+            Name {
+              value
+            }
+            AnnualRevenue {
+              value
+            }
+            Industry {
+              value
+            }
+            Website {
+              value
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/lib/templates/webapplication/reactbasic/src/app.tsx

@@ -1,13 +1,13 @@
 import { createBrowserRouter, RouterProvider } from 'react-router';
 import { routes } from '@/routes';
-import { StrictMode } from 'react'
-import { createRoot } from 'react-dom/client'
-import './styles/global.css'
+import { StrictMode } from 'react';
+import { createRoot } from 'react-dom/client';
+import './styles/global.css';
 
 const router = createBrowserRouter(routes);
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <RouterProvider router={router} />
-  </StrictMode>,
-)
+  </StrictMode>
+);

package/lib/templates/webapplication/reactbasic/src/appLayout.tsx

@@ -1,9 +1,9 @@
-import { Outlet } from "react-router";
+import { Outlet } from 'react-router';
 
 export default function AppLayout() {
-    return (
-        <>
-            <Outlet />
-        </>
-    );
-}
+  return (
+    <>
+      <Outlet />
+    </>
+  );
+}

package/lib/templates/webapplication/reactbasic/src/pages/About.tsx

@@ -1,12 +1,12 @@
 function About() {
-    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">About</h1>
-                <p className="text-lg text-gray-600">This is the about page.</p>
-            </div>
-        </div>
-    );
+  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">About</h1>
+        <p className="text-lg text-gray-600">This is the about page.</p>
+      </div>
+    </div>
+  );
 }
 
-export default About;
+export default About;

package/lib/templates/webapplication/reactbasic/src/pages/Home.tsx

@@ -1,12 +1,12 @@
 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>
-    );
-}
+  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>
+  );
+}

package/lib/templates/webapplication/reactbasic/src/pages/NotFound.tsx

@@ -15,4 +15,4 @@ export default function NotFound() {
       </div>
     </div>
   );
-}
+}

package/lib/templates/webapplication/reactbasic/src/routes.tsx

@@ -1,7 +1,8 @@
-import type { RouteObject } from "react-router";
-import AppLayout from "./appLayout";
-import Home from "@/pages/Home";
-import About from "./pages/About";
+import type { RouteObject } from 'react-router';
+import AppLayout from '@/appLayout';
+import Home from '@/pages/Home';
+import About from './pages/About';
+import NotFound from './pages/NotFound';
 
 export const routes: RouteObject[] = [
   {
@@ -11,13 +12,17 @@ export const routes: RouteObject[] = [
       {
         index: true,
         element: <Home />,
-        handle: { showInNavigation: true, label: 'Home' }
+        handle: { showInNavigation: true, label: 'Home' },
       },
       {
         path: 'about',
         element: <About />,
-        handle: { showInNavigation: true, label: 'About' }
-      }
-    ]
-  }
-]
+        handle: { showInNavigation: true, label: 'About' },
+      },
+      {
+        path: '*',
+        element: <NotFound />,
+      },
+    ],
+  },
+];

package/lib/templates/webapplication/reactbasic/src/styles/global.css

@@ -1,10 +1,12 @@
-@import "tailwindcss";
+@import 'tailwindcss';
 
 @layer base {
-  html, body, #root {
+  html,
+  body,
+  #root {
     @apply min-h-screen;
   }
-  
+
   body {
     @apply antialiased bg-white;
   }

package/lib/templates/webapplication/reactbasic/tsconfig.json

@@ -32,7 +32,5 @@
     }
   },
   "include": ["src", "vite-env.d.ts", "vitest-env.d.ts"],
-  "references": [
-    { "path": "./tsconfig.node.json" }
-  ]
+  "references": [{ "path": "./tsconfig.node.json" }]
 }

package/lib/templates/webapplication/reactbasic/webapplication.json

@@ -0,0 +1,7 @@
+{
+  "outputDir": "dist",
+  "routing": {
+    "trailingSlash": "never",
+    "fallback": "/index.html"
+  }
+}

package/lib/templates/webapplication/{reactbasic/_webapplication.webApplication-meta.xml → webappbasic/_webapplication.webapplication-meta.xml}

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <WebApplication xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion><%= apiVersion %></apiVersion>
     <masterLabel><%= masterLabel %></masterLabel>
     <description>A Salesforce web application.</description>
-    <active>true</active>
+    <isActive>true</isActive>
+    <version>1</version>
 </WebApplication>

package/lib/templates/webapplication/webappbasic/src/index.html

@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>Welcome to Web App</title>
+	</head>
+	<body>
+		<h1>Welcome to Web App</h1>
+	</body>
+</html>

package/lib/templates/webapplication/webappbasic/webapplication.json

@@ -0,0 +1,7 @@
+{
+  "outputDir": "src",
+  "routing": {
+    "trailingSlash": "never",
+    "fallback": "/index.html"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/templates",
-  "version": "65.5.1",
+  "version": "65.5.2",
   "description": "Salesforce JS library for templates",
   "bugs": "https://github.com/forcedotcom/salesforcedx-templates/issues",
   "main": "lib/index.js",
@@ -13,8 +13,8 @@
   ],
   "dependencies": {
     "@salesforce/kit": "^3.2.4",
-    "@sfdc-webapps/base-reference-app": "^1.0.6",
-    "@sfdc-webapps/base-web-app": "^1.0.6",
+    "@salesforce/webapp-template-base-react-app-experimental": "^1.3.5",
+    "@salesforce/webapp-template-base-web-app-experimental": "^1.3.5",
     "ejs": "^3.1.10",
     "got": "^11.8.6",
     "hpagent": "^1.2.0",

package/lib/templates/webapplication/reactbasic/README.md

@@ -1,73 +0,0 @@
-# React + TypeScript + Vite
-
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
-
-Currently, two official plugins are available:
-
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
-
-## React Compiler
-
-The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
-
-```js
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-
-      // Remove tseslint.configs.recommended and replace with this
-      tseslint.configs.recommendedTypeChecked,
-      // Alternatively, use this for stricter rules
-      tseslint.configs.strictTypeChecked,
-      // Optionally, add this for stylistic rules
-      tseslint.configs.stylisticTypeChecked,
-
-      // Other configs...
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
-```
-
-You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
-
-```js
-// eslint.config.js
-import reactX from 'eslint-plugin-react-x'
-import reactDom from 'eslint-plugin-react-dom'
-
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-      // Enable lint rules for React
-      reactX.configs['recommended-typescript'],
-      // Enable lint rules for React DOM
-      reactDom.configs.recommended,
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-])
-```