From 69f61a4f2a48e355d4c39990b45b3abf04e9c87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Tue, 13 Aug 2024 14:08:14 +0200 Subject: [PATCH 1/2] Update electron to version 30.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #14014 Contributed on behalf of STMicroelectronics Signed-off-by: Thomas Mäder --- examples/electron/package.json | 2 +- package.json | 3 ++- packages/core/README.md | 2 +- packages/electron/README.md | 2 +- packages/electron/package.json | 2 +- yarn.lock | 20 ++++++++++---------- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/electron/package.json b/examples/electron/package.json index 44c941c225780..0cfe496522349 100644 --- a/examples/electron/package.json +++ b/examples/electron/package.json @@ -91,6 +91,6 @@ }, "devDependencies": { "@theia/cli": "1.52.0", - "electron": "^28.2.8" + "electron": "^30.1.2" } } diff --git a/package.json b/package.json index e16ac1798c9c2..157c3aca44982 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "node": ">=18" }, "resolutions": { - "**/@types/node": "18" + "**/@types/node": "18", + "**/nan": "2.20.0" }, "devDependencies": { "@types/chai": "4.3.0", diff --git a/packages/core/README.md b/packages/core/README.md index 56a6688237adc..db504560046e6 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -70,7 +70,7 @@ export class SomeClass { - `@theia/core/electron-shared/...` - `native-keymap` (from [`native-keymap@^2.2.1`](https://www.npmjs.com/package/native-keymap)) - - `electron` (from [`electron@^28.2.8`](https://www.npmjs.com/package/electron)) + - `electron` (from [`electron@^30.1.2`](https://www.npmjs.com/package/electron)) - `electron-store` (from [`electron-store@^8.0.0`](https://www.npmjs.com/package/electron-store)) - `fix-path` (from [`fix-path@^3.0.0`](https://www.npmjs.com/package/fix-path)) - `@theia/core/shared/...` diff --git a/packages/electron/README.md b/packages/electron/README.md index de0e9ec00b7d2..7dd51c63b0d6a 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -18,7 +18,7 @@ The `@theia/electron` extension bundles all Electron-specific dependencies and c - `@theia/electron/shared/...` - `native-keymap` (from [`native-keymap@^2.2.1`](https://www.npmjs.com/package/native-keymap)) - - `electron` (from [`electron@^28.2.8`](https://www.npmjs.com/package/electron)) + - `electron` (from [`electron@^30.1.2`](https://www.npmjs.com/package/electron)) - `electron-store` (from [`electron-store@^8.0.0`](https://www.npmjs.com/package/electron-store)) - `fix-path` (from [`fix-path@^3.0.0`](https://www.npmjs.com/package/fix-path)) diff --git a/packages/electron/package.json b/packages/electron/package.json index 1b74de295884b..2a947ac02c81a 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -12,7 +12,7 @@ "@theia/re-exports": "1.52.0" }, "peerDependencies": { - "electron": "^28.2.8" + "electron": "^30.1.2" }, "theiaReExports": { "shared": { diff --git a/yarn.lock b/yarn.lock index 3aabc7d1cd69a..f38c8d1ebaa33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2141,7 +2141,7 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node@*", "@types/node@18", "@types/node@>=10.0.0", "@types/node@^10.14.22", "@types/node@^18.11.18": +"@types/node@*", "@types/node@18", "@types/node@>=10.0.0", "@types/node@^10.14.22", "@types/node@^18.11.18", "@types/node@^20.9.0": version "18.19.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.18.tgz#7526471b28828d1fef1f7e4960fb9477e6e4369c" integrity sha512-80CP7B8y4PzZF0GWx15/gVWRrB5y/bIjNI84NK3cmQJu0WZwvmj2WMA5LcofQFVfLqqCSp545+U2LsrVzX36Zg== @@ -4963,13 +4963,13 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@^28.2.8: - version "28.2.10" - resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.10.tgz#4e168568406a8b1e9b9a5859e988c905b9a57570" - integrity sha512-0rGBJNogcl2FIRxGRUv9zuMaBP78nSBJW+Bd1U7OGeg8IEkSIbHOhfn71XoGxgbOUSCEXjjyftq4mtAAVbUsZQ== +electron@^30.1.2: + version "30.3.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-30.3.1.tgz#fe27ca2a4739bec832b2edd6f46140ab46bf53a0" + integrity sha512-Ai/OZ7VlbFAVYMn9J5lyvtr+ZWyEbXDVd5wBLb5EVrp4352SRmMAmN5chcIe3n9mjzcgehV9n4Hwy15CJW+YbA== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" + "@types/node" "^20.9.0" extract-zip "^2.0.1" emoji-regex@^8.0.0: @@ -8428,10 +8428,10 @@ mute-stream@~1.0.0: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e" integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== -nan@^2.14.0, nan@^2.17.0, nan@^2.18.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" - integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== +nan@2.20.0, nan@^2.14.0, nan@^2.17.0, nan@^2.18.0: + version "2.20.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3" + integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw== nano@^10.1.3: version "10.1.3" From 3e1363ebcb2af64193db02ca8225cea6889ea01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Tue, 13 Aug 2024 14:56:27 +0200 Subject: [PATCH 2/2] Update changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Mäder --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57618adc18f33..a0992360c5667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,12 @@ - [Previous Changelogs](https://github.com/eclipse-theia/theia/tree/master/doc/changelogs/) -[Breaking Changes:](#breaking_changes_1.51.0) -- [dependencies] increased minimum node version to 18. [#14027](https://github.com/eclipse-theia/theia/pull/14027) - Contributed on behalf of STMicroelectronics +## Unreleased + +[Breaking Changes:](#breaking_changes_1.53.0) +- [dependencies] Updated electron to version 30.1.2 - [#14041](https://github.com/eclipse-theia/theia/pull/14041) - Contributed on behalf of STMicroelectronics +- [dependencies] increased minimum node version to 18. [#14027](https://github.com/eclipse-theia/theia/pull/14027) - Contributed on behalf of STMicroelectronics ## 1.52.0 - 07/25/2024