upgrade to Electron 41, Node 22 CI, and fix coverage SPA cache

.github/workflows/matter.yml

@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
         os: [ubuntu-22.04]
 
     steps:
@@ -41,8 +41,8 @@ jobs:
       - run: npm ci
       - run: npm run metafile-check
       - run: npm run version-stamp
-      - run: npm rebuild canvas --update-binary
-      - run: npm rebuild libxmljs --update-binary
+      - run: npm rebuild canvas
+      - run: npm rebuild libxmljs
       - run: npm run lic
       - run: npm run build-spa
       - run: npm run lint
@@ -67,7 +67,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 24.x
           cache: 'npm'
 
       - name: Prepare Linux build environment
@@ -77,8 +77,8 @@ jobs:
 
       - name: Initialize...
         run: |
-          npm rebuild canvas --update-binary
-          npm rebuild libxmljs --update-binary
+          npm rebuild canvas
+          npm rebuild libxmljs
           npm ci
           npm run version-stamp
 

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
         os: [ubuntu-22.04]
 
     steps:
@@ -42,8 +42,8 @@ jobs:
       - run: sudo apt-get install --fix-missing xvfb
       - run: npm ci
       - run: npm run version-stamp
-      - run: npm rebuild canvas --update-binary
-      - run: npm rebuild libxmljs --update-binary
+      - run: npm rebuild canvas
+      - run: npm rebuild libxmljs
       - run: npm run build-spa
       - run: npm run test:e2e-ci -- ${{steps.chrome-116.outputs.chrome-path }}
 
@@ -52,7 +52,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
         os: [ubuntu-22.04]
 
     steps:
@@ -70,8 +70,8 @@ jobs:
       - run: sudo apt-get install --fix-missing xvfb
       - run: npm ci
       - run: npm run version-stamp
-      - run: npm rebuild canvas --update-binary
-      - run: npm rebuild libxmljs --update-binary
+      - run: npm rebuild canvas
+      - run: npm rebuild libxmljs
       - run: npm run build-spa
       - run: npm run test:e2e-matter-ci -- ${{steps.chrome-116.outputs.chrome-path }}
 
@@ -81,7 +81,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
         os: [ubuntu-22.04]
 
     steps:
@@ -98,8 +98,8 @@ jobs:
       - run: npm ci
       - run: npm run metafile-check
       - run: npm run version-stamp
-      - run: npm rebuild canvas --update-binary
-      - run: npm rebuild libxmljs --update-binary
+      - run: npm rebuild canvas
+      - run: npm rebuild libxmljs
       - run: npm run lic
       - run: npm run build-spa
       - run: npm run lint
@@ -120,7 +120,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
         os: [ubuntu-22.04]
 
     steps:
@@ -178,7 +178,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 24.x
           cache: 'npm'
       - name: pip
         run: pip install setuptools
@@ -218,8 +218,8 @@ jobs:
 
       - name: Initialize...
         run: |
-          npm rebuild canvas --update-binary
-          npm rebuild libxmljs --update-binary
+          npm rebuild canvas
+          npm rebuild libxmljs
           npm ci
           npm run version-stamp
 

.github/workflows/zigbee.yml

@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [24.x]
         os: [ubuntu-22.04]
 
     steps:
@@ -39,8 +39,8 @@ jobs:
       - run: node --version
       - run: npm --version
       - run: npm ci
-      - run: npm rebuild canvas --update-binary
-      - run: npm rebuild libxmljs --update-binary
+      - run: npm rebuild canvas
+      - run: npm rebuild libxmljs
       - run: npm run metafile-check
       - run: npm run version-stamp
       - run: npm run build-spa
@@ -60,8 +60,8 @@ jobs:
           ref: master
           clean: false
       - run: npm ci
-      - run: npm rebuild canvas --update-binary
-      - run: npm rebuild libxmljs --update-binary
+      - run: npm rebuild canvas
+      - run: npm rebuild libxmljs
       - name: Rebuild with master
         run: npm run build
       - name: Run the zigbee regen with the cloned gsdk, using master.

.husky/pre-commit

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 echo "🚀   > Pretty quick reformat..."
 npx pretty-quick --staged
 

Jenkinsfile

@@ -47,8 +47,8 @@ pipeline
                         {
                                     sh 'npm run version-stamp'
                                     sh 'npm run version'
-                                    sh 'npm rebuild canvas --update-binary'
-                                    sh 'npm rebuild libxmljs --update-binary'
+                                    sh 'npm rebuild canvas'
+                                    sh 'npm rebuild libxmljs'
                         }
                     }
                 }

babel.config.js

@@ -19,10 +19,9 @@ module.exports = (api) => {
       '@babel/preset-typescript'
     ],
     plugins: [
-      // Add Istanbul plugin for code coverage instrumentation when testing
-      process.env.NODE_ENV === 'test' && 'istanbul',
-      // Add coverage plugin for Cypress
-      process.env.CYPRESS_COVERAGE && 'istanbul'
+      // Istanbul once: e2e sets NODE_ENV=test and CYPRESS_COVERAGE together (duplicate plugin breaks Babel)
+      (process.env.NODE_ENV === 'test' || process.env.CYPRESS_COVERAGE) &&
+        'istanbul'
     ].filter(Boolean)
   }
 }

docs/ZAP-on-Windows.md

@@ -51,7 +51,7 @@ npm rebuild sqlite3
 When doing npm install, in post-install, if there is an error on the following command, related to `electron-builder install-app-deps`, `npx electron-rebuild canvas failed` or `node-pre-gyp`, it is because the current `canvas` version is not compatible with Windows, and the installation error will not cause a failure in running ZAP. node-canvas is working on the solution now and the issue will be solved in near future.
 
 ```
-"postinstall": "electron-builder install-app-deps && husky install && npm rebuild canvas --update-binary && npm run version-stamp"
+"postinstall": "electron-builder install-app-deps && husky && npm rebuild canvas --update-binary && npm run version-stamp"
 ```
 
 ## Fix Failed Tests

docs/development-instructions.md

@@ -2,7 +2,7 @@
 
 This section lists instructions for various things you might need to do in this repo.
 
-This is a node.js application, so you need node environment installed. The best way is to simply download latest install of [node](https://nodejs.org/en/download/) and you will get node and npm. If you have an older version of node installed on your workstation, it may give you trouble, particularly if it's very old. So make sure you have latest node v16.x, v18.x or v20.x version, with the npm that comes with it available. Run `node --version` to check what version is picked up. v20.x is recommended.
+This is a node.js application, so you need node environment installed. The best way is to simply download latest install of [node](https://nodejs.org/en/download/) and you will get node and npm. If you have an older version of node installed on your workstation, it may give you trouble, particularly if it's very old. For building the Electron UI and running the same toolchain as CI, use **Node.js v24.0 or newer** (GitHub Actions uses `24.x`). Older versions may still run parts of the stack but can show `EBADENGINE` warnings for `@electron/rebuild` and related packages. Run `node --version` to check what version is picked up.
 
 Once you have a desired version of node, you can run:
 
@@ -51,7 +51,7 @@ Following is the list of environment variables that zap tool honors:
 
 Zap repo is configured with husky git hooks, that perform some
 pre-commit actions, formatting code, checking the obvious problems and similar. If you properly ran `npm install`, all these hooks should
-be installed. You can make sure they are installed by running `npx husky install`. See `.husky/pre-commit` script to review the actions executed as a pre-commit hook.
+be installed. You can make sure they are installed by running `npx husky`. See `.husky/pre-commit` script to review the actions executed as a pre-commit hook.
 
 **Format the files:**
 

docs/faq.md

@@ -138,7 +138,7 @@ References:
 To fix this in most cases, run:
 
 - `npm install`
-- `./node_modules/.bin/electron-rebuild -w sqlite3 -p`
+- `npx electron-rebuild -w sqlite3 -p` (from devDependency `@electron/rebuild`)
 
 If it still doesn't get fixed, do: