Merge branches 'main' and 'main' of https://github.com/cahaseler/PROMISE

.github/workflows/on_main.yml

@@ -24,7 +24,7 @@ jobs:
           persist-credentials: false
 
       - name: Install node 18
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: yarn
@@ -45,7 +45,7 @@ jobs:
           yarn build-static
 
       - name: Swap to node 14 for semantic release compatibility
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 14
 
@@ -79,7 +79,7 @@ jobs:
           persist-credentials: false
 
       - name: Install node 18
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: yarn
@@ -92,7 +92,7 @@ jobs:
           yarn build-linux
 
       - name: login to dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "empact",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "CC-BY-4.0",
   "description": "Environment and Maturity Program Assessment and Control Tool",
   "keywords": [
@@ -33,5 +33,5 @@
     "prompt-confirm": "2.0.4"
   },
   "dependencies": {},
-  "packageManager": "[email protected].21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  "packageManager": "[email protected].22"
 }

src-tauri/Cargo.toml

@@ -12,12 +12,12 @@ rust-version = "1.60"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5.2", features = [] }
+tauri-build = { version = "=1.5.2", features = [] }
 
 [dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6.5", features = [] }
+serde_json = "=1.0.117"
+serde = { version = "=1.0.202", features = ["derive"] }
+tauri = { version = "=1.6.7", features = [] }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "EMPACT",
-    "version": "1.0.3"
+    "version": "1.0.4"
   },
   "tauri": {
     "allowlist": {

web/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.18.2 AS deps
+FROM node:20.13.1 AS deps
 
 WORKDIR /usr/src/app
 

web/app/(frontend)/components/version-indicator.tsx

@@ -1,4 +1,4 @@
 export function VersionIndicator() {
-  let version = { version: "1.0.3" };
+  let version = { version: "1.0.4" };
   return <div>{"v" + version.version}</div>;
 }

web/app/api/version/route.ts

@@ -6,5 +6,5 @@ import { NextResponse } from "next/server";
  * NOTE: This file is automatically updated by a script. You don't need to increment this version manually.
  */
 export async function GET(): Promise<NextResponse> {
-  return NextResponse.json({ version: "1.0.3" });
+  return NextResponse.json({ version: "1.0.4" });
 }

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "empact_web",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "CC-BY-4.0",
   "description": "Environment and Maturity Program Assessment and Control Tool",
   "keywords": [
@@ -23,18 +23,18 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "react": "^18",
-    "react-dom": "^18",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "next": "14.2.3"
   },
   "devDependencies": {
-    "typescript": "^5",
-    "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
-    "postcss": "^8",
-    "tailwindcss": "^3.4.1",
-    "eslint": "^8",
+    "typescript": "5.4.5",
+    "@types/node": "20.12.12",
+    "@types/react": "18.3.2",
+    "@types/react-dom": "18.3.0",
+    "postcss": "8.4.38",
+    "tailwindcss": "3.4.3",
+    "eslint": "9.3.0",
     "eslint-config-next": "14.2.3"
   },
   "pkg": {