Address review feedback in PublishAction

- Build publish workspace paths with template strings.
- Allow PnpmWorkspaceFile settings to be passed to the constructor and use
  it for the catalog-only publish workspace.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: bmiddha

libraries/rush-lib/src/cli/actions/PublishAction.ts

@@ -669,12 +669,13 @@ export class PublishAction extends BaseRushAction {
     }
 
     // Example: "common/temp/publish-workspaces/default"
-    const workspaceFolder: string = path.join(commonTempFolder, 'publish-workspaces', subspace.subspaceName);
+    const workspaceFolder: string = `${commonTempFolder}/publish-workspaces/${subspace.subspaceName}`;
     await FileSystem.ensureEmptyFolderAsync(workspaceFolder);
 
-    const workspaceFilePath: string = path.join(workspaceFolder, RushConstants.pnpmWorkspaceFileName);
-    const workspaceFile: PnpmWorkspaceFile = new PnpmWorkspaceFile(workspaceFilePath);
-    workspaceFile.catalogs = globalCatalogs;
+    const workspaceFilePath: string = `${workspaceFolder}/${RushConstants.pnpmWorkspaceFileName}`;
+    const workspaceFile: PnpmWorkspaceFile = new PnpmWorkspaceFile(workspaceFilePath, {
+      catalogs: globalCatalogs
+    });
     await workspaceFile.saveAsync(workspaceFilePath, { onlyIfChanged: false });
 
     return workspaceFolder;

libraries/rush-lib/src/logic/pnpm/PnpmWorkspaceFile.ts

@@ -122,6 +122,11 @@ interface IPnpmWorkspaceYaml {
   globalPnpmfile: string | undefined;
 }
 
+/**
+ * The pnpm settings that can be provided when constructing a {@link PnpmWorkspaceFile}.
+ */
+export type PnpmWorkspaceFileSettings = Partial<Omit<IPnpmWorkspaceYaml, 'packages'>>;
+
 export class PnpmWorkspaceFile extends BaseWorkspaceFile {
   /**
    * The filename of the workspace file.
@@ -147,14 +152,21 @@ export class PnpmWorkspaceFile extends BaseWorkspaceFile {
   /**
    * The PNPM workspace file is used to specify the location of workspaces relative to the root
    * of your PNPM install.
+   *
+   * @param workspaceYamlFilename - The path to the `pnpm-workspace.yaml` file
+   * @param settings - Optional pnpm settings to initialize the file with
    */
-  public constructor(workspaceYamlFilename: string) {
+  public constructor(workspaceYamlFilename: string, settings?: PnpmWorkspaceFileSettings) {
     super();
 
     this.workspaceFilename = workspaceYamlFilename;
     // Ignore any existing file since this file is generated and we need to handle deleting packages
     // If we need to support manual customization, that should be an additional parameter for "base file"
     this.#workspacePackages = new Set<string>();
+
+    if (settings) {
+      Object.assign(this, settings);
+    }
   }
 
   /**

libraries/rush-lib/src/logic/pnpm/test/PnpmWorkspaceFile.test.ts

@@ -41,6 +41,28 @@ describe(PnpmWorkspaceFile.name, () => {
 
       expect(writtenContent).toContain('\\[app-with-brackets\\]');
     });
+
+    it('initializes settings passed to the constructor', async () => {
+      const workspaceFile: PnpmWorkspaceFile = new PnpmWorkspaceFile(workspaceFilePath, {
+        catalogs: {
+          default: {
+            react: '^18.0.0'
+          }
+        },
+        minimumReleaseAge: 1440
+      });
+
+      expect(workspaceFile.catalogs).toEqual({ default: { react: '^18.0.0' } });
+      expect(workspaceFile.minimumReleaseAge).toEqual(1440);
+
+      await workspaceFile.saveAsync(workspaceFilePath, { onlyIfChanged: true });
+
+      expect(writtenContent).toEqual(
+        ['catalogs:', '  default:', '    react: ^18.0.0', 'minimumReleaseAge: 1440', 'packages: []', ''].join(
+          '\n'
+        )
+      );
+    });
   });
 
   describe('catalog functionality', () => {