Merge remote-tracking branch 'origin/main' into feature/error-indicators

.github/workflows/windows.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - name: Clone repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up NodeJS
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
 
@@ -23,7 +23,7 @@ jobs:
 
     - name: Read package JSON
       id: packagejson
-      uses: gregoranders/[email protected].20
+      uses: gregoranders/[email protected].21
 
     - name: Compile source
       run: yarn build:app:unpacked
@@ -36,13 +36,13 @@ jobs:
       run: iscc setup-script.iss /Dversion=${{ steps.packagejson.outputs.version }}
 
     - name: Upload portable version
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: GlucoseTicker-${{ steps.packagejson.outputs.version }}-portable
         path: dist/win-unpacked
 
     - name: Upload installer
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: GlucoseTicker-${{ steps.packagejson.outputs.version }}-setup
         path: dist/GlucoseTicker-${{ steps.packagejson.outputs.version }}-setup.exe

package.json

@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^12.0.0",
-    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^8.0.0",
     "@types/node": "^14.0.5",
     "@types/react": "^16.9.35",
@@ -38,11 +38,11 @@
     "electron-builder": "^22.7.0",
     "idb-keyval": "^3.2.0",
     "nexe": "^4.0.0-rc.1",
-    "prettier": "^2.0.5",
+    "prettier": "^3.0.0",
     "react": "^16.13.1",
     "react-countdown": "^2.2.1",
     "react-dom": "^16.13.1",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.0",
     "rollup": "^2.10.9",
     "rollup-plugin-copy": "^3.3.0",
     "typescript": "^3.9.3"

renovate.json

@@ -2,5 +2,20 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base"
+  ],
+  "addLabels": [
+    "renovate"
+  ],
+  "packageRules": [
+    {
+      "groupName": "automerge",
+      "automerge": true,
+      "matchUpdateTypes": [
+        "minor",
+        "patch",
+        "pin",
+        "digest"
+      ]
+    }
   ]
-}
+}