diff --git a/desktop/package.json b/desktop/package.json index 81484eff3a..109e315f11 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -7,7 +7,7 @@ "@foxglove/studio-base": "workspace:*", "@foxglove/studio-desktop": "workspace:*", "@foxglove/tsconfig": "2.0.0", - "electron": "25.5.0", + "electron": "31.1.0", "playwright": "1.37.1", "webpack": "5.88.2" } diff --git a/package.json b/package.json index 43a90a7534..84c5877fee 100644 --- a/package.json +++ b/package.json @@ -96,8 +96,8 @@ "babel-plugin-transform-import-meta": "2.2.1", "cross-env": "7.0.3", "depcheck": "1.4.6", - "electron": "25.5.0", - "electron-builder": "24.6.4", + "electron": "31.1.0", + "electron-builder": "24.13.3", "eslint": "8.50.0", "eslint-config-prettier": "9.1.0", "eslint-import-resolver-webpack": "0.13.8", diff --git a/packages/studio-desktop/package.json b/packages/studio-desktop/package.json index 51787840d8..0504bcc8e8 100644 --- a/packages/studio-desktop/package.json +++ b/packages/studio-desktop/package.json @@ -28,11 +28,11 @@ "async-mutex": "0.4.0", "builder-util": "*", "clean-webpack-plugin": "4.0.0", - "electron": "25.5.0", - "electron-builder": "24.6.4", + "electron": "31.1.0", + "electron-builder": "24.13.3", "electron-devtools-installer": "3.2.0", - "electron-squirrel-startup": "1.0.0", - "electron-updater": "6.1.4", + "electron-squirrel-startup": "1.0.1", + "electron-updater": "6.2.1", "esbuild-loader": "2.21.0", "eventemitter3": "5.0.1", "fork-ts-checker-webpack-plugin": "9.0.2", diff --git a/yarn.lock b/yarn.lock index 03f5c09112..ee1e4aafb9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,13 +5,6 @@ __metadata: version: 6 cacheKey: 8 -"7zip-bin@npm:~5.1.1": - version: 5.1.1 - resolution: "7zip-bin@npm:5.1.1" - checksum: 1e58ba3742ac86daa84d2e60c46fd545f235c9f60a00cd36a87a70bf824cc0c821fdc418994f1745081b17e7bc83d155e1e82bd44b06996e7cab0a491ce644c1 - languageName: node - linkType: hard - "7zip-bin@npm:~5.2.0": version: 5.2.0 resolution: "7zip-bin@npm:5.2.0" @@ -1878,17 +1871,6 @@ __metadata: languageName: node linkType: hard -"@electron/notarize@npm:2.1.0": - version: 2.1.0 - resolution: "@electron/notarize@npm:2.1.0" - dependencies: - debug: ^4.1.1 - fs-extra: ^9.0.1 - promise-retry: ^2.0.1 - checksum: ac58f39f4b2370ea929837cef50ebeedb4108ed9bd2a3fef0b89254891014a745da2db703b18b8e0d097a17000cc8fa984bcff3f087368986cb4a59753365a2f - languageName: node - linkType: hard - "@electron/notarize@npm:2.2.1": version: 2.2.1 resolution: "@electron/notarize@npm:2.2.1" @@ -1917,21 +1899,6 @@ __metadata: languageName: node linkType: hard -"@electron/universal@npm:1.4.1": - version: 1.4.1 - resolution: "@electron/universal@npm:1.4.1" - dependencies: - "@electron/asar": ^3.2.1 - "@malept/cross-spawn-promise": ^1.1.0 - debug: ^4.3.1 - dir-compare: ^3.0.0 - fs-extra: ^9.0.1 - minimatch: ^3.0.4 - plist: ^3.0.4 - checksum: 257f3a25a4f940ccbe601a0f3a2a925a28657bc3c5fc46018980b771825834665d184e5ce75cfa0b8639525a0bdbb7f0bc02e69e2d4fb044add64638db4d48a4 - languageName: node - linkType: hard - "@electron/universal@npm:1.5.1": version: 1.5.1 resolution: "@electron/universal@npm:1.5.1" @@ -3050,11 +3017,11 @@ __metadata: async-mutex: 0.4.0 builder-util: "*" clean-webpack-plugin: 4.0.0 - electron: 25.5.0 - electron-builder: 24.6.4 + electron: 31.1.0 + electron-builder: 24.13.3 electron-devtools-installer: 3.2.0 - electron-squirrel-startup: 1.0.0 - electron-updater: 6.1.4 + electron-squirrel-startup: 1.0.1 + electron-updater: 6.2.1 esbuild-loader: 2.21.0 eventemitter3: 5.0.1 fork-ts-checker-webpack-plugin: 9.0.2 @@ -8385,25 +8352,24 @@ __metadata: languageName: node linkType: hard -"app-builder-lib@npm:24.6.4": - version: 24.6.4 - resolution: "app-builder-lib@npm:24.6.4" +"app-builder-lib@npm:24.13.3": + version: 24.13.3 + resolution: "app-builder-lib@npm:24.13.3" dependencies: - 7zip-bin: ~5.1.1 "@develar/schema-utils": ~2.6.5 - "@electron/notarize": 2.1.0 + "@electron/notarize": 2.2.1 "@electron/osx-sign": 1.0.5 - "@electron/universal": 1.4.1 + "@electron/universal": 1.5.1 "@malept/flatpak-bundler": ^0.4.0 "@types/fs-extra": 9.0.13 async-exit-hook: ^2.0.1 bluebird-lst: ^1.0.9 - builder-util: 24.5.0 - builder-util-runtime: 9.2.1 + builder-util: 24.13.1 + builder-util-runtime: 9.2.4 chromium-pickle-js: ^0.2.0 debug: ^4.3.4 ejs: ^3.1.8 - electron-publish: 24.5.0 + electron-publish: 24.13.1 form-data: ^4.0.0 fs-extra: ^10.1.0 hosted-git-info: ^4.1.0 @@ -8417,7 +8383,10 @@ __metadata: semver: ^7.3.8 tar: ^6.1.12 temp-file: ^3.4.0 - checksum: fda8a63e4e8345c0885ad9f16b05737f4814c5a2792a3622b52b5992666c0b8c33153ca2a6bce08569c861bbe11885ee3b8c1e19c32c7cf9e6311c54b7548487 + peerDependencies: + dmg-builder: 24.13.3 + electron-builder-squirrel-windows: 24.13.3 + checksum: 68ea3295efe99b8e8d4f9a1e77f3eae34de01b9829f8907e467d658b9406aa04c95baa2c06142b29bd8184d4efdc69f176a53d62fec36e7eba80024c46ce5adc languageName: node linkType: hard @@ -9335,16 +9304,6 @@ __metadata: languageName: node linkType: hard -"builder-util-runtime@npm:9.2.1": - version: 9.2.1 - resolution: "builder-util-runtime@npm:9.2.1" - dependencies: - debug: ^4.3.4 - sax: ^1.2.4 - checksum: 6933e086b8ff9902cbd6d4c08d21d4a0437663ac849bc0939ec20a59cb2b084d7ab655c4dc2c71f854e77da152ff1f8e1240372665cb70e7b954afbfbf4d525a - languageName: node - linkType: hard - "builder-util-runtime@npm:9.2.4": version: 9.2.4 resolution: "builder-util-runtime@npm:9.2.4" @@ -9379,30 +9338,6 @@ __metadata: languageName: node linkType: hard -"builder-util@npm:24.5.0": - version: 24.5.0 - resolution: "builder-util@npm:24.5.0" - dependencies: - 7zip-bin: ~5.1.1 - "@types/debug": ^4.1.6 - app-builder-bin: 4.0.0 - bluebird-lst: ^1.0.9 - builder-util-runtime: 9.2.1 - chalk: ^4.1.2 - cross-spawn: ^7.0.3 - debug: ^4.3.4 - fs-extra: ^10.1.0 - http-proxy-agent: ^5.0.0 - https-proxy-agent: ^5.0.1 - is-ci: ^3.0.0 - js-yaml: ^4.1.0 - source-map-support: ^0.5.19 - stat-mode: ^1.0.0 - temp-file: ^3.4.0 - checksum: 8f3b27bccf4b81ce983576e9aacd06045c6f8a7c3d5e6704d45a96b0e91e4c3a36718760612e28e0de62e46e406e59c7030a472a40739e061c84294167e96859 - languageName: node - linkType: hard - "byte-base64@npm:^1.1.0": version: 1.1.0 resolution: "byte-base64@npm:1.1.0" @@ -10918,7 +10853,7 @@ __metadata: "@foxglove/studio-base": "workspace:*" "@foxglove/studio-desktop": "workspace:*" "@foxglove/tsconfig": 2.0.0 - electron: 25.5.0 + electron: 31.1.0 playwright: 1.37.1 webpack: 5.88.2 languageName: unknown @@ -11072,13 +11007,13 @@ __metadata: languageName: node linkType: hard -"dmg-builder@npm:24.6.4": - version: 24.6.4 - resolution: "dmg-builder@npm:24.6.4" +"dmg-builder@npm:24.13.3": + version: 24.13.3 + resolution: "dmg-builder@npm:24.13.3" dependencies: - app-builder-lib: 24.6.4 - builder-util: 24.5.0 - builder-util-runtime: 9.2.1 + app-builder-lib: 24.13.3 + builder-util: 24.13.1 + builder-util-runtime: 9.2.4 dmg-license: ^1.0.11 fs-extra: ^10.1.0 iconv-lite: ^0.6.2 @@ -11086,7 +11021,7 @@ __metadata: dependenciesMeta: dmg-license: optional: true - checksum: 2a52839b2d38fe2bf6f057f567566a31ce3ac80fbb495f0803b1cf8209962914a635bc633144b515c762995a75c4115063d9a1b038fe0c86058d844134692530 + checksum: 5c25293d795bb3326baee9d911d797a1ec703ad78ba57b60c6e6ce672582fe820590c59913b6800885e8303c853b3797ce518e304aa83f568caab147e1e8979a languageName: node linkType: hard @@ -11350,15 +11285,15 @@ __metadata: languageName: node linkType: hard -"electron-builder@npm:24.6.4": - version: 24.6.4 - resolution: "electron-builder@npm:24.6.4" +"electron-builder@npm:24.13.3": + version: 24.13.3 + resolution: "electron-builder@npm:24.13.3" dependencies: - app-builder-lib: 24.6.4 - builder-util: 24.5.0 - builder-util-runtime: 9.2.1 + app-builder-lib: 24.13.3 + builder-util: 24.13.1 + builder-util-runtime: 9.2.4 chalk: ^4.1.2 - dmg-builder: 24.6.4 + dmg-builder: 24.13.3 fs-extra: ^10.1.0 is-ci: ^3.0.0 lazy-val: ^1.0.5 @@ -11368,7 +11303,7 @@ __metadata: bin: electron-builder: cli.js install-app-deps: install-app-deps.js - checksum: efada633e223d821d2a793f991eef8746acbe4aabbe115510ce3a5aeda25c9462bf02a5466c07169c5502fa7faa87b6926db842546058ff430c0c5c532a0501b + checksum: 8d7943d990363e547f1fbe391fee6b94d5e35e78c355645399f1f9b6709b6c167f0781abf8926c984c8a92475e6647f863f5e6a6938101a8a3a18ca85559810b languageName: node linkType: hard @@ -11399,27 +11334,12 @@ __metadata: languageName: node linkType: hard -"electron-publish@npm:24.5.0": - version: 24.5.0 - resolution: "electron-publish@npm:24.5.0" - dependencies: - "@types/fs-extra": ^9.0.11 - builder-util: 24.5.0 - builder-util-runtime: 9.2.1 - chalk: ^4.1.2 - fs-extra: ^10.1.0 - lazy-val: ^1.0.5 - mime: ^2.5.2 - checksum: 7f31b5f2fc959a42747afb286e8dd9c4f7a1de387ef0836ee78e7fd81aaf121e1b1d55c8810924ba82eb1e4fc31da68d519240539bf7105b009973d366efa3b5 - languageName: node - linkType: hard - -"electron-squirrel-startup@npm:1.0.0": - version: 1.0.0 - resolution: "electron-squirrel-startup@npm:1.0.0" +"electron-squirrel-startup@npm:1.0.1": + version: 1.0.1 + resolution: "electron-squirrel-startup@npm:1.0.1" dependencies: debug: ^2.2.0 - checksum: a1f658e326bd0f5c24aec95fd9a94a2e2b8b645adbd421465829f32719d15e85d6469d9369914c3b766d61e71eebb9f6725057b7fafa78adbcc5d6d3ce5d7a22 + checksum: fabdca2f5badc5bb63e59d226fd23db749f15a9450d138dca21bbca9583fbd7086215d6f9a94b86f5ca0edeb97087b5d6e6aebfe292a0d2203e51b8f765b8f57 languageName: node linkType: hard @@ -11430,11 +11350,11 @@ __metadata: languageName: node linkType: hard -"electron-updater@npm:6.1.4": - version: 6.1.4 - resolution: "electron-updater@npm:6.1.4" +"electron-updater@npm:6.2.1": + version: 6.2.1 + resolution: "electron-updater@npm:6.2.1" dependencies: - builder-util-runtime: 9.2.1 + builder-util-runtime: 9.2.4 fs-extra: ^10.1.0 js-yaml: ^4.1.0 lazy-val: ^1.0.5 @@ -11442,20 +11362,20 @@ __metadata: lodash.isequal: ^4.5.0 semver: ^7.3.8 tiny-typed-emitter: ^2.1.0 - checksum: 39d67a24103c24c75e8f0dd172c6f3bae71aa3b9e7b120ba7ce1838981b92f55b616e05b97c529da3db4e28e9db4ac749de450c2fb4d25f119671adfb08e3bd9 + checksum: 92a064610a3c9df747dce9c3eccd69c48adb2c8b37b9d7c13d1c39f7e2a9ffaef4e909ab50e6973d557566bde6de7ec9c64e2cc3a2cdef18b3220c5d91333e1c languageName: node linkType: hard -"electron@npm:25.5.0": - version: 25.5.0 - resolution: "electron@npm:25.5.0" +"electron@npm:31.1.0": + version: 31.1.0 + resolution: "electron@npm:31.1.0" dependencies: "@electron/get": ^2.0.0 - "@types/node": ^18.11.18 + "@types/node": ^20.9.0 extract-zip: ^2.0.1 bin: electron: cli.js - checksum: 070e482de16420e1ea1372886426ff5fdbc7f87e171a2bf9de4df351fc90c7a32d56b26a577b4a4e3d95c0a98869faab8d59bf40ee77356912c05dda6d5fd678 + checksum: 697fe7530680cda23619b81972cc3b613fdf23c191fbe3a6e4abbc932453601bdd21942e59379e0bd171307bfedd3a03ac759877ebc0ea2b7ccd3db8cf748e4b languageName: node linkType: hard @@ -13096,8 +13016,8 @@ __metadata: babel-plugin-transform-import-meta: 2.2.1 cross-env: 7.0.3 depcheck: 1.4.6 - electron: 25.5.0 - electron-builder: 24.6.4 + electron: 31.1.0 + electron-builder: 24.13.3 eslint: 8.50.0 eslint-config-prettier: 9.1.0 eslint-import-resolver-webpack: 0.13.8