feat: npm publish takes channel into consideration for a distribution…

… tag
markuczy · Nov 29, 2024 · 640c4fd · 640c4fd
1 parent 6dd0b41
commit 640c4fd
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 81 deletions.
diff --git a/libs/accelerator/project.json b/libs/accelerator/project.json
@@ -34,12 +34,6 @@
           "codeCoverage": true
         }
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "accelerator"
-      }
     }
   },
   "tags": []

diff --git a/libs/angular-accelerator/project.json b/libs/angular-accelerator/project.json
@@ -67,12 +67,6 @@
         ]
       }
     },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "angular-accelerator"
-      }
-    },
     "storybook": {
       "executor": "@storybook/angular:start-storybook",
       "options": {

diff --git a/libs/angular-auth/project.json b/libs/angular-auth/project.json
@@ -52,12 +52,6 @@
           "libs/angular-auth/package.json"
         ]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "portal-integration-angular"
-      }
     }
   }
 }
diff --git a/libs/angular-integration-interface/project.json b/libs/angular-integration-interface/project.json
@@ -51,12 +51,6 @@
           "libs/angular-integration-interface/**/*.html"
         ]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "angular-integration-interface"
-      }
     }
   }
 }
diff --git a/libs/angular-remote-components/project.json b/libs/angular-remote-components/project.json
@@ -52,12 +52,6 @@
           "libs/angular-remote-components/package.json"
         ]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "angular-remote-components"
-      }
     }
   }
 }
diff --git a/libs/angular-testing/project.json b/libs/angular-testing/project.json
@@ -51,12 +51,6 @@
           "libs/angular-testing/**/*.html"
         ]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "angular-testing"
-      }
     }
   }
 }
diff --git a/libs/angular-webcomponents/project.json b/libs/angular-webcomponents/project.json
@@ -51,12 +51,6 @@
           "libs/angular-webcomponents/**/*.html"
         ]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "angular-webcomponents"
-      }
     }
   }
 }
diff --git a/libs/integration-interface/project.json b/libs/integration-interface/project.json
@@ -45,12 +45,6 @@
           "codeCoverage": true
         }
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "integration-interface"
-      }
     }
   },
   "tags": []

diff --git a/libs/keycloak-auth/project.json b/libs/keycloak-auth/project.json
@@ -52,12 +52,6 @@
           "libs/keycloak-auth/package.json"
         ]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "portal-integration-angular"
-      }
     }
   }
 }
diff --git a/libs/ngrx-accelerator/project.json b/libs/ngrx-accelerator/project.json
@@ -44,12 +44,6 @@
       "options": {
         "lintFilePatterns": ["libs/ngrx-accelerator/**/*.ts", "libs/ngrx-accelerator/package.json"]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "ngrx-accelerator"
-      }
     }
   }
 }
diff --git a/libs/portal-integration-angular/project.json b/libs/portal-integration-angular/project.json
@@ -67,12 +67,6 @@
         ]
       }
     },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "portal-integration-angular"
-      }
-    },
     "copy-additional-styles": {
       "executor": "nx:run-commands",
       "options": {

diff --git a/libs/portal-layout-styles/project.json b/libs/portal-layout-styles/project.json
@@ -20,13 +20,7 @@
       "options": {
         "lintFilePatterns": ["libs/portal-layout-styles/**/*.ts", "libs/portal-layout-styles/package.json"]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "portal-layout-styles"
-      }
-    },    
+    },   
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],

diff --git a/libs/shell-core/project.json b/libs/shell-core/project.json
@@ -52,12 +52,6 @@
           "libs/shell-core/package.json"
         ]
       }
-    },
-    "release": {
-      "executor": "nx-release:build-update-publish",
-      "options": {
-        "libName": "shell-core"
-      }
     }
   }
 }
diff --git a/release-script.sh b/release-script.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 echo "$1"
+echo "$2"
 export VERSION=$1
+channel=$2
+registry="registry.npmjs.org"
 packageJsonData=$(cat package.json)
 topLevelPackageVersion=$(echo "$packageJsonData" | jq -r '.version')
 if [[ $topLevelPackageVersion != $1 ]]
@@ -14,15 +17,19 @@ while IFS= read -r folder; do
     folder_names+=("$folder")
 done < <(find "$directory" -mindepth 1 -maxdepth 1 -type d | awk -F "/" '{print $NF}' | sort | uniq)
 
+wd=$(pwd)
 for folder in "${folder_names[@]}"; do
+    cd $wd
     packageJsonDataLib=$(cat libs/$folder/package.json)
     libPackageVersion=$(echo "$packageJsonDataLib" | jq -r '.version')
     packageJsonDataLib=$(echo "$packageJsonDataLib" | sed -E 's/(@onecx[^"]+?": *?")([^"]+)"/\1^'$1'"/')
     echo $packageJsonDataLib > libs/$folder/package.json
     if [[ $libPackageVersion != $1 ]]
     then
         npx -p replace-json-property rjp libs/$folder/package.json version $1
-        npx nx run $folder:release
+        npx nx build --project $folder
+        cd ./dist/libs/$folder
+        echo //$registry/:_authToken=$NPM_TOKEN >> .npmrc && npm publish --dry-run --tag=$channel
     fi  
 done
 

diff --git a/release.config.js b/release.config.js
@@ -32,7 +32,7 @@ module.exports = {
     [
       '@semantic-release/exec',
       {
-        prepareCmd: `./release-script.sh \${nextRelease.version}`,
+        prepareCmd: `./release-script.sh \${nextRelease.version} \${nextRelease.channel}`,
       },
     ],
     [
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ module.exports = { @@
         [
           '@semantic-release/exec',
           {
-            prepareCmd: `./release-script.sh \${nextRelease.version}`,
+            prepareCmd: `./release-script.sh \${nextRelease.version} \${nextRelease.channel}`,
           },
         ],
         [
@@ Expand Down @@