feat: rename react web app templates (#768)

Co-authored-by: mzhang0 <mzhang0@users.noreply.github.com>

Author: mzhang0

.eslintrc.json

@@ -68,7 +68,7 @@
     "*.js",
     "src/templates/lightningcomponent/lwc/typeScript/*",
     "src/templates/webapplication/reactbasic/**/*",
-    "src/templates/project/reactb2e/**/*",
-    "src/templates/project/reactb2x/**/*"
+    "src/templates/project/reactinternalapp/**/*",
+    "src/templates/project/reactexternalapp/**/*"
   ]
 }

.gitignore

@@ -65,5 +65,5 @@ oclif.manifest.json
 src/templates/webapplication/
 
 # ignore project templates copied from npm during build (copy-templates)
-src/templates/project/reactb2e/
-src/templates/project/reactb2x/
+src/templates/project/reactinternalapp/
+src/templates/project/reactexternalapp/

package.json

@@ -24,10 +24,10 @@
   "devDependencies": {
     "@salesforce/dev-config": "^4.3.2",
     "@salesforce/dev-scripts": "^11.0.2",
-    "@salesforce/webapp-template-app-react-template-b2e-experimental": "^1.112.5",
-    "@salesforce/webapp-template-app-react-template-b2x-experimental": "^1.112.5",
-    "@salesforce/webapp-template-base-react-app-experimental": "^1.112.5",
-    "@salesforce/webapp-template-base-web-app-experimental": "^1.112.5",
+    "@salesforce/webapp-template-app-react-template-b2e-experimental": "^1.114.0",
+    "@salesforce/webapp-template-app-react-template-b2x-experimental": "^1.114.0",
+    "@salesforce/webapp-template-base-react-app-experimental": "^1.114.0",
+    "@salesforce/webapp-template-base-web-app-experimental": "^1.114.0",
     "@salesforce/prettier-config": "^0.0.4",
     "@types/chai-as-promised": "^7.1.8",
     "@types/ejs": "^3.1.5",

scripts/copy-templates.js

@@ -68,22 +68,22 @@ const TEMPLATES = [
       ),
     destSubpath: 'webapplication/reactbasic',
   },
-  // Project templates (reactb2e, reactb2x)
+  // Project templates (reactinternalapp, reactexternalapp)
   {
     packageName:
       '@salesforce/webapp-template-app-react-template-b2e-experimental',
     getSourceDir: (packageDir) => path.join(packageDir, 'dist'),
-    destSubpath: 'project/reactb2e',
-    appFolderInNpm: 'appreacttemplateb2e',
-    appSiteFolderInNpm: 'appreacttemplateb2e1',
+    destSubpath: 'project/reactinternalapp',
+    appFolderInNpm: 'reactinternalapp',
+    appSiteFolderInNpm: 'reactinternalapp1',
   },
   {
     packageName:
       '@salesforce/webapp-template-app-react-template-b2x-experimental',
     getSourceDir: (packageDir) => path.join(packageDir, 'dist'),
-    destSubpath: 'project/reactb2x',
-    appFolderInNpm: 'appreacttemplateb2x',
-    appSiteFolderInNpm: 'appreacttemplateb2x1',
+    destSubpath: 'project/reactexternalapp',
+    appFolderInNpm: 'reactexternalapp',
+    appSiteFolderInNpm: 'reactexternalapp1',
   },
 ];
 

src/generators/projectGenerator.ts

@@ -18,8 +18,8 @@ const VALID_PROJECT_TEMPLATES = [
   'standard',
   'empty',
   'analytics',
-  'reactb2e',
-  'reactb2x',
+  'reactinternalapp',
+  'reactexternalapp',
   'agent',
   'nativemobile',
 ] as const;
@@ -133,7 +133,7 @@ export default class ProjectGenerator extends BaseGenerator<ProjectOptions> {
 
   /**
    * Returns template path for primary; if it doesn't exist, returns fallback path.
-   * Used so reactb2e/reactb2x can omit shared files and fall back to standard.
+   * Used so reactinternalapp/reactexternalapp can omit shared files and fall back to standard.
    */
   private templatePathWithFallback(primary: string, fallback: string): string {
     const primaryPath = this.templatePath(primary);

src/utils/template-placeholders.ts

@@ -62,7 +62,7 @@ export default [
     toPath: 'skills/_k_',
     replacement: 'feature-react-agentforce-conversation-client-embedded-agent',
   },
-  // Path shortening under app folder (reactb2e/reactb2x) for Windows path length.
+  // Path shortening under app folder (reactinternalapp/reactexternalapp) for Windows path length.
   {
     key: 'FEATURES_PLACEHOLDER',
     placeholder: '_f_',
@@ -78,6 +78,13 @@ export default [
     parent: '_f_',
     replacement: 'object-search',
   },
+  {
+    key: 'EXAMPLES_PLACEHOLDER',
+    placeholder: '_ex_',
+    dirInNpm: '__examples__',
+    parent: '_os_',
+    replacement: '__examples__',
+  },
   {
     key: 'GLOBAL_SEARCH_PLACEHOLDER',
     placeholder: '_gs_',

src/utils/types.ts

@@ -192,8 +192,8 @@ export interface ProjectOptions extends TemplateOptions {
     | 'standard'
     | 'empty'
     | 'analytics'
-    | 'reactb2e'
-    | 'reactb2x'
+    | 'reactinternalapp'
+    | 'reactexternalapp'
     | 'agent'
     | 'nativemobile';
   manifest: boolean;

src/utils/webappTemplateUtils.ts

@@ -78,7 +78,10 @@ export const EJS_EXTENSIONS = new Set([
 ]);
 
 /** Templates that have a full folder under src/templates/project/ (populated at build time from npm) */
-export const BUILT_IN_FULL_TEMPLATES = new Set(['reactb2e', 'reactb2x']);
+export const BUILT_IN_FULL_TEMPLATES = new Set([
+  'reactinternalapp',
+  'reactexternalapp',
+]);
 
 /**
  * Default app/site names embedded in each full template; all are renamed to the project name.
@@ -88,13 +91,13 @@ export const FULL_TEMPLATE_DEFAULT_NAMES: Record<
   string,
   { base: string; withSuffix: string }
 > = {
-  reactb2e: {
-    base: 'appreacttemplateb2e',
-    withSuffix: 'appreacttemplateb2e1',
+  reactinternalapp: {
+    base: 'reactinternalapp',
+    withSuffix: 'reactinternalapp1',
   },
-  reactb2x: {
-    base: 'appreacttemplateb2x',
-    withSuffix: 'appreacttemplateb2x1',
+  reactexternalapp: {
+    base: 'reactexternalapp',
+    withSuffix: 'reactexternalapp1',
   },
 };
 
@@ -136,6 +139,8 @@ export const A4D_SKILL_AGENTFORCE_PLACEHOLDER = '_k_';
 export const FEATURES_PLACEHOLDER = '_f_';
 /** Replaced with literal "object-search". */
 export const OBJECT_SEARCH_PLACEHOLDER = '_os_';
+/** Replaced with literal "__examples__". */
+export const EXAMPLES_PLACEHOLDER = '_ex_';
 /** Replaced with literal "global-search". */
 export const GLOBAL_SEARCH_PLACEHOLDER = '_gs_';
 /** Replaced with literal "components". */
@@ -158,6 +163,7 @@ export const PLACEHOLDER_KEYS = [
   'A4D_SKILL_AGENTFORCE_PLACEHOLDER',
   'FEATURES_PLACEHOLDER',
   'OBJECT_SEARCH_PLACEHOLDER',
+  'EXAMPLES_PLACEHOLDER',
   'GLOBAL_SEARCH_PLACEHOLDER',
   'COMPONENTS_PLACEHOLDER',
   'DETAIL_PLACEHOLDER',
@@ -273,7 +279,7 @@ export type GenerateBuiltInFullTemplateOptions = {
 };
 
 /**
- * Generate project files from a built-in full template (e.g. reactb2e, reactb2x).
+ * Generate project files from a built-in full template (e.g. reactinternalapp, reactexternalapp).
  * Builds template vars and name replacements and delegates to generateFromProjectTemplateDir.
  */
 export async function generateBuiltInFullTemplate(
@@ -346,9 +352,9 @@ export type GenerateFromProjectTemplateDirOptions = {
 };
 
 /**
- * Recursively walk a full project template directory (e.g. reactb2e, reactb2x),
+ * Recursively walk a full project template directory (e.g. reactinternalapp, reactexternalapp),
  * rendering EJS for text files and copying the rest. Renames template default app/site
- * names (e.g. appreacttemplateb2e) to the project name in paths and file contents.
+ * names (e.g. reactinternalapp) to the project name in paths and file contents.
  */
 export async function generateFromProjectTemplateDir(
   sourceDir: string,