From e0fbd592187afb5bf957a1b24c0018a0f95903ca Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 15 Aug 2024 14:47:15 +0200 Subject: [PATCH 1/3] fix(compass): bump electron to 31.x COMPASS-8126 --- configs/webpack-config-compass/package.json | 2 +- package-lock.json | 85 ++++++++++--------- packages/atlas-service/package.json | 2 +- packages/compass-crud/package.json | 2 +- packages/compass-e2e-tests/package.json | 2 +- packages/compass-explain-plan/package.json | 2 +- packages/compass-find-in-page/package.json | 2 +- packages/compass-import-export/package.json | 2 +- packages/compass-indexes/package.json | 2 +- packages/compass-query-bar/package.json | 2 +- .../compass-schema-validation/package.json | 2 +- packages/compass-shell/package.json | 2 +- packages/compass-utils/package.json | 2 +- packages/compass-web/package.json | 2 +- packages/compass/package.json | 2 +- packages/connection-storage/package.json | 2 +- packages/hadron-build/package.json | 2 +- packages/hadron-ipc/package.json | 2 +- scripts/package.json | 2 +- 19 files changed, 61 insertions(+), 60 deletions(-) diff --git a/configs/webpack-config-compass/package.json b/configs/webpack-config-compass/package.json index 7564f87e464..2fd71090675 100644 --- a/configs/webpack-config-compass/package.json +++ b/configs/webpack-config-compass/package.json @@ -74,7 +74,7 @@ "cli-progress": "^3.9.1", "core-js": "^3.17.3", "css-loader": "^4.3.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "html-webpack-plugin": "^5.3.2", "less": "^3.13.1", "less-loader": "^10.0.1", diff --git a/package-lock.json b/package-lock.json index 7eedff4fe3a..cc0555cff08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -189,7 +189,7 @@ "cli-progress": "^3.9.1", "core-js": "^3.17.3", "css-loader": "^4.3.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "html-webpack-plugin": "^5.3.2", "less": "^3.13.1", "less-loader": "^10.0.1", @@ -21309,10 +21309,11 @@ } }, "node_modules/electron": { - "version": "29.4.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-29.4.5.tgz", - "integrity": "sha512-DlEuzGbWBYl1Qr0qUYgNZdoixJg4YGHy2HC6fkRjSXSlb01UrQ5ORi8hNLzelzyYx8rNQyyE3zDUuk9EnZwYuA==", + "version": "31.4.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-31.4.0.tgz", + "integrity": "sha512-YTwKoAA+nrJMlI1TTHnIXLYWoQLKnhbkz0qxZcI7Hadcy0UaFMFs9xzwvH2MnrRpVJy7RKo49kVGuvSdRl8zMA==", "hasInstallScript": true, + "license": "MIT", "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^20.9.0", @@ -44334,7 +44335,7 @@ "@mongodb-js/devtools-connect": "^3.0.1", "@mongodb-js/oidc-plugin": "^1.0.0", "compass-preferences-model": "^2.26.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "hadron-app-registry": "^9.2.2", "hadron-ipc": "^3.2.20", "lodash": "^4.17.21", @@ -44534,7 +44535,7 @@ "compass-preferences-model": "^2.26.0", "debug": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-devtools-installer": "^3.2.0", "electron-dl": "^3.5.0", "electron-mocha": "^12.2.0", @@ -45206,7 +45207,7 @@ "chai": "^4.1.2", "chai-as-promised": "^7.1.1", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", @@ -45276,7 +45277,7 @@ "cross-spawn": "^7.0.3", "debug": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "fast-glob": "^3.2.7", "glob": "^10.2.5", @@ -45636,7 +45637,7 @@ "@types/d3-hierarchy": "^3.1.2", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -45835,7 +45836,7 @@ "@types/sinon-chai": "^3.2.5", "chai": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -46092,7 +46093,7 @@ "bson": "^6.7.0", "compass-preferences-model": "^2.26.0", "debug": "^4.3.4", - "electron": "^29.4.5", + "electron": "^31.4.0", "hadron-app-registry": "^9.2.2", "hadron-document": "^8.6.0", "hadron-ipc": "^3.2.20", @@ -46211,7 +46212,7 @@ "@testing-library/user-event": "^13.5.0", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -46624,7 +46625,7 @@ "@testing-library/user-event": "^13.5.0", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -46836,7 +46837,7 @@ "@mongodb-js/tsconfig-compass": "^1.0.4", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", @@ -47026,7 +47027,7 @@ "@mongodb-js/tsconfig-compass": "^1.0.4", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", @@ -47424,7 +47425,7 @@ "license": "SSPL", "dependencies": { "@electron/remote": "^2.1.2", - "electron": "^29.4.5" + "electron": "^31.4.0" }, "devDependencies": { "@mongodb-js/eslint-config-compass": "^1.1.4", @@ -47522,7 +47523,7 @@ "debug": "^4.3.4", "depcheck": "^1.4.1", "dns-query": "^0.11.2", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "events": "^3.3.0", "express": "^4.19.2", @@ -48248,7 +48249,7 @@ "@mongodb-js/connection-info": "^0.5.3", "bson": "^6.7.0", "compass-preferences-model": "^2.26.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "hadron-app-registry": "^9.2.2", "hadron-ipc": "^3.2.20", "keytar": "^7.9.0", @@ -48759,7 +48760,7 @@ "debug": "^4.3.4", "del": "^2.0.2", "download": "^8.0.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-packager": "^15.5.1", "electron-packager-plugin-non-proprietary-codecs-ffmpeg": "^1.0.2", "flatnest": "^1.0.0", @@ -49579,7 +49580,7 @@ "license": "SSPL", "dependencies": { "debug": "^4.3.4", - "electron": "^29.4.5", + "electron": "^31.4.0", "is-electron-renderer": "^2.0.1" }, "devDependencies": { @@ -50596,7 +50597,7 @@ "@babel/core": "^7.24.3", "@mongodb-js/monorepo-tools": "^1.1.1", "commander": "^11.0.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "jsdom": "^21.1.0", "make-fetch-happen": "^8.0.14", "pacote": "^11.3.5", @@ -56183,7 +56184,7 @@ "chai": "^4.3.6", "compass-preferences-model": "^2.26.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "hadron-app-registry": "^9.2.2", "hadron-ipc": "^3.2.20", @@ -56786,7 +56787,7 @@ "chai-as-promised": "^7.1.1", "compass-preferences-model": "^2.26.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", @@ -56959,7 +56960,7 @@ "d3-flextree": "^2.1.2", "d3-hierarchy": "^3.1.2", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "hadron-app-registry": "^9.2.2", @@ -57134,7 +57135,7 @@ "@types/sinon-chai": "^3.2.5", "chai": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "hadron-app-registry": "^9.2.2", @@ -57310,7 +57311,7 @@ "compass-preferences-model": "^2.26.0", "debug": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "hadron-app-registry": "^9.2.2", @@ -57387,7 +57388,7 @@ "chai": "^4.2.0", "compass-preferences-model": "^2.26.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "hadron-app-registry": "^9.2.2", @@ -57665,7 +57666,7 @@ "chai": "^4.2.0", "compass-preferences-model": "^2.26.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "hadron-app-registry": "^9.2.2", @@ -57880,7 +57881,7 @@ "chai": "^4.2.0", "compass-preferences-model": "^2.26.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", @@ -57913,7 +57914,7 @@ "@mongodb-js/prettier-config-compass": "^1.0.2", "commander": "^11.0.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "jsdom": "^21.1.0", "make-fetch-happen": "^8.0.14", @@ -58255,7 +58256,7 @@ "chai": "^4.2.0", "compass-preferences-model": "^2.26.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", @@ -58601,7 +58602,7 @@ "@types/sinon-chai": "^3.2.5", "chai": "^4.3.6", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "gen-esm-wrapper": "^1.1.0", "mocha": "^10.2.0", @@ -58683,7 +58684,7 @@ "debug": "^4.3.4", "depcheck": "^1.4.1", "dns-query": "^0.11.2", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "events": "^3.3.0", "express": "^4.19.2", @@ -59311,7 +59312,7 @@ "chai": "^4.3.6", "compass-preferences-model": "^2.26.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "hadron-app-registry": "^9.2.2", "hadron-ipc": "^3.2.20", @@ -60453,7 +60454,7 @@ "core-js": "^3.17.3", "css-loader": "^4.3.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "html-webpack-plugin": "^5.3.2", "less": "^3.13.1", @@ -68598,7 +68599,7 @@ "cross-spawn": "^7.0.3", "debug": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "fast-glob": "^3.2.7", "glob": "^10.2.5", @@ -71009,9 +71010,9 @@ } }, "electron": { - "version": "29.4.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-29.4.5.tgz", - "integrity": "sha512-DlEuzGbWBYl1Qr0qUYgNZdoixJg4YGHy2HC6fkRjSXSlb01UrQ5ORi8hNLzelzyYx8rNQyyE3zDUuk9EnZwYuA==", + "version": "31.4.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-31.4.0.tgz", + "integrity": "sha512-YTwKoAA+nrJMlI1TTHnIXLYWoQLKnhbkz0qxZcI7Hadcy0UaFMFs9xzwvH2MnrRpVJy7RKo49kVGuvSdRl8zMA==", "requires": { "@electron/get": "^2.0.0", "@types/node": "^20.9.0", @@ -74839,7 +74840,7 @@ "del": "^2.0.2", "depcheck": "^1.4.1", "download": "^8.0.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-installer-debian": "^3.2.0", "electron-installer-dmg": "^4.0.0", "electron-installer-redhat": "^2.0.0", @@ -75538,7 +75539,7 @@ "chai": "^4.3.6", "debug": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "is-electron-renderer": "^2.0.1", "mocha": "^10.2.0", @@ -80712,7 +80713,7 @@ "compass-preferences-model": "^2.26.0", "debug": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-devtools-installer": "^3.2.0", "electron-dl": "^3.5.0", "electron-mocha": "^12.2.0", diff --git a/packages/atlas-service/package.json b/packages/atlas-service/package.json index 37092b712b7..d2896851279 100644 --- a/packages/atlas-service/package.json +++ b/packages/atlas-service/package.json @@ -82,7 +82,7 @@ "@mongodb-js/oidc-plugin": "^1.0.0", "hadron-app-registry": "^9.2.2", "compass-preferences-model": "^2.26.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "hadron-ipc": "^3.2.20", "lodash": "^4.17.21", "node-fetch": "^2.7.0", diff --git a/packages/compass-crud/package.json b/packages/compass-crud/package.json index 776600c7cec..4a768ebc773 100644 --- a/packages/compass-crud/package.json +++ b/packages/compass-crud/package.json @@ -59,7 +59,7 @@ "chai": "^4.1.2", "chai-as-promised": "^7.1.1", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", diff --git a/packages/compass-e2e-tests/package.json b/packages/compass-e2e-tests/package.json index a0dc7d16fef..0bf05095f0a 100644 --- a/packages/compass-e2e-tests/package.json +++ b/packages/compass-e2e-tests/package.json @@ -52,7 +52,7 @@ "cross-spawn": "^7.0.3", "debug": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "fast-glob": "^3.2.7", "glob": "^10.2.5", diff --git a/packages/compass-explain-plan/package.json b/packages/compass-explain-plan/package.json index fa44c1f8e55..6e8e0836293 100644 --- a/packages/compass-explain-plan/package.json +++ b/packages/compass-explain-plan/package.json @@ -58,7 +58,7 @@ "@types/d3-hierarchy": "^3.1.2", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "mocha": "^10.2.0", diff --git a/packages/compass-find-in-page/package.json b/packages/compass-find-in-page/package.json index ce03a097743..2db09f753cd 100644 --- a/packages/compass-find-in-page/package.json +++ b/packages/compass-find-in-page/package.json @@ -62,7 +62,7 @@ "@types/sinon-chai": "^3.2.5", "chai": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "mocha": "^10.2.0", diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json index 49cba9cf1d2..e8c3379f581 100644 --- a/packages/compass-import-export/package.json +++ b/packages/compass-import-export/package.json @@ -59,7 +59,7 @@ "bson": "^6.7.0", "compass-preferences-model": "^2.26.0", "debug": "^4.3.4", - "electron": "^29.4.5", + "electron": "^31.4.0", "hadron-app-registry": "^9.2.2", "hadron-document": "^8.6.0", "hadron-ipc": "^3.2.20", diff --git a/packages/compass-indexes/package.json b/packages/compass-indexes/package.json index 12e2a96ade4..7eee8c9e934 100644 --- a/packages/compass-indexes/package.json +++ b/packages/compass-indexes/package.json @@ -56,7 +56,7 @@ "@testing-library/user-event": "^13.5.0", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "mocha": "^10.2.0", diff --git a/packages/compass-query-bar/package.json b/packages/compass-query-bar/package.json index f89756f74ba..86a52759386 100644 --- a/packages/compass-query-bar/package.json +++ b/packages/compass-query-bar/package.json @@ -57,7 +57,7 @@ "@testing-library/user-event": "^13.5.0", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "eslint": "^7.25.0", "mocha": "^10.2.0", diff --git a/packages/compass-schema-validation/package.json b/packages/compass-schema-validation/package.json index 0a3b1c83801..edebe7a1040 100644 --- a/packages/compass-schema-validation/package.json +++ b/packages/compass-schema-validation/package.json @@ -54,7 +54,7 @@ "@mongodb-js/tsconfig-compass": "^1.0.4", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json index f85cfc28cbd..a1cd16de1c0 100644 --- a/packages/compass-shell/package.json +++ b/packages/compass-shell/package.json @@ -75,7 +75,7 @@ "@mongodb-js/tsconfig-compass": "^1.0.4", "chai": "^4.2.0", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-mocha": "^12.2.0", "enzyme": "^3.11.0", "eslint": "^7.25.0", diff --git a/packages/compass-utils/package.json b/packages/compass-utils/package.json index 2a05c5357eb..c35ca5bf6d1 100644 --- a/packages/compass-utils/package.json +++ b/packages/compass-utils/package.json @@ -69,6 +69,6 @@ }, "dependencies": { "@electron/remote": "^2.1.2", - "electron": "^29.4.5" + "electron": "^31.4.0" } } diff --git a/packages/compass-web/package.json b/packages/compass-web/package.json index 85e8626a6f4..5ee1657f7d6 100644 --- a/packages/compass-web/package.json +++ b/packages/compass-web/package.json @@ -107,7 +107,7 @@ "debug": "^4.3.4", "depcheck": "^1.4.1", "dns-query": "^0.11.2", - "electron": "^29.4.5", + "electron": "^31.4.0", "eslint": "^7.25.0", "events": "^3.3.0", "express": "^4.19.2", diff --git a/packages/compass/package.json b/packages/compass/package.json index 847bd72bdf5..755a0735ff9 100644 --- a/packages/compass/package.json +++ b/packages/compass/package.json @@ -243,7 +243,7 @@ "compass-preferences-model": "^2.26.0", "debug": "^4.3.4", "depcheck": "^1.4.1", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-devtools-installer": "^3.2.0", "electron-dl": "^3.5.0", "electron-mocha": "^12.2.0", diff --git a/packages/connection-storage/package.json b/packages/connection-storage/package.json index 985d6bdc39f..830abb98001 100644 --- a/packages/connection-storage/package.json +++ b/packages/connection-storage/package.json @@ -63,7 +63,7 @@ "@mongodb-js/connection-info": "^0.5.3", "bson": "^6.7.0", "compass-preferences-model": "^2.26.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "hadron-app-registry": "^9.2.2", "hadron-ipc": "^3.2.20", "keytar": "^7.9.0", diff --git a/packages/hadron-build/package.json b/packages/hadron-build/package.json index 8eccbd65926..ef26287f785 100644 --- a/packages/hadron-build/package.json +++ b/packages/hadron-build/package.json @@ -32,7 +32,7 @@ "debug": "^4.3.4", "del": "^2.0.2", "download": "^8.0.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "electron-packager": "^15.5.1", "electron-packager-plugin-non-proprietary-codecs-ffmpeg": "^1.0.2", "flatnest": "^1.0.0", diff --git a/packages/hadron-ipc/package.json b/packages/hadron-ipc/package.json index 2ddb0107baf..01bc03c9059 100644 --- a/packages/hadron-ipc/package.json +++ b/packages/hadron-ipc/package.json @@ -69,7 +69,7 @@ }, "dependencies": { "debug": "^4.3.4", - "electron": "^29.4.5", + "electron": "^31.4.0", "is-electron-renderer": "^2.0.1" } } diff --git a/scripts/package.json b/scripts/package.json index 3b238eb900d..d79080e7512 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -40,7 +40,7 @@ "@babel/core": "^7.24.3", "@mongodb-js/monorepo-tools": "^1.1.1", "commander": "^11.0.0", - "electron": "^29.4.5", + "electron": "^31.4.0", "jsdom": "^21.1.0", "make-fetch-happen": "^8.0.14", "pacote": "^11.3.5", From 9192d52636c483451b0ae47ff5819dadc22b06b2 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 15 Aug 2024 15:10:41 +0200 Subject: [PATCH 2/3] fixup: account for odd electron typings change --- packages/compass/src/main/logging.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/compass/src/main/logging.ts b/packages/compass/src/main/logging.ts index ca499f518c7..23bf07b7227 100644 --- a/packages/compass/src/main/logging.ts +++ b/packages/compass/src/main/logging.ts @@ -147,7 +147,7 @@ async function setupLogging(compassApp: typeof CompassApplication) { process.on('compass:log', (meta) => { writer.target.write(meta.line); }); - process.off('compass:log', earlyLoggingListener); + process.off('compass:log' as any, earlyLoggingListener); for (const ev of earlyLogEvents) { // @ts-expect-error electron types are conflicting with Node.js ones here From 8b195a5c51674eb8c41ddc80e1786cf52242a0fa Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 15 Aug 2024 16:08:39 +0200 Subject: [PATCH 3/3] Revert "fix(build): use an older ffmpeg version when packaging (#6070)" This reverts commit 4da646a12b2e0ba41483ebf5a98cd74907a22e10. --- packages/hadron-build/lib/target.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/hadron-build/lib/target.js b/packages/hadron-build/lib/target.js index fd5638b46db..77ccd01074c 100644 --- a/packages/hadron-build/lib/target.js +++ b/packages/hadron-build/lib/target.js @@ -196,14 +196,7 @@ class Target { arch: this.arch, electronVersion: this.electronVersion, sign: null, - afterExtract: [(buildPath, electronVersion, platform, arch, done) => { - // TODO(https://github.com/electron/electron/issues/43076): electron - // releases are pointing to a wrong version of ffmpeg codecs right now - // (platform mismatch), there is a fix in progress and we should switch - // asap when it's available, for now just use the ffmpeg from an older - // version - ffmpegAfterExtract(buildPath, '29.4.3', platform, arch, done) - }] + afterExtract: [ffmpegAfterExtract] }; validateBuildConfig(this.platform, this.pkg.config.hadron.build[this.platform]);