From 0df44d41b149a6eeab54db29dd8a19f82b210c48 Mon Sep 17 00:00:00 2001
From: Demis Bellot <demis.bellot@gmail.com>
Date: Mon, 11 Nov 2024 10:47:01 +0800
Subject: [PATCH] update publish ci scripts

---
 .../workflows/npm-publish-github-packages.yml | 19 +------------------
 .github/workflows/publish.yml                 | 15 ++++++++-------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/npm-publish-github-packages.yml b/.github/workflows/npm-publish-github-packages.yml
index 8d6c403..d3df19d 100644
--- a/.github/workflows/npm-publish-github-packages.yml
+++ b/.github/workflows/npm-publish-github-packages.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 22
 
       - run: npm ci
       - run: npm install http-server -g
@@ -45,20 +45,3 @@ jobs:
             ./dist/servicestack-client.min.mjs
             ./dist/servicestack-client.mjs
             ./dist/servicestack-client.umd.js
-
-  publish:
-    needs: package
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 22
-          registry-url: https://npm.pkg.github.com/
-      - run: npm ci
-      - run: npm run release
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fc1bd0b..b5e87bb 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,20 +11,21 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: 22
       - run: npm ci
-      - run: npm run build && npm run build-minify
+      - run: npm install uglifyjs -g
+      - run: npm run build
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v3
         with:
           name: servicestack-client
           path: |
-            ./dist/index.js
             ./dist/index.d.ts
-            ./dist/servicestack-client.mjs
+            ./dist/index.js
             ./dist/servicestack-client.min.js
             ./dist/servicestack-client.min.mjs
+            ./dist/servicestack-client.mjs
             ./dist/servicestack-client.umd.js
 
   publish-npm:
@@ -34,10 +35,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: 22
           registry-url: 'https://registry.npmjs.org'
       - run: npm ci
-      - run: npm run build
-      - run: npm publish
+      - run: npm install uglifyjs bump -g
+      - run: npm release
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}