@sudosf/npm-publish-sandbox 3.10.8 → 4.0.0

package/.gitlab-ci.yml

@@ -1,20 +1,9 @@
-include:
-  - template: Jobs/SAST.gitlab-ci.yml
-  - template: Jobs/Dependency-Scanning.v2.gitlab-ci.yml
-  - template: Jobs/Code-Quality.gitlab-ci.yml
-  - template: Jobs/Secret-Detection.gitlab-ci.yml
-
-variables:
-  KIBANA_VERSION: 9.1.7
-  KIBANA_IMAGE_TAG: "9.1.9"
-
 stages:
-  - test
-  - yarn_steps
   - deploy
 
-artifactory-push:
+npm-publish:
   stage: deploy
+  image: node:22.17.1
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
@@ -24,15 +13,17 @@ artifactory-push:
       when: always
     - when: never
   script:
-    - npm config set registry https://artifactory.orbit.prod.vodacom.co.za/artifactory/api/npm/vod-npm/
-    - npm config set //artifactory.orbit.prod.vodacom.co.za/artifactory/api/npm/vod-npm/:_auth $(echo -n $ARTIFACTORY_USERNAME:$ARTIFACTORY_PASSWORD | base64)
+    - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
     - |
       BASE_NAME=$(node -p "require('./package.json').name")
       VERSION=$(node -p "require('./package.json').version")
-      TAG="v$VERSION"
+      MAJOR_VERSION=$(echo "$VERSION" | grep -o '^[0-9]*')
 
-      echo "Base package name: $BASE_NAME"
-      echo "Version: $VERSION"
+      echo "========================================"
+      echo "Package : $BASE_NAME"
+      echo "Version : $VERSION"
+      echo "Branch  : $CI_COMMIT_BRANCH"
+      echo "========================================"
 
       # Determine environment from branch
       if [[ $CI_COMMIT_BRANCH == "stable" || $CI_COMMIT_BRANCH =~ ^hotfix/stable- ]]; then
@@ -45,35 +36,67 @@ artifactory-push:
         ENV="staging"
       fi
 
-      echo "Publishing to $ENV environment"
+      echo "Target environment: $ENV"
 
-      # Configure git for tagging
+      # ----------------------------------------
+      # Git tagging
+      # ----------------------------------------
+      echo "[git] Configuring remote..."
       git config --global --add safe.directory $CI_PROJECT_DIR
       git remote set-url origin "https://oauth2:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"
 
-      # Create generic version tag only for stable releases
+      # Only create a clean vX.Y.Z git tag on stable
       if [[ "$ENV" == "stable" ]]; then
-        if ! git rev-parse "$TAG" >/dev/null 2>&1; then
-          git tag "$TAG"
-          git push origin "$TAG"
+        if ! git rev-parse "v$VERSION" >/dev/null 2>&1; then
+          echo "[git] Creating stable release tag: v$VERSION"
+          git tag "v$VERSION"
+          git push origin "v$VERSION"
+        else
+          echo "[git] Tag v$VERSION already exists, skipping"
         fi
       fi
 
-      # Create/update environment-specific tag
-      git tag -f "$TAG-$ENV"
-      git push origin "$TAG-$ENV" --force
+      # Create/update environment-version git tag e.g. dev-3.10.8, qa-3.10.8
+      echo "[git] Creating/updating environment git tag: $ENV-$VERSION"
+      git tag -f "$ENV-$VERSION"
+      git push origin "$ENV-$VERSION" --force
 
-      # Publish to npm with mutable environment dist-tag
-      npm publish --tag "$ENV"
+      # ----------------------------------------
+      # npm publish (ONLY on master/dev — first publish)
+      # All other environments just add dist-tags
+      # ----------------------------------------
+      if [[ "$ENV" == "dev" ]]; then
+        echo "[npm] Publishing $BASE_NAME@$VERSION with tag: dev-$VERSION"
+        npm publish --tag "dev-$VERSION" --access public
+        echo "[npm] Publish complete"
+      else
+        echo "[npm] Skipping publish — version $VERSION already published from master"
+        echo "[npm] Adding dist-tag '$ENV-$VERSION' to $BASE_NAME@$VERSION"
+        npm dist-tag add "$BASE_NAME@$VERSION" "$ENV-$VERSION"
+      fi
 
-      # Extract major version for major-version-specific dist-tags
-      MAJOR_VERSION=$(echo "$VERSION" | grep -o '^[0-9]*')
+      # ----------------------------------------
+      # Additional dist-tags
+      # ----------------------------------------
 
-      # Add immutable version-specific dist-tag
-      npm dist-tag add "$BASE_NAME@$VERSION" "$VERSION-$ENV"
+      # Mutable env tag e.g. dev, qa (always points to latest of that env)
+      echo "[npm] Adding mutable env dist-tag: $ENV"
+      npm dist-tag add "$BASE_NAME@$VERSION" "$ENV"
 
-      # Add major-version-specific dist-tags
+      # Major version env tag e.g. dev-3, qa-3
+      echo "[npm] Adding major-version dist-tag: $ENV-$MAJOR_VERSION"
       npm dist-tag add "$BASE_NAME@$VERSION" "$ENV-$MAJOR_VERSION"
-      npm dist-tag add "$BASE_NAME@$VERSION" "$VERSION-$ENV-$MAJOR_VERSION"
 
-      echo "Published $BASE_NAME@$VERSION with tags @$ENV, @$VERSION-$ENV, @$ENV-$MAJOR_VERSION, @$VERSION-$ENV-$MAJOR_VERSION"
+      # On stable, also point 'latest' to this version
+      if [[ "$ENV" == "stable" ]]; then
+        echo "[npm] Stable release — updating 'latest' tag to $VERSION"
+        npm dist-tag add "$BASE_NAME@$VERSION" latest
+      fi
+
+      echo "========================================"
+      echo "Done! $BASE_NAME@$VERSION tagged as:"
+      echo "  - $ENV-$VERSION  (immutable, version-specific)"
+      echo "  - $ENV           (mutable, always latest of this env)"
+      echo "  - $ENV-$MAJOR_VERSION (mutable, latest of this env in major v$MAJOR_VERSION)"
+      [[ "$ENV" == "stable" ]] && echo "  - latest"
+      echo "========================================"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sudosf/npm-publish-sandbox",
-  "version": "3.10.8",
+  "version": "4.0.0",
   "description": "Sandbox package for testing npm publish to Artifactory",
   "main": "index.js",
   "license": "MIT",