Merge branch 'release/2.1.2'

D3strukt0r · Jul 17, 2024 · 7f117f9 · 7f117f9
2 parents 28236c0 + 7f3412e
commit 7f117f9
Show file tree

Hide file tree

Showing 3 changed files with 174 additions and 182 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,6 +3,8 @@
 # Please see the documentation for all configuration options:
 # https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 
+# Note: unique combination of 'package-ecosystem', 'directory', and 'target-branch'
+
 version: 2
 updates:
   # GitHub Actions
@@ -24,24 +26,8 @@ updates:
     target-branch: "develop"
     labels:
       - "dependabot :robot:"
-    reviewers:
-      - "D3strukt0r"
-    schedule:
-      interval: "weekly" # on monday
-      time: "16:00"
-      timezone: "Europe/Zurich"
-    groups:
-      pwa-dependencies:
-        applies-to: version-updates
-        patterns:
-          - "*"
-        update-types:
-          - "major"
-  - package-ecosystem: "npm"
-    directory: "/pwa"
-    target-branch: "develop"
-    labels:
-      - "dependabot :robot:"
+    #reviewers:
+    #  - "D3strukt0r"
     schedule:
       interval: "weekly" # on monday
       time: "16:00"
@@ -54,3 +40,9 @@ updates:
         update-types:
           - "minor"
           - "patch"
+      #pwa-dependencies:
+      #  applies-to: version-updates
+      #  patterns:
+      #    - "*"
+      #  update-types:
+      #    - "major"
diff --git a/pwa/package.json b/pwa/package.json
@@ -28,15 +28,15 @@
     "coverage": "vitest run --coverage"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.5.2",
-    "@fortawesome/free-brands-svg-icons": "^6.5.2",
-    "@fortawesome/free-regular-svg-icons": "^6.5.2",
-    "@fortawesome/free-solid-svg-icons": "^6.5.2",
+    "@fortawesome/fontawesome-svg-core": "^6.6.0",
+    "@fortawesome/free-brands-svg-icons": "^6.6.0",
+    "@fortawesome/free-regular-svg-icons": "^6.6.0",
+    "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@tailwindcss/forms": "^0.5.7",
     "@tanstack/eslint-plugin-query": "^5.51.1",
-    "@tanstack/react-query": "^5.51.1",
-    "@tanstack/react-query-devtools": "^5.51.1",
+    "@tanstack/react-query": "^5.51.3",
+    "@tanstack/react-query-devtools": "^5.51.3",
     "@testing-library/dom": "^10.3.2",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.0",
@@ -74,10 +74,10 @@
     "react-dom": "^18.3.1",
     "react-dropzone": "^14.2.3",
     "react-i18next": "^14.1.3",
-    "react-router-dom": "^6.24.1",
-    "tailwindcss": "^3.4.5",
+    "react-router-dom": "^6.25.0",
+    "tailwindcss": "^3.4.6",
     "typescript": "^5.5.3",
-    "vite": "^5.3.3",
+    "vite": "^5.3.4",
     "vite-plugin-chunk-split": "^0.5.0",
     "vite-plugin-svgr": "^4.2.0",
     "vitest": "^1.6.0"