Merge pull request #846 from salesforcecli/feat/update-webapp-output-dir-description

@W-21182296 Clarify the information around "webapplications" folder + version bump

Author: iowillhoit

messages/webApplication.md

@@ -50,4 +50,12 @@ Directory for saving the created files.
 
 # flags.output-dir.description
 
-The location can be an absolute path or relative to the current working directory. If not specified, the command reads your sfdx-project.json and defaults to the webapplications directory within your default package directory. When running outside a Salesforce DX project, defaults to the current directory.
+The location can be an absolute path or relative to the current working directory. 
+
+**Important:** The generator automatically ensures the output directory ends with "webapplications". If your specified path doesn't end with "webapplications", it's automatically appended. The web application is created at "<output-dir>/<webappname>".
+
+**Examples:**
+- "--output-dir force-app/main/default" → Creates a web application at "force-app/main/default/webapplications/MyWebApp/"
+- "--output-dir force-app/main/default/webapplications" → Creates a web application at "force-app/main/default/webapplications/MyWebApp/" (no change)
+
+If not specified, the command reads your sfdx-project.json and defaults to "webapplications" directory within your default package directory. When running outside a Salesforce DX project, defaults to the current directory.

package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@salesforce/core": "^8.25.1",
     "@salesforce/sf-plugins-core": "^12",
-    "@salesforce/templates": "^65.5.8"
+    "@salesforce/templates": "^65.5.9"
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.3.8",

test/commands/template/generate/webapp/index.nut.ts

@@ -106,9 +106,15 @@ describe('template generate web application:', () => {
       expect(stderr).to.contain(nls.localize('DoubleUnderscoreError'));
     });
 
-    it('should throw error when output dir is not webapplications folder', () => {
-      const stderr = execCmd('template generate webapp --name TestApp --output-dir /tmp/invalid').shellOutput.stderr;
-      expect(stderr).to.contain(nls.localize('MissingWebApplicationsDir'));
+    it('should auto-append webapplications folder when output dir does not end with webapplications', () => {
+      const outputDir = path.join(session.project.dir, 'force-app', 'main', 'default', 'test-dir');
+      const expectedOutputDir = path.join(outputDir, 'webapplications');
+      execCmd(`template generate webapp --name TestApp --output-dir "${outputDir}"`, { ensureExitCode: 0 });
+      assert.file([
+        path.join(expectedOutputDir, 'TestApp', 'TestApp.webapplication-meta.xml'),
+        path.join(expectedOutputDir, 'TestApp', 'src', 'index.html'),
+        path.join(expectedOutputDir, 'TestApp', 'webapplication.json'),
+      ]);
     });
   });
 });

yarn.lock

@@ -1660,10 +1660,10 @@
     cli-progress "^3.12.0"
     terminal-link "^3.0.0"
 
-"@salesforce/templates@^65.5.8":
-  version "65.5.8"
-  resolved "https://registry.yarnpkg.com/@salesforce/templates/-/templates-65.5.8.tgz#df9b87aca219005b6a0a4a56ae3b233e1e599449"
-  integrity sha512-LFmQ41bLav1TD9Y0nLSxnzGEThmDsMI7zGmRlXhHFrDjeUMcXaeYboN2q9UMtAKYHiSaUn54TTEh+0m5cVGHkw==
+"@salesforce/templates@^65.5.9":
+  version "65.5.9"
+  resolved "https://registry.yarnpkg.com/@salesforce/templates/-/templates-65.5.9.tgz#42d75e0f81ab504f2a62b79eeeff6e635ba33c0d"
+  integrity sha512-t/DZHdb9WJUr87lxU9Lzu7bZa0uKAULRbjkLp2g2L9BtYgQNZTtcNUCH341oxJC+BHNsrGimQ9gkwvJpy9C5zg==
   dependencies:
     "@salesforce/kit" "^3.2.4"
     ejs "^3.1.10"