Merge pull request #4101 from fbbdev/v3-alpha-bugfix/publish-ci-versioning

[v3] Fix npm ci

Author: leaanthony

.github/workflows/publish-npm.yml

@@ -41,18 +41,17 @@ jobs:
             v3/internal/runtime/desktop/@wailsio/runtime/types/*.d.ts
             v3/internal/runtime/desktop/@wailsio/runtime/docs/**/*.*
 
-      - name: test action
+      - name: Bump version
         if: steps.verify-changed-files.outputs.files_changed == 'true'
-        id: get-version
-        uses: beaconbrigade/[email protected]
-        with:
-          path: v3/internal/runtime/desktop/@wailsio/runtime
+        id: bump-version
+        working-directory: v3/internal/runtime/desktop/@wailsio/runtime
+        run: echo "version=$(npm --no-git-tag-version --force version prerelease)" >> "$GITHUB_OUTPUT"
 
       - name: Commit changes
         if: steps.verify-changed-files.outputs.files_changed == 'true'
         run: |
           git add .
-          git commit -m "[skip ci] Publish @wailsio/runtime ${{ steps.get-version.outputs.version }}"
+          git commit -m "[skip ci] Publish @wailsio/runtime ${{ steps.bump-version.outputs.version }}"
           git push
 
       - uses: JS-DevTools/npm-publish@v3

v3/tasks/events/generate.go

@@ -2,9 +2,6 @@ package main
 
 import (
 	"bytes"
-	"github.com/Masterminds/semver/v3"
-	"github.com/tidwall/gjson"
-	"github.com/tidwall/sjson"
 	"os"
 	"strconv"
 	"strings"
@@ -402,36 +399,4 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-
-	// Load the runtime package.json
-	packageJsonFilename := "../../internal/runtime/desktop/@wailsio/runtime/package.json"
-	packageJSON, err := os.ReadFile(packageJsonFilename)
-	if err != nil {
-		panic(err)
-	}
-	version := gjson.Get(string(packageJSON), "version").String()
-	// Parse and increment version
-	v := semver.MustParse(version)
-	prerelease := v.Prerelease()
-	// Split the prerelease by the "." and increment the last part by 1
-	parts := strings.Split(prerelease, ".")
-	prereleaseDigits, err := strconv.Atoi(parts[len(parts)-1])
-	if err != nil {
-		panic(err)
-	}
-	prereleaseNumber := strconv.Itoa(prereleaseDigits + 1)
-	parts[len(parts)-1] = prereleaseNumber
-	prerelease = strings.Join(parts, ".")
-	newVersion, err := v.SetPrerelease(prerelease)
-	if err != nil {
-		panic(err)
-	}
-
-	// Set new version using sjson
-	newJSON, err := sjson.Set(string(packageJSON), "version", newVersion.String())
-	if err != nil {
-		panic(err)
-	}
-
-	err = os.WriteFile(packageJsonFilename, []byte(newJSON), 0644)
 }

v3/tasks/events/go.mod

@@ -1,14 +1,3 @@
 module events
 
-go 1.22
-
-require (
-	github.com/Masterminds/semver/v3 v3.3.0
-	github.com/tidwall/gjson v1.18.0
-	github.com/tidwall/sjson v1.2.5
-)
-
-require (
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
-)
+go 1.24