From 3ff75b6b9e54a833fa599aa57deff2fcae54fda6 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Sat, 15 Jun 2024 08:49:06 -0400 Subject: [PATCH 1/2] chore: update electron versions --- README.md | 8 +-- examples/package.json | 26 ++++----- examples/yarn.lock | 18 +++---- package.json | 123 +++++++++++++++++++++--------------------- yarn.lock | 18 +++---- 5 files changed, 97 insertions(+), 96 deletions(-) diff --git a/README.md b/README.md index 1861d53..88e3a59 100644 --- a/README.md +++ b/README.md @@ -118,10 +118,10 @@ The `Menubar` class is an event emitter: | menubar | Electron | Notes | | -------- | -------------------------- | -------------------------------------------------------------------------------------------------------------------------- | -| 9.x.x | 9.x.x \| 10.x.x \| 11.x.x \| 12.x.x \| 13.x.x \| 14.x.x \| 15.x.x \| 16.x.x \| 17.x.x \| 18.x.x \| 19.x. \| 20.x. \| 21.x.x \| 22.x.x \| 23.x.x. \| 24.x.x. \| 25.x.x. \| 26.x.x. \| 27.x.x. | | -| 8.x.x | 8.x.x | | -| 7.x.x | 7.x.x | | -| 6.x.x | 4.x.x \| 5.x.x \| 6.x.x | Not recommended for [security reasons](https://electronjs.org/docs/tutorial/security#17-use-a-current-version-of-electron) | +| 9.x.x | >=9.x.x <32.x.x | | +| 8.x.x | 8.x.xx | | +| 7.x.x | 7.x.xx | | +| 6.x.x | >=4.x.x <7.x.x | Not recommended for [security reasons](https://electronjs.org/docs/tutorial/security#17-use-a-current-version-of-electron) | | <= 5.x.x | <= 3.x.x | Please, _please_ don't use these old versions | ## API Docs diff --git a/examples/package.json b/examples/package.json index 13049d7..6f1b1bf 100644 --- a/examples/package.json +++ b/examples/package.json @@ -1,15 +1,15 @@ { - "name": "example-menubar", - "version": "0.1.0", - "description": "Examples of menubar electron apps", - "private": true, - "workspaces": [ - "arrow", - "hello-world", - "icon-animation", - "native-menu" - ], - "devDependencies": { - "electron": "^27.1.0" - } + "name": "example-menubar", + "version": "0.1.0", + "description": "Examples of menubar electron apps", + "private": true, + "workspaces": [ + "arrow", + "hello-world", + "icon-animation", + "native-menu" + ], + "devDependencies": { + "electron": "^31.0.1" + } } diff --git a/examples/yarn.lock b/examples/yarn.lock index 762f582..a861fd6 100644 --- a/examples/yarn.lock +++ b/examples/yarn.lock @@ -56,10 +56,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== -"@types/node@^18.11.18": - version "18.18.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.13.tgz#ae0f76c0bfe79d8fad0f910b78ae3e59b333c6e8" - integrity sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g== +"@types/node@^20.9.0": + version "20.14.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18" + integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q== dependencies: undici-types "~5.26.4" @@ -143,13 +143,13 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -electron@^27.1.0: - version "27.1.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-27.1.2.tgz#d3074c91cce94c1e19b5904b1cdf78c830f2558d" - integrity sha512-Dy6BUuGLiIJv+zfsXwr78TV2TNppi24rXF4PIIS+OjDblEKdkI9r1iM8JUd3/x3sbGUy5mdLMSPhvmu//IhkgA== +electron@^31.0.1: + version "31.0.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-31.0.1.tgz#0039524f8f38c24da802c3b18a42c3951acb5897" + integrity sha512-2eBcp4iqLkTsml6mMq+iqrS5u3kJ/2mpOLP7Mj7lo0uNK3OyfNqRS9z1ArsHjBF2/HV250Te/O9nKrwQRTX/+g== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" + "@types/node" "^20.9.0" extract-zip "^2.0.1" end-of-stream@^1.1.0: diff --git a/package.json b/package.json index 292af19..a290f77 100644 --- a/package.json +++ b/package.json @@ -1,63 +1,64 @@ { - "name": "menubar", - "version": "9.4.0", - "author": "Max Ogden", - "bugs": { - "url": "https://github.com/maxogden/menubar/issues" - }, - "description": "high level way to create menubar desktop applications with electron", - "files": [ - "/assets", - "/lib" - ], - "homepage": "https://github.com/maxogden/menubar", - "keywords": [ - "electron", - "shell", - "menubar", - "menu", - "taskbar", - "tray", - "traybar", - "mac", - "linux", - "windows", - "app" - ], - "license": "BSD-2-Clause", - "main": "lib/index.js", - "publishConfig": { - "access": "public" - }, - "repository": { - "type": "git", - "url": "https://github.com/maxogden/menubar.git" - }, - "scripts": { - "build": "rimraf lib/ && tsc", - "deploy": "yarn build && standard-version", - "docs": "typedoc", - "lint": "tsc --noEmit && eslint . --ext js,ts", - "test": "jest" - }, - "types": "lib/index.d.ts", - "dependencies": { - "electron-positioner": "^4.1.0" - }, - "devDependencies": { - "@amaurym/config": "^1.3.5", - "@types/jest": "^25.2.3", - "electron": "^27.1.0", - "jest": "^26.0.1", - "rimraf": "^3.0.2", - "standard-version": "^8.0.0", - "ts-jest": "^26.0.0", - "typedoc": "^0.17.7", - "typedoc-plugin-markdown": "^2.2.17", - "typedoc-plugin-no-inherit": "^1.1.10", - "typescript": "^4.6.2" - }, - "peerDependencies": { - "electron": "^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0" - } + "name": "menubar", + "version": "9.4.0", + "author": "Max Ogden", + "bugs": { + "url": "https://github.com/maxogden/menubar/issues" + }, + "description": "high level way to create menubar desktop applications with electron", + "files": [ + "/assets", + "/lib" + ], + "homepage": "https://github.com/maxogden/menubar", + "keywords": [ + "electron", + "shell", + "menubar", + "menu", + "taskbar", + "tray", + "traybar", + "mac", + "linux", + "windows", + "app" + ], + "license": "BSD-2-Clause", + "main": "lib/index.js", + "publishConfig": { + "access": "public" + }, + "repository": { + "type": "git", + "url": "https://github.com/maxogden/menubar.git" + }, + "scripts": { + "build": "rimraf lib/ && tsc", + "deploy": "yarn build && standard-version", + "docs": "typedoc", + "lint": "tsc --noEmit && eslint . --ext js,ts", + "test": "jest" + }, + "types": "lib/index.d.ts", + "dependencies": { + "electron-positioner": "^4.1.0" + }, + "devDependencies": { + "@amaurym/config": "^1.3.5", + "@types/jest": "^25.2.3", + "electron": "^31.0.1", + "jest": "^26.0.1", + "rimraf": "^3.0.2", + "standard-version": "^8.0.0", + "ts-jest": "^26.0.0", + "typedoc": "^0.17.7", + "typedoc-plugin-markdown": "^2.2.17", + "typedoc-plugin-no-inherit": "^1.1.10", + "typescript": "^4.6.2" + }, + "peerDependencies": { + "electron": ">=9.0.0 <32.0.0" + }, + "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447" } diff --git a/yarn.lock b/yarn.lock index 43c25d9..bbc6d69 100644 --- a/yarn.lock +++ b/yarn.lock @@ -750,10 +750,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== -"@types/node@^18.11.18": - version "18.18.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.13.tgz#ae0f76c0bfe79d8fad0f910b78ae3e59b333c6e8" - integrity sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g== +"@types/node@^20.9.0": + version "20.14.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18" + integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q== dependencies: undici-types "~5.26.4" @@ -1918,13 +1918,13 @@ electron-to-chromium@^1.4.84: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.96.tgz#a97438a01d5db1460343fea4a344960b09330990" integrity sha512-DPNjvNGPabv6FcyjzLAN4C0psN/GgD9rSGvMTuv81SeXG/EX3mCz0wiw9N1tUEnfQXYCJi3H8M0oFPRziZh7rw== -electron@^27.1.0: - version "27.1.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-27.1.2.tgz#d3074c91cce94c1e19b5904b1cdf78c830f2558d" - integrity sha512-Dy6BUuGLiIJv+zfsXwr78TV2TNppi24rXF4PIIS+OjDblEKdkI9r1iM8JUd3/x3sbGUy5mdLMSPhvmu//IhkgA== +electron@^31.0.1: + version "31.0.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-31.0.1.tgz#0039524f8f38c24da802c3b18a42c3951acb5897" + integrity sha512-2eBcp4iqLkTsml6mMq+iqrS5u3kJ/2mpOLP7Mj7lo0uNK3OyfNqRS9z1ArsHjBF2/HV250Te/O9nKrwQRTX/+g== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" + "@types/node" "^20.9.0" extract-zip "^2.0.1" emittery@^0.7.1: From 2db25cf68087ca02cc92770fbd0fd4b35f1e8788 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 25 Jun 2024 12:42:31 -0400 Subject: [PATCH 2/2] Merge remote-tracking branch 'github-desktop-setchy/master' into pr/476 --- examples/package.json | 2 +- examples/yarn.lock | 8 ++++---- package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/package.json b/examples/package.json index 6f1b1bf..d17563d 100644 --- a/examples/package.json +++ b/examples/package.json @@ -10,6 +10,6 @@ "native-menu" ], "devDependencies": { - "electron": "^31.0.1" + "electron": "^31.0.2" } } diff --git a/examples/yarn.lock b/examples/yarn.lock index 09c8e55..74de296 100644 --- a/examples/yarn.lock +++ b/examples/yarn.lock @@ -149,10 +149,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -electron@^31.0.1: - version "31.0.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-31.0.1.tgz#0039524f8f38c24da802c3b18a42c3951acb5897" - integrity sha512-2eBcp4iqLkTsml6mMq+iqrS5u3kJ/2mpOLP7Mj7lo0uNK3OyfNqRS9z1ArsHjBF2/HV250Te/O9nKrwQRTX/+g== +electron@^31.0.2: + version "31.0.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-31.0.2.tgz#9b719fe6072060fe74cb609bcbb84694abce5b17" + integrity sha512-55efQ5yfLN+AQHcFC00AXQqtxC3iAGaxX2GQ3EDbFJ0ca9GHNOdSXkcrdBElLleiDrR2hpXNkQxN1bDn0oxe6w== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0" diff --git a/package.json b/package.json index a290f77..ee065f2 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@amaurym/config": "^1.3.5", "@types/jest": "^25.2.3", - "electron": "^31.0.1", + "electron": "^31.0.2", "jest": "^26.0.1", "rimraf": "^3.0.2", "standard-version": "^8.0.0", diff --git a/yarn.lock b/yarn.lock index 836a5ea..9801a7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2081,10 +2081,10 @@ electron-to-chromium@^1.4.796: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.803.tgz#cf55808a5ee12e2a2778bbe8cdc941ef87c2093b" integrity sha512-61H9mLzGOCLLVsnLiRzCbc63uldP0AniRYPV3hbGVtONA1pI7qSGILdbofR7A8TMbOypDocEAjH/e+9k1QIe3g== -electron@^31.0.1: - version "31.0.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-31.0.1.tgz#0039524f8f38c24da802c3b18a42c3951acb5897" - integrity sha512-2eBcp4iqLkTsml6mMq+iqrS5u3kJ/2mpOLP7Mj7lo0uNK3OyfNqRS9z1ArsHjBF2/HV250Te/O9nKrwQRTX/+g== +electron@^31.0.2: + version "31.0.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-31.0.2.tgz#9b719fe6072060fe74cb609bcbb84694abce5b17" + integrity sha512-55efQ5yfLN+AQHcFC00AXQqtxC3iAGaxX2GQ3EDbFJ0ca9GHNOdSXkcrdBElLleiDrR2hpXNkQxN1bDn0oxe6w== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0"