Add optional boolean flag to syncNpmrc() and deduplicate its logic in PublishAction

darsi-an · darsi-an · commit 4def09d273cb · 2020-02-01T22:45:46.000-05:00
diff --git a/apps/rush-lib/src/cli/actions/PublishAction.ts b/apps/rush-lib/src/cli/actions/PublishAction.ts
@@ -500,26 +500,12 @@ export class PublishAction extends BaseRushAction {
     }
   }
 
-  private _addNpmPublishHome(): void {
-    // Example: "common\config\rush\.npmrc-publish"
-    const sourceNpmrcPublishPath: string = path.join(this.rushConfiguration.commonRushConfigFolder, '.npmrc-publish');
-
-    try {
-      // Check if .npmrc-publish file exists to use for publishing
-      if (FileSystem.exists(sourceNpmrcPublishPath)) {
-        // Sync "common\config\rush\.npmrc-publish" --> "common\temp\publish-home\.npmrc"
-        Utilities.createFolderWithRetry(this._targetNpmrcPublishFolder);
-
-        // Copy down the committed .npmrc-publish file, if there is one
-        Utilities.copyAndTrimNpmrcFile(sourceNpmrcPublishPath, this._targetNpmrcPublishPath);
-      } else if (FileSystem.exists(this._targetNpmrcPublishPath)) {
-        // If the source .npmrc-publish doesn't exist and there is one in the target, delete the one in the target
-        console.log(`Deleting ${this._targetNpmrcPublishPath}`);
-        FileSystem.deleteFile(this._targetNpmrcPublishPath);
-      }
-    } catch (e) {
-      throw new Error(`Error syncing .npmrc-publish file: ${e}`);
-    }
+  private _addNpmPublishHome(): void {    
+    // Create "common\temp\publish-home" folder, if it doesn't exist
+    Utilities.createFolderWithRetry(this._targetNpmrcPublishFolder);
+
+    // Copy down the committed "common\config\rush\.npmrc-publish" file, if there is one
+    Utilities.syncNpmrc(this.rushConfiguration.commonRushConfigFolder, this._targetNpmrcPublishFolder, true);
   }
 
   private _addSharedNpmConfig(env: { [key: string]: string | undefined }, args: string[]): void {
diff --git a/apps/rush-lib/src/scripts/install-run.ts b/apps/rush-lib/src/scripts/install-run.ts
@@ -104,8 +104,8 @@ function _copyAndTrimNpmrcFile(sourceNpmrcPath: string, targetNpmrcPath: string)
  *
  * IMPORTANT: THIS CODE SHOULD BE KEPT UP TO DATE WITH _syncNpmrc() FROM scripts/install-run.ts
  */
-function _syncNpmrc(sourceNpmrcFolder: string, targetNpmrcFolder: string): void {
-  const sourceNpmrcPath: string = path.join(sourceNpmrcFolder, '.npmrc');
+function _syncNpmrc(sourceNpmrcFolder: string, targetNpmrcFolder: string, usePublishHome?: boolean): void {
+  const sourceNpmrcPath: string = path.join(sourceNpmrcFolder, !usePublishHome ? '.npmrc' : '.npmrc-publish');
   const targetNpmrcPath: string = path.join(targetNpmrcFolder, '.npmrc');
   try {
     if (fs.existsSync(sourceNpmrcPath)) {
diff --git a/apps/rush-lib/src/utilities/Utilities.ts b/apps/rush-lib/src/utilities/Utilities.ts
@@ -554,8 +554,8 @@ export class Utilities {
    *
    * IMPORTANT: THIS CODE SHOULD BE KEPT UP TO DATE WITH _syncNpmrc() FROM scripts/install-run.ts
    */
-  public static syncNpmrc(sourceNpmrcFolder: string, targetNpmrcFolder: string): void {
-    const sourceNpmrcPath: string = path.join(sourceNpmrcFolder, '.npmrc');
+  public static syncNpmrc(sourceNpmrcFolder: string, targetNpmrcFolder: string, usePublishHome?: boolean): void {
+    const sourceNpmrcPath: string = path.join(sourceNpmrcFolder, !usePublishHome ? '.npmrc' : '.npmrc-publish');
     const targetNpmrcPath: string = path.join(targetNpmrcFolder, '.npmrc');
     try {
       if (FileSystem.exists(sourceNpmrcPath)) {
