Skip to content

Commit 65736aa

Browse files
Kristiyan Ivanovclaude
andauthored
electron upgraded from 33.* to 36.* (#4740)
* Update Electron from 33.2.0 to 36.4.0 and related dependencies - Update electron from EOL version 33.2.0 to supported 36.4.0 - Update electron-builder from 24.13.3 to 26.0.12 - Update electron-updater from 6.3.9 to 6.6.2 - Add node-abi 4.12.0 for better Electron version support - Update yarn.lock files with new dependency versions 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * rolled back local changes * rolled back local changes * Update Node.js version from 22.11.0 to 22.12.0 for node-abi compatibility The node-abi@4.12.0 package requires Node.js >=22.12.0 but CI was using 22.11.0. This update ensures compatibility with the upgraded Electron dependencies. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Testing slightly different config to fix the resolutions after install * Fix electron-builder 26.0.12 configuration compatibility - Update Linux desktop configuration to use desktop.entry structure - Change Mac notarize from object to boolean (temporarily disabled) - Replace Windows publisherName with legalTrademarks - Remove electron-builder install-app-deps from postinstall script These changes address breaking changes in electron-builder 26.0.12. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Restore Mac notarization and disable native module rebuilding - Restore Mac notarization with teamId configuration (good security practice) - Add npmRebuild: false, nodeGypRebuild: false, buildDependenciesFromSource: false to disable native module rebuilding which fails due to ABI compatibility issues - This allows electron-builder to proceed without trying to rebuild native modules like keytar and sqlite3 that cause ABI detection errors with Electron 36 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Update Mac notarize configuration to boolean for electron-builder 26.0.12 In electron-builder 26.0.12, notarize must be a boolean value. The actual notarization configuration (teamId, etc.) is now handled via environment variables such as APPLE_TEAM_ID=UUK47G4BAZ instead of in the config file. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Reverting unneeded changes * Reverting unneeded changes * reverting yarn.lock in the api folder for testing --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent 9508198 commit 65736aa

File tree

4 files changed

+265
-216
lines changed

4 files changed

+265
-216
lines changed

.github/actions/install-all-build-libs/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ runs:
3333
- name: Setup Node
3434
uses: actions/setup-node@v4.0.4
3535
with:
36-
node-version: '22.11.0'
36+
node-version: '22.12.0'
3737
# disable cache for windows
3838
# https://github.com/actions/setup-node/issues/975
3939
cache: ${{ runner.os != 'Windows' && 'yarn' || '' }}

electron-builder.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"files": ["dist", "node_modules", "package.json"],
66
"artifactName": "Redis-Insight-${os}-${arch}.${ext}",
77
"compression": "normal",
8+
"npmRebuild": false,
9+
"nodeGypRebuild": false,
10+
"buildDependenciesFromSource": false,
811
"asarUnpack": ["node_modules/keytar", "node_modules/sqlite3"],
912
"protocols": [
1013
{
@@ -24,9 +27,7 @@
2427
"arch": ["x64", "arm64"]
2528
}
2629
],
27-
"notarize": {
28-
"teamId": "UUK47G4BAZ"
29-
},
30+
"notarize": true,
3031
"type": "distribution",
3132
"hardenedRuntime": true,
3233
"darkModeSupport": true,
@@ -86,7 +87,7 @@
8687
"target": ["nsis"],
8788
"artifactName": "Redis-Insight-${os}-installer.${ext}",
8889
"icon": "resources/icon.ico",
89-
"publisherName": ["Redis Inc.", "Redis Labs Inc."]
90+
"legalTrademarks": "Redis Inc., Redis Labs Inc."
9091
},
9192
"nsis": {
9293
"oneClick": false,
@@ -117,9 +118,11 @@
117118
"category": "Development",
118119
"artifactName": "Redis-Insight-${os}-${arch}.${ext}",
119120
"desktop": {
120-
"Name": "Redis Insight",
121-
"Type": "Application",
122-
"Comment": "Redis GUI by Redis Ltd"
121+
"entry": {
122+
"Name": "Redis Insight",
123+
"Type": "Application",
124+
"Comment": "Redis GUI by Redis Ltd"
125+
}
123126
}
124127
},
125128
"deb": {

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"package:mac": "yarn build:prod && electron-builder build --mac -p never",
4444
"package:mac:arm": "yarn build:prod && electron-builder build --mac --arm64 -p never",
4545
"package:linux": "yarn build:prod && electron-builder build --linux -p never",
46-
"postinstall": "patch-package && vite optimize -c ./redisinsight/ui/vite.config.mjs && skip-postinstall || (electron-builder install-app-deps && yarn-deduplicate yarn.lock)",
46+
"postinstall": "patch-package && vite optimize -c ./redisinsight/ui/vite.config.mjs && skip-postinstall || yarn-deduplicate yarn.lock",
4747
"test": "jest ./redisinsight/ui -w 1",
4848
"test:api": "yarn --cwd redisinsight/api test",
4949
"test:api:integration": "yarn --cwd redisinsight/api test:api",
@@ -158,8 +158,8 @@
158158
"csv-parser": "^3.0.0",
159159
"csv-stringify": "^6.4.0",
160160
"dotenv": "^16.4.5",
161-
"electron": "33.2.0",
162-
"electron-builder": "^24.13.3",
161+
"electron": "^36.4.0",
162+
"electron-builder": "^26.0.12",
163163
"electron-builder-notarize": "^1.5.2",
164164
"electron-debug": "^3.2.0",
165165
"electron-devtools-installer": "^3.2.0",
@@ -254,7 +254,7 @@
254254
"electron-context-menu": "^3.1.0",
255255
"electron-log": "^4.2.4",
256256
"electron-store": "^8.0.0",
257-
"electron-updater": "^6.3.9",
257+
"electron-updater": "^6.6.2",
258258
"file-saver": "^2.0.5",
259259
"formik": "^2.2.9",
260260
"fzstd": "^0.1.0",
@@ -272,7 +272,7 @@
272272
"monaco-editor": "^0.48.0",
273273
"monaco-yaml": "^5.1.1",
274274
"msgpackr": "^1.10.1",
275-
"node-abi": "^3.71.0",
275+
"node-abi": "^4.12.0",
276276
"pako": "^2.1.0",
277277
"php-serialize": "^4.0.2",
278278
"pickleparser": "^0.2.1",

0 commit comments

Comments
 (0)