Skip to content

electron upgraded from 33.* to 36.* #4740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 22, 2025
Merged

electron upgraded from 33.* to 36.* #4740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
856d6a3
Update Electron from 33.2.0 to 36.4.0 and related dependencies
KIvanow Jul 21, 2025
8173ad5
rolled back local changes
KIvanow Jul 21, 2025
591280f
rolled back local changes
KIvanow Jul 21, 2025
c8f3609
Update Node.js version from 22.11.0 to 22.12.0 for node-abi compatibi…
KIvanow Jul 21, 2025
736b4b3
Testing slightly different config to fix the resolutions after install
KIvanow Jul 21, 2025
be20d55
Fix electron-builder 26.0.12 configuration compatibility
KIvanow Jul 21, 2025
97a8e88
Restore Mac notarization and disable native module rebuilding
KIvanow Jul 21, 2025
1e3c280
Update Mac notarize configuration to boolean for electron-builder 26.…
KIvanow Jul 21, 2025
780ce63
Reverting unneeded changes
KIvanow Jul 21, 2025
1f4f534
Reverting unneeded changes
KIvanow Jul 21, 2025
0fac2f9
reverting yarn.lock in the api folder for testing
Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/install-all-build-libs/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ runs:
- name: Setup Node
uses: actions/setup-node@v4.0.4
with:
node-version: '22.11.0'
node-version: '22.12.0'
# disable cache for windows
# https://github.com/actions/setup-node/issues/975
cache: ${{ runner.os != 'Windows' && 'yarn' || '' }}
Expand Down
17 changes: 10 additions & 7 deletions electron-builder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"files": ["dist", "node_modules", "package.json"],
"artifactName": "Redis-Insight-${os}-${arch}.${ext}",
"compression": "normal",
"npmRebuild": false,
"nodeGypRebuild": false,
"buildDependenciesFromSource": false,
"asarUnpack": ["node_modules/keytar", "node_modules/sqlite3"],
"protocols": [
{
Expand All @@ -24,9 +27,7 @@
"arch": ["x64", "arm64"]
}
],
"notarize": {
"teamId": "UUK47G4BAZ"
},
"notarize": true,
Comment on lines -27 to +30
Copy link
Collaborator

@ArtemHoruzhenko ArtemHoruzhenko Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure it will work for mas when removed

Copy link
Contributor Author

@KIvanow KIvanow Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not removed. It is changed to be a boolean field https://www.electron.build/app-builder-lib.interface.macconfiguration#notarize

"type": "distribution",
"hardenedRuntime": true,
"darkModeSupport": true,
Expand Down Expand Up @@ -86,7 +87,7 @@
"target": ["nsis"],
"artifactName": "Redis-Insight-${os}-installer.${ext}",
"icon": "resources/icon.ico",
"publisherName": ["Redis Inc.", "Redis Labs Inc."]
"legalTrademarks": "Redis Inc., Redis Labs Inc."
},
"nsis": {
"oneClick": false,
Expand Down Expand Up @@ -117,9 +118,11 @@
"category": "Development",
"artifactName": "Redis-Insight-${os}-${arch}.${ext}",
"desktop": {
"Name": "Redis Insight",
"Type": "Application",
"Comment": "Redis GUI by Redis Ltd"
"entry": {
"Name": "Redis Insight",
"Type": "Application",
"Comment": "Redis GUI by Redis Ltd"
}
}
},
"deb": {
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"package:mac": "yarn build:prod && electron-builder build --mac -p never",
"package:mac:arm": "yarn build:prod && electron-builder build --mac --arm64 -p never",
"package:linux": "yarn build:prod && electron-builder build --linux -p never",
"postinstall": "patch-package && vite optimize -c ./redisinsight/ui/vite.config.mjs && skip-postinstall || (electron-builder install-app-deps && yarn-deduplicate yarn.lock)",
"postinstall": "patch-package && vite optimize -c ./redisinsight/ui/vite.config.mjs && skip-postinstall || yarn-deduplicate yarn.lock",
"test": "jest ./redisinsight/ui -w 1",
"test:api": "yarn --cwd redisinsight/api test",
"test:api:integration": "yarn --cwd redisinsight/api test:api",
Expand Down Expand Up @@ -158,8 +158,8 @@
"csv-parser": "^3.0.0",
"csv-stringify": "^6.4.0",
"dotenv": "^16.4.5",
"electron": "33.2.0",
"electron-builder": "^24.13.3",
"electron": "^36.4.0",
"electron-builder": "^26.0.12",
"electron-builder-notarize": "^1.5.2",
"electron-debug": "^3.2.0",
"electron-devtools-installer": "^3.2.0",
Expand Down Expand Up @@ -254,7 +254,7 @@
"electron-context-menu": "^3.1.0",
"electron-log": "^4.2.4",
"electron-store": "^8.0.0",
"electron-updater": "^6.3.9",
"electron-updater": "^6.6.2",
"file-saver": "^2.0.5",
"formik": "^2.2.9",
"fzstd": "^0.1.0",
Expand All @@ -272,7 +272,7 @@
"monaco-editor": "^0.48.0",
"monaco-yaml": "^5.1.1",
"msgpackr": "^1.10.1",
"node-abi": "^3.71.0",
"node-abi": "^4.12.0",
"pako": "^2.1.0",
"php-serialize": "^4.0.2",
"pickleparser": "^0.2.1",
Expand Down
Loading
Loading