Fix versioning (#29)

Author: soup-bowl

.github/workflows/main-be.yml

@@ -1,61 +1,61 @@
 name: Construct Container
 
 on:
-    push:
-        branches:
-            - main
-        paths:
-            - "backend/**"
-    release:
-        types:
-            - published
-    workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - "backend/**"
+  release:
+    types:
+      - published
+  workflow_dispatch:
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-        - name: Checkout Codebase
-          uses: actions/checkout@v4
-    
-        - name: Login to GitHub Container Registry
-          uses: docker/login-action@v3
-          with:
-            registry: ghcr.io
-            username: soup-bowl
-            password: ${{ secrets.CR_PAT }}
-    
-        - name: Set up QEMU
-          uses: docker/setup-qemu-action@v3
-    
-        - name: Set up Docker Buildx
-          id: buildx
-          uses: docker/setup-buildx-action@v3
-    
-        - name: Build for Edge
-          if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
-          uses: docker/build-push-action@v5
-          with:
-            push: true
-            tags: ghcr.io/soup-bowl/netscrape:edge
-            platforms: >
-              linux/amd64
-#              linux/arm64
-            context: "{{defaultContext}}:backend"
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-    
-        - name: Build for Production
-          if: ${{ github.event_name == 'release' }}
-          uses: docker/build-push-action@v5
-          with:
-            push: true
-            tags: >
-              ghcr.io/soup-bowl/netscrape:${{ github.event.release.tag_name }},
-              ghcr.io/soup-bowl/netscrape:latest
-            platforms: >
-              linux/amd64
-#              linux/arm64
-            context: "{{defaultContext}}:backend"
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Codebase
+        uses: actions/checkout@v4
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: soup-bowl
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build for Edge
+        if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: ghcr.io/soup-bowl/netscrape:edge
+          platforms: >
+            linux/amd64
+          #              linux/arm64
+          context: "{{defaultContext}}:backend"
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build for Production
+        if: ${{ github.event_name == 'release' }}
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: >
+            ghcr.io/soup-bowl/netscrape:${{ github.event.release.tag_name }},
+            ghcr.io/soup-bowl/netscrape:latest
+          platforms: >
+            linux/amd64
+          #              linux/arm64
+          context: "{{defaultContext}}:backend"
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/main-fe.yml

@@ -1,62 +1,74 @@
 name: 🚀 Deploy!
 
 on:
-    push:
-        branches:
-            - main
-        paths:
-            - "frontend/**"
-    release:
-        types:
-            - published
-    workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - "frontend/**"
+  release:
+    types:
+      - published
+  workflow_dispatch:
 
 concurrency:
-    group: "pages"
-    cancel-in-progress: true
+  group: "pages"
+  cancel-in-progress: true
 
 jobs:
-    build:
-        environment:
-            name: github-pages
-            url: ${{ steps.deployment.outputs.page_url }}
-
-        runs-on: ubuntu-latest
-
-        permissions:
-            contents: read
-            deployments: write
-
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                fetch-depth: 0
-
-            - uses: sonarsource/sonarqube-scan-action@master
-              env:
-                SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-                SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-
-            - name: 🏗 Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20.x
-
-            - name: Set Version
-              run: |
-                VERSION=$(jq -r '.version' frontend/package.json)
-                GIT_COMMIT=$(git rev-parse --short HEAD)
-                echo "VITE_VER=${VERSION}-${GIT_COMMIT}" >> frontend/.env.production
-
-            - name: 📦 Build Site
-              run: cd frontend && npm ci && npm run build:ion
-
-            - name: 🚛 Publish Site
-              uses: cloudflare/pages-action@v1
-              with:
-                  apiToken: ${{ secrets.CF_API_TOKEN }}
-                  accountId: ${{ secrets.CF_ACCOUNT_ID }}
-                  projectName: discog
-                  directory: ./frontend/dist
-                  gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-                  branch: ${{ github.event_name == 'release' && 'main' || 'not-hotdog' }}
+  build:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      deployments: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: sonarsource/sonarqube-scan-action@master
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+
+      - name: 🏗 Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+
+      - name: Identify version
+        if: github.event_name == 'release'
+        id: get_version
+        uses: battila7/get-version-action@v2
+
+      - name: change version in NPM
+        if: github.event_name == 'release'
+        uses: reedyuk/npm-version@1.2.2
+        with:
+          version: ${{ steps.get_version.outputs.version-without-v  }}
+          github-tag-version: "false"
+
+      - name: Set Version
+        run: |
+          VERSION=$(jq -r '.version' frontend/package.json)
+          GIT_COMMIT=$(git rev-parse --short HEAD)
+          echo "VITE_VER=${VERSION}-${GIT_COMMIT}" >> frontend/.env.production
+
+      - name: 📦 Build Site
+        run: cd frontend && npm ci && npm run build:ion
+
+      - name: 🚛 Publish Site
+        uses: cloudflare/pages-action@v1
+        with:
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          projectName: discog
+          directory: ./frontend/dist
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.event_name == 'release' && 'main' || 'not-hotdog' }}

frontend/package-lock.json

@@ -2,7 +2,7 @@
 	"name": "localib",
 	"description": "Collects your Discogs library for offline usage",
 	"private": true,
-	"version": "0.1.6",
+	"version": "develop",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",