one more time

gka · gka · commit 9d327355b0af · 2025-05-26T23:03:50.000+02:00
diff --git a/.github/workflows/preview-publish.yml b/.github/workflows/preview-publish.yml
@@ -63,24 +63,37 @@ jobs:
             - name: Generate preview version
               run: |
                   pr_number=${{ github.event.pull_request.number }}
-                  
-                  # Check if a prerelease version for this PR already exists on npm
-                  existing_versions=$(npm view svelteplot versions --json 2>/dev/null | grep -o "\".*pr-${pr_number}[.][0-9]*\"" || echo "")
-                  
+
+                  # Get existing versions like ["0.2.7-pr-65.0", "0.2.7-pr-65.1"]
+                  existing_versions=$(npm view svelteplot versions --json 2>/dev/null | grep -o "\"[0-9]*\.[0-9]*\.[0-9]*-pr-${pr_number}\.[0-9]*\"" || echo "")
+
                   if [ -n "$existing_versions" ]; then
-                    # Get the latest prerelease version for this PR
+                    # Get the highest existing prerelease number
                     latest_version=$(echo $existing_versions | sed 's/,/\n/g' | sort -V | tail -n 1 | sed 's/"//g')
+                    
                     echo "Found existing prerelease version: $latest_version"
                     
-                    # Set the package version to the existing version so npm version will properly increment
-                    npm version $latest_version --no-git-tag-version
+                    # Extract base version and prerelease number
+                    base_version=$(echo $latest_version | sed -E "s/-pr-${pr_number}\.[0-9]+//")
+                    prerelease_num=$(echo $latest_version | sed -E "s/.*-pr-${pr_number}\.([0-9]+)$/\1/")
+                    
+                    # Increment prerelease number
+                    next_prerelease=$((prerelease_num + 1))
+                    
+                    next_version="${base_version}-pr-${pr_number}.${next_prerelease}"
+                    
+                    echo "Bumping to next prerelease version: $next_version"
+                    
+                    # Update package.json
+                    npm version "$next_version" --no-git-tag-version
+                  else
+                    # No existing prerelease, create a fresh one off the current version
+                    npm version prerelease --preid=pr-${pr_number} --no-git-tag-version
                   fi
-                  
-                  # Now increment the prerelease version (or create it if it doesn't exist)
-                  npm version prerelease --preid=pr-${pr_number} --no-git-tag-version
-                  
+
                   echo "Generated version: $(node -p "require('./package.json').version")"
 
+
             - name: Publish to npm
               env:
                   NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH }}
