diff --git a/packages/connect-examples/electron-main-process/package.json b/packages/connect-examples/electron-main-process/package.json index 0d00ac7dda18..75385c7d7e66 100644 --- a/packages/connect-examples/electron-main-process/package.json +++ b/packages/connect-examples/electron-main-process/package.json @@ -57,6 +57,6 @@ "devDependencies": { "@trezor/eslint": "workspace:*", "electron": "39.0.0", - "electron-builder": "26.0.3" + "electron-builder": "26.4.0" } } diff --git a/packages/suite-desktop-core/package.json b/packages/suite-desktop-core/package.json index ab4d4eba3fbf..b0d16fe178ed 100644 --- a/packages/suite-desktop-core/package.json +++ b/packages/suite-desktop-core/package.json @@ -35,7 +35,7 @@ "chalk": "^5.6.2", "electron-localshortcut": "^3.2.1", "electron-store": "11.0.2", - "electron-updater": "6.6.4", + "electron-updater": "6.7.3", "node-loader": "^2.1.0", "openpgp": "^6.2.2", "ws": "^8.18.0" diff --git a/packages/suite-desktop-core/scripts/setElectronFuses.mjs b/packages/suite-desktop-core/scripts/setElectronFuses.mjs index dcc6a9885534..43ebcdb70e49 100644 --- a/packages/suite-desktop-core/scripts/setElectronFuses.mjs +++ b/packages/suite-desktop-core/scripts/setElectronFuses.mjs @@ -16,13 +16,8 @@ const binaryExtensionByPlaformNameMap = { const afterPackHookSetElectronFuses = async context => { const { electronPlatformName, appOutDir } = context; - /* - As of Electron 34.1.0, ASAR integrity: - - is not supported on Linux at all - - is supported on macOS, but does not work. TODO investigate & reenable - So we only set the appropriate fuses for Windows - */ - if (electronPlatformName !== 'win32') { + // As of Electron 39, ASAR integrity is not supported on Linux, so we set the appropriate fuses for Windows and macOS + if (electronPlatformName !== 'win32' && electronPlatformName !== 'darwin') { // eslint-disable-next-line no-console console.log('Skipping electron fuses '); diff --git a/packages/suite-desktop/electron-builder-config.js b/packages/suite-desktop/electron-builder-config.js index 41350ee19e8a..307670e023f2 100644 --- a/packages/suite-desktop/electron-builder-config.js +++ b/packages/suite-desktop/electron-builder-config.js @@ -5,11 +5,11 @@ const isCodesignBuild = process.env.IS_CODESIGN_BUILD === 'true'; // to be able to use patterns like ${author} and ${arch} module.exports = { - // distingush between dev and prod builds + // distinguish between dev and prod builds appId: `io.trezor.TrezorSuite${isCodesignBuild ? '' : '.dev'}`, extraMetadata: { version: suiteVersion, - // distingush between dev and prod builds so different userDataDir is used + // distinguish between dev and prod builds so different userDataDir is used name: `@trezor/suite-desktop${isCodesignBuild ? '' : '-dev'}`, }, productName: 'Trezor Suite', @@ -22,17 +22,14 @@ module.exports = { npmRebuild: false, files: [ // defaults are https://www.electron.build/configuration#files - 'build/**/*', - 'dist/**/*.{js,wasm}', - '!**/{tsconfig}*', - '!**/*.{md,js.map}', - 'build/release-notes.md', - '!**/node_modules/**/*.{js.flow,ts}', - '!build/static/**/{favicon,icons,bin,browsers}', - '!node_modules/@sentry/**/esm', - '!node_modules/ajv/lib', - '!node_modules/blake-hash/**/{build,src}', - '!node_modules/usb/**/{libusb,libusb_config,src}', + 'build/**/*', // Electron renderer process + 'dist/**/*.{js,wasm}', // Electron main+preload process + '!**/*.{md,js.map}', // exclude files unnecessary for runtime + 'build/release-notes.md', // this one is dynamically loaded in runtime + '!build/static/**/{favicon,icons,bin,browsers}', // copied as extraResources instead, some are platform-specific + '!node_modules/blake-hash/**/{build,src}', // exclude files unnecessary for runtime + '!node_modules/usb/**/{libusb,libusb_config,src}', // exclude files unnecessary for runtime + '!node_modules/@trezor/**', // exclude @trezor/suite-desktop, which would recurse. Other @trezor packages are bundled by bundler. ], extraResources: [ { @@ -98,7 +95,7 @@ module.exports = { ], icon: 'build/static/images/desktop/512x512.icns', artifactName: 'Trezor-Suite-${version}-mac-${arch}.${ext}', - hardenedRuntime: true, + hardenedRuntime: isCodesignBuild, gatekeeperAssess: false, darkModeSupport: true, entitlements: 'entitlements.mac.inherit.plist', diff --git a/packages/suite-desktop/package.json b/packages/suite-desktop/package.json index b2850369cbb5..5738014c5c24 100644 --- a/packages/suite-desktop/package.json +++ b/packages/suite-desktop/package.json @@ -30,6 +30,6 @@ }, "devDependencies": { "electron": "39.0.0", - "electron-builder": "26.0.3" + "electron-builder": "26.4.0" } } diff --git a/patches/README.md b/patches/README.md index 460e75c73d05..5fdded8711a5 100644 --- a/patches/README.md +++ b/patches/README.md @@ -1,6 +1,15 @@ # Patches +## app-builder-lib + +Fixes problem with generating `Info.plist` when building for macOS. +Remove this patch after when this is fixed upstream in [electron-builder PR](https://github.com/electron-userland/electron-builder/pull/9481). + ## expo-modules-core Gets rid of `The global process.env.EXPO_OS is not defined. This should be inlined by babel-preset-expo during transformation.` warning while running unit tests. Probably caused by an issue reported [here](https://github.com/expo/expo/issues/26513) or [here](https://github.com/expo/expo/issues/25452). + +## blakejs + +May be outdated, TODO investigate diff --git a/patches/app-builder-lib+26.4.0.patch b/patches/app-builder-lib+26.4.0.patch new file mode 100644 index 000000000000..0cb31f8d2a7c --- /dev/null +++ b/patches/app-builder-lib+26.4.0.patch @@ -0,0 +1,14 @@ +diff --git a/node_modules/app-builder-lib/out/macPackager.js b/node_modules/app-builder-lib/out/macPackager.js +index a52a853..216a77d 100644 +--- a/node_modules/app-builder-lib/out/macPackager.js ++++ b/node_modules/app-builder-lib/out/macPackager.js +@@ -474,6 +474,9 @@ class MacPackager extends platformPackager_1.PlatformPackager { + const extendInfo = this.platformSpecificBuildOptions.extendInfo; + if (extendInfo != null) { + Object.assign(appPlist, extendInfo); ++ for(const [k,v] of Object.entries(appPlist)) { ++ if(v === null || v === undefined) delete appPlist[k] ++ } + } + } + async signApp(packContext, isAsar) { diff --git a/yarn.lock b/yarn.lock index dc9abaf62674..2e0acdafec53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2411,20 +2411,7 @@ __metadata: languageName: node linkType: hard -"@electron/asar@npm:3.2.18": - version: 3.2.18 - resolution: "@electron/asar@npm:3.2.18" - dependencies: - commander: "npm:^5.0.0" - glob: "npm:^7.1.6" - minimatch: "npm:^3.0.4" - bin: - asar: bin/asar.js - checksum: 10/e84be4234b1d981fc7ce1fe51bc9b88df7b0b67ed822d97f459a148159c7ff2a5d09b800c81dc16652459f499dc50a26b45029a84cf6c8a676908e1aa9e2aadf - languageName: node - linkType: hard - -"@electron/asar@npm:^3.2.7": +"@electron/asar@npm:3.4.1, @electron/asar@npm:^3.3.1": version: 3.4.1 resolution: "@electron/asar@npm:3.4.1" dependencies: @@ -2478,26 +2465,6 @@ __metadata: languageName: node linkType: hard -"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2": - version: 10.2.0-electron.1 - resolution: "@electron/node-gyp@https://github.com/electron/node-gyp.git#commit=06b29aafb7708acef8b3669835c8a7857ebc92d2" - dependencies: - env-paths: "npm:^2.2.0" - exponential-backoff: "npm:^3.1.1" - glob: "npm:^8.1.0" - graceful-fs: "npm:^4.2.6" - make-fetch-happen: "npm:^10.2.1" - nopt: "npm:^6.0.0" - proc-log: "npm:^2.0.1" - semver: "npm:^7.3.5" - tar: "npm:^6.2.1" - which: "npm:^2.0.2" - bin: - node-gyp: ./bin/node-gyp.js - checksum: 10/4ee7c77e1a9f581e36b53f393984e40284dcf9ed38ea51265bb5a4fcc51ea7e86e7765a8b8cfac6405506de04f2464c7379ce3f14485ead36dec13eba78c089c - languageName: node - linkType: hard - "@electron/notarize@npm:2.5.0": version: 2.5.0 resolution: "@electron/notarize@npm:2.5.0" @@ -2519,9 +2486,9 @@ __metadata: languageName: node linkType: hard -"@electron/osx-sign@npm:1.3.1": - version: 1.3.1 - resolution: "@electron/osx-sign@npm:1.3.1" +"@electron/osx-sign@npm:1.3.3": + version: 1.3.3 + resolution: "@electron/osx-sign@npm:1.3.3" dependencies: compare-version: "npm:^0.1.2" debug: "npm:^4.3.4" @@ -2532,24 +2499,23 @@ __metadata: bin: electron-osx-flat: bin/electron-osx-flat.js electron-osx-sign: bin/electron-osx-sign.js - checksum: 10/81a5c2674c7be08e7786639bc851219a3437acdc3d61efdc51dd4e80d64f94ae55e0a1e058835bdb1f803bc8e68ccdd13d6cf21356dd93d9fede798758b7473a + checksum: 10/9a6ebae2fa98ab682788ca7f977f1e2bfa25437f963832a925af190ef381fb5bbad0e08b2ad4952f4ab3f250c99a0acb8d5516d49d4f0e30ce8192ddf7ee268e languageName: node linkType: hard -"@electron/rebuild@npm:3.7.0": - version: 3.7.0 - resolution: "@electron/rebuild@npm:3.7.0" +"@electron/rebuild@npm:4.0.1": + version: 4.0.1 + resolution: "@electron/rebuild@npm:4.0.1" dependencies: - "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" "@malept/cross-spawn-promise": "npm:^2.0.0" chalk: "npm:^4.0.0" debug: "npm:^4.1.1" detect-libc: "npm:^2.0.1" - fs-extra: "npm:^10.0.0" got: "npm:^11.7.0" - node-abi: "npm:^3.45.0" - node-api-version: "npm:^0.2.0" - node-gyp: "npm:latest" + graceful-fs: "npm:^4.2.11" + node-abi: "npm:^4.2.0" + node-api-version: "npm:^0.2.1" + node-gyp: "npm:^11.2.0" ora: "npm:^5.1.0" read-binary-file-arch: "npm:^1.0.6" semver: "npm:^7.3.5" @@ -2557,22 +2523,22 @@ __metadata: yargs: "npm:^17.0.1" bin: electron-rebuild: lib/cli.js - checksum: 10/fd459e61ceb0ab1972f151c64c63a919eb0e0fca6ee2c9a1a26068a02e7202f77b640153d37cf51d2720c2213e38998a4e7c61da421e8039cb92b7fa9cd1d740 + checksum: 10/ba50ea1bc7502dccae85f72d11b828d216fe45bb754b01044b2d4b2267bc995746d3dc80ad79077c00141387374a4bff43541ba75ad10c57caf70f3f4854f4ee languageName: node linkType: hard -"@electron/universal@npm:2.0.1": - version: 2.0.1 - resolution: "@electron/universal@npm:2.0.1" +"@electron/universal@npm:2.0.3": + version: 2.0.3 + resolution: "@electron/universal@npm:2.0.3" dependencies: - "@electron/asar": "npm:^3.2.7" + "@electron/asar": "npm:^3.3.1" "@malept/cross-spawn-promise": "npm:^2.0.0" debug: "npm:^4.3.1" dir-compare: "npm:^4.2.0" fs-extra: "npm:^11.1.1" minimatch: "npm:^9.0.3" plist: "npm:^3.1.0" - checksum: 10/9a4fe3a15ba0114f61219cf6a57cb51e71dd878ad8696b818f7b26e85ef5088ee714567c560e4cbd2b1088dffef5c56a83cd75d06b9976b0b190a8c2db0f59c9 + checksum: 10/8c1c9bb0b311c39ea7aff53f9121a04a27fb3a99ffbaa9ba9924f8fba685ecbaedc2be7c75a2392e6da705535c2f043a89c340b5f7d48c286212130d344aab44 languageName: node linkType: hard @@ -4790,13 +4756,6 @@ __metadata: languageName: node linkType: hard -"@gar/promisify@npm:^1.1.3": - version: 1.1.3 - resolution: "@gar/promisify@npm:1.1.3" - checksum: 10/052dd232140fa60e81588000cbe729a40146579b361f1070bce63e2a761388a22a16d00beeffc504bd3601cb8e055c57b21a185448b3ed550cf50716f4fd442e - languageName: node - linkType: hard - "@gorhom/bottom-sheet@npm:5.2.6": version: 5.2.6 resolution: "@gorhom/bottom-sheet@npm:5.2.6" @@ -6388,16 +6347,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/fs@npm:^2.1.0": - version: 2.1.2 - resolution: "@npmcli/fs@npm:2.1.2" - dependencies: - "@gar/promisify": "npm:^1.1.3" - semver: "npm:^7.3.5" - checksum: 10/c5d4dfee80de2236e1e4ed595d17e217aada72ebd8215183fc46096fa010f583dd2aaaa486758de7cc0b89440dbc31cfe8b276269d75d47af35c716e896f78ec - languageName: node - linkType: hard - "@npmcli/fs@npm:^3.1.0": version: 3.1.1 resolution: "@npmcli/fs@npm:3.1.1" @@ -6419,16 +6368,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/move-file@npm:^2.0.0": - version: 2.0.1 - resolution: "@npmcli/move-file@npm:2.0.1" - dependencies: - mkdirp: "npm:^1.0.4" - rimraf: "npm:^3.0.2" - checksum: 10/52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380 - languageName: node - linkType: hard - "@npmcli/name-from-folder@npm:^2.0.0": version: 2.0.0 resolution: "@npmcli/name-from-folder@npm:2.0.0" @@ -14967,7 +14906,7 @@ __metadata: electron-devtools-installer: "npm:^4.0.0" electron-localshortcut: "npm:^3.2.1" electron-store: "npm:11.0.2" - electron-updater: "npm:6.6.4" + electron-updater: "npm:6.7.3" glob: "npm:^11.0.3" lodash: "npm:^4.17.21" node-loader: "npm:^2.1.0" @@ -15024,7 +14963,7 @@ __metadata: dependencies: blake-hash: "npm:^2.0.0" electron: "npm:39.0.0" - electron-builder: "npm:26.0.3" + electron-builder: "npm:26.4.0" openpgp: "npm:^6.2.2" usb: "npm:^2.15.0" languageName: unknown @@ -18020,13 +17959,6 @@ __metadata: languageName: node linkType: hard -"abbrev@npm:^1.0.0": - version: 1.1.1 - resolution: "abbrev@npm:1.1.1" - checksum: 10/2d882941183c66aa665118bafdab82b7a177e9add5eb2776c33e960a4f3c89cff88a1b38aba13a456de01d0dd9d66a8bea7c903268b21ea91dd1097e1e2e8243 - languageName: node - linkType: hard - "abbrev@npm:^2.0.0": version: 2.0.0 resolution: "abbrev@npm:2.0.0" @@ -18236,7 +18168,7 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.2": +"agent-base@npm:6": version: 6.0.2 resolution: "agent-base@npm:6.0.2" dependencies: @@ -18502,46 +18434,48 @@ __metadata: languageName: node linkType: hard -"app-builder-lib@npm:26.0.3": - version: 26.0.3 - resolution: "app-builder-lib@npm:26.0.3" +"app-builder-lib@npm:26.4.0": + version: 26.4.0 + resolution: "app-builder-lib@npm:26.4.0" dependencies: "@develar/schema-utils": "npm:~2.6.5" - "@electron/asar": "npm:3.2.18" + "@electron/asar": "npm:3.4.1" "@electron/fuses": "npm:^1.8.0" "@electron/notarize": "npm:2.5.0" - "@electron/osx-sign": "npm:1.3.1" - "@electron/rebuild": "npm:3.7.0" - "@electron/universal": "npm:2.0.1" + "@electron/osx-sign": "npm:1.3.3" + "@electron/rebuild": "npm:4.0.1" + "@electron/universal": "npm:2.0.3" "@malept/flatpak-bundler": "npm:^0.4.0" "@types/fs-extra": "npm:9.0.13" async-exit-hook: "npm:^2.0.1" - builder-util: "npm:26.0.1" - builder-util-runtime: "npm:9.3.1" + builder-util: "npm:26.3.4" + builder-util-runtime: "npm:9.5.1" chromium-pickle-js: "npm:^0.2.0" - config-file-ts: "npm:0.2.8-rc1" + ci-info: "npm:4.3.1" debug: "npm:^4.3.4" dotenv: "npm:^16.4.5" dotenv-expand: "npm:^11.0.6" ejs: "npm:^3.1.8" - electron-publish: "npm:26.0.1" + electron-publish: "npm:26.3.4" fs-extra: "npm:^10.1.0" hosted-git-info: "npm:^4.1.0" - is-ci: "npm:^3.0.0" isbinaryfile: "npm:^5.0.0" + jiti: "npm:^2.4.2" js-yaml: "npm:^4.1.0" json5: "npm:^2.2.3" lazy-val: "npm:^1.0.5" - minimatch: "npm:^10.0.0" + minimatch: "npm:^10.0.3" + plist: "npm:3.1.0" resedit: "npm:^1.7.0" - semver: "npm:^7.3.8" + semver: "npm:~7.7.3" tar: "npm:^6.1.12" temp-file: "npm:^3.4.0" tiny-async-pool: "npm:1.3.0" + which: "npm:^5.0.0" peerDependencies: - dmg-builder: 26.0.3 - electron-builder-squirrel-windows: 26.0.3 - checksum: 10/6c46e655856747e6125f533407b0c0a3a6dad87a8fdb6865da721dc02fd9f80bd1bfba7f82429b1acf75192299c0578494fad13aa056db8b2814cb003c437f13 + dmg-builder: 26.4.0 + electron-builder-squirrel-windows: 26.4.0 + checksum: 10/9ae2f38d06c3d677929eea10a6890756eaf14bc4f802ebb1249a16f57c4b99a38e5e2fbb1eed09ad516b09b942542ad215ba6900c425ae29f08f372d3837f445 languageName: node linkType: hard @@ -19989,48 +19923,37 @@ __metadata: languageName: node linkType: hard -"builder-util-runtime@npm:9.3.1": - version: 9.3.1 - resolution: "builder-util-runtime@npm:9.3.1" - dependencies: - debug: "npm:^4.3.4" - sax: "npm:^1.2.4" - checksum: 10/062ffe21cb98bffb2e6de7e31101503b5d056aede3dd77c6560dcb215ce6960a0e84f630fc302718adbd1e8755b145264932ec7243b8791f97271beb62f28f81 - languageName: node - linkType: hard - -"builder-util-runtime@npm:9.3.2": - version: 9.3.2 - resolution: "builder-util-runtime@npm:9.3.2" +"builder-util-runtime@npm:9.5.1": + version: 9.5.1 + resolution: "builder-util-runtime@npm:9.5.1" dependencies: debug: "npm:^4.3.4" sax: "npm:^1.2.4" - checksum: 10/79a2dc9848d0ade00a1f2350d4b338e46e1f1a2002d92a9978205bf66f0fc3a0822d550c4ea59f79bc5ea9de5a3299f124d8c322ecd503045a5385691e038055 + checksum: 10/65ecde74ae480e7c7983bccb2db3c0a33e18ecf038c7af87acdf533c365e76c5cd922d13a6f7dad99f151ab508a1366bf8944d7b9651254d56a0dadb3c4bec98 languageName: node linkType: hard -"builder-util@npm:26.0.1": - version: 26.0.1 - resolution: "builder-util@npm:26.0.1" +"builder-util@npm:26.3.4": + version: 26.3.4 + resolution: "builder-util@npm:26.3.4" dependencies: 7zip-bin: "npm:~5.2.0" "@types/debug": "npm:^4.1.6" app-builder-bin: "npm:5.0.0-alpha.12" - builder-util-runtime: "npm:9.3.1" + builder-util-runtime: "npm:9.5.1" chalk: "npm:^4.1.2" cross-spawn: "npm:^7.0.6" debug: "npm:^4.3.4" fs-extra: "npm:^10.1.0" http-proxy-agent: "npm:^7.0.0" https-proxy-agent: "npm:^7.0.0" - is-ci: "npm:^3.0.0" js-yaml: "npm:^4.1.0" sanitize-filename: "npm:^1.6.3" source-map-support: "npm:^0.5.19" stat-mode: "npm:^1.0.0" temp-file: "npm:^3.4.0" tiny-async-pool: "npm:1.3.0" - checksum: 10/c967ecea34e35a41af5dce9fa3125ff25452f201d9a90ae9a7981212890dbd4b5e578b9d56269f9e4fcc12b7d49efea12551e66a82f583cf2a768295fb71c5d5 + checksum: 10/7d411dd9cdd14341bb4992dcd674b8ef279d40a18fc8cca87a870fcbd5dec99cc00b79240ed436b4c96febc48abf235b7eff274fa24e9c088c79b189742f53c9 languageName: node linkType: hard @@ -20160,32 +20083,6 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^16.1.0": - version: 16.1.3 - resolution: "cacache@npm:16.1.3" - dependencies: - "@npmcli/fs": "npm:^2.1.0" - "@npmcli/move-file": "npm:^2.0.0" - chownr: "npm:^2.0.0" - fs-minipass: "npm:^2.1.0" - glob: "npm:^8.0.1" - infer-owner: "npm:^1.0.4" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - mkdirp: "npm:^1.0.4" - p-map: "npm:^4.0.0" - promise-inflight: "npm:^1.0.1" - rimraf: "npm:^3.0.2" - ssri: "npm:^9.0.0" - tar: "npm:^6.1.11" - unique-filename: "npm:^2.0.0" - checksum: 10/a14524d90e377ee691d63a81173b33c473f8bc66eb299c64290b58e1d41b28842397f8d6c15a01b4c57ca340afcec019ae112a45c2f67a79f76130d326472e92 - languageName: node - linkType: hard - "cacache@npm:^18.0.0": version: 18.0.4 resolution: "cacache@npm:18.0.4" @@ -20654,6 +20551,13 @@ __metadata: languageName: node linkType: hard +"ci-info@npm:4.3.1, ci-info@npm:^4.0.0, ci-info@npm:^4.2.0": + version: 4.3.1 + resolution: "ci-info@npm:4.3.1" + checksum: 10/9dc952bef67e665ccde2e7a552d42d5d095529d21829ece060a00925ede2dfa136160c70ef2471ea6ed6c9b133218b47c007f56955c0f1734a2e57f240aa7445 + languageName: node + linkType: hard + "ci-info@npm:^2.0.0": version: 2.0.0 resolution: "ci-info@npm:2.0.0" @@ -20668,13 +20572,6 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^4.0.0, ci-info@npm:^4.2.0": - version: 4.2.0 - resolution: "ci-info@npm:4.2.0" - checksum: 10/928d8457f3476ffc4a66dec93b9cdf1944d5e60dba69fbd6a0fc95b652386f6ef64857f6e32372533210ef6d8954634af2c7693d7c07778ee015f3629a5e0dd9 - languageName: node - linkType: hard - "cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3": version: 1.0.7 resolution: "cipher-base@npm:1.0.7" @@ -21354,16 +21251,6 @@ __metadata: languageName: node linkType: hard -"config-file-ts@npm:0.2.8-rc1": - version: 0.2.8-rc1 - resolution: "config-file-ts@npm:0.2.8-rc1" - dependencies: - glob: "npm:^10.3.12" - typescript: "npm:^5.4.3" - checksum: 10/30884f67de343e2fa7914246c14296c6f4ed6dfcf86c833698fb97be46bc7d8cc9897b53a559d2267e711fbd83deda05d0baeba499151353bd245bfe10f23387 - languageName: node - linkType: hard - "connect-example-electron-main@workspace:packages/connect-examples/electron-main-process": version: 0.0.0-use.local resolution: "connect-example-electron-main@workspace:packages/connect-examples/electron-main-process" @@ -21371,7 +21258,7 @@ __metadata: "@trezor/connect": "workspace:*" "@trezor/eslint": "workspace:*" electron: "npm:39.0.0" - electron-builder: "npm:26.0.3" + electron-builder: "npm:26.4.0" languageName: unknown linkType: soft @@ -22718,7 +22605,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:*, debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.7, debug@npm:^4.4.0, debug@npm:^4.4.1, debug@npm:^4.4.3": +"debug@npm:*, debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.7, debug@npm:^4.4.0, debug@npm:^4.4.1, debug@npm:^4.4.3": version: 4.4.3 resolution: "debug@npm:4.4.3" dependencies: @@ -23324,13 +23211,12 @@ __metadata: languageName: node linkType: hard -"dmg-builder@npm:26.0.3": - version: 26.0.3 - resolution: "dmg-builder@npm:26.0.3" +"dmg-builder@npm:26.4.0": + version: 26.4.0 + resolution: "dmg-builder@npm:26.4.0" dependencies: - app-builder-lib: "npm:26.0.3" - builder-util: "npm:26.0.1" - builder-util-runtime: "npm:9.3.1" + app-builder-lib: "npm:26.4.0" + builder-util: "npm:26.3.4" dmg-license: "npm:^1.0.11" fs-extra: "npm:^10.1.0" iconv-lite: "npm:^0.6.2" @@ -23338,7 +23224,7 @@ __metadata: dependenciesMeta: dmg-license: optional: true - checksum: 10/4a1de6207bc8a20c9d540bb38e5cadcc94ff05b542c09a86a9eb652b815effc2deaa2159570ae7ecb7e3aac0d5c0cdca8aa39e53d7716affc340be3f9b172a4f + checksum: 10/03be1a1df41b3a55cfb7288c4f26d042ecb45c122ebed16a9326a924404f64edafa0cc3d24c1fe9bbe8febb0853b9ea442f6ff44f001972cceab011aed2cc1d1 languageName: node linkType: hard @@ -23707,24 +23593,24 @@ __metadata: languageName: node linkType: hard -"electron-builder@npm:26.0.3": - version: 26.0.3 - resolution: "electron-builder@npm:26.0.3" +"electron-builder@npm:26.4.0": + version: 26.4.0 + resolution: "electron-builder@npm:26.4.0" dependencies: - app-builder-lib: "npm:26.0.3" - builder-util: "npm:26.0.1" - builder-util-runtime: "npm:9.3.1" + app-builder-lib: "npm:26.4.0" + builder-util: "npm:26.3.4" + builder-util-runtime: "npm:9.5.1" chalk: "npm:^4.1.2" - dmg-builder: "npm:26.0.3" + ci-info: "npm:^4.2.0" + dmg-builder: "npm:26.4.0" fs-extra: "npm:^10.1.0" - is-ci: "npm:^3.0.0" lazy-val: "npm:^1.0.5" simple-update-notifier: "npm:2.0.0" yargs: "npm:^17.6.2" bin: electron-builder: cli.js install-app-deps: install-app-deps.js - checksum: 10/2a98fb70fcf8198fdf5cf3b6059696a473f34d6032c703cf02396a29e26df8c06f074d88d4219acd310855327eb00561e508a80f68f6f4212f3229cbad8ac4de + checksum: 10/efa604068181f7dde3a66e94eb06a01c7adeefbe98f43d58b4a63e31fd633ef3aebd2a2c8b2aa89819b9e0eb628576b58d91ed0e1ae0355d19572ffa70791fd2 languageName: node linkType: hard @@ -23756,19 +23642,19 @@ __metadata: languageName: node linkType: hard -"electron-publish@npm:26.0.1": - version: 26.0.1 - resolution: "electron-publish@npm:26.0.1" +"electron-publish@npm:26.3.4": + version: 26.3.4 + resolution: "electron-publish@npm:26.3.4" dependencies: "@types/fs-extra": "npm:^9.0.11" - builder-util: "npm:26.0.1" - builder-util-runtime: "npm:9.3.1" + builder-util: "npm:26.3.4" + builder-util-runtime: "npm:9.5.1" chalk: "npm:^4.1.2" form-data: "npm:^4.0.0" fs-extra: "npm:^10.1.0" lazy-val: "npm:^1.0.5" mime: "npm:^2.5.2" - checksum: 10/0310ee1af8807bb58dbd8d02312c7a8d82d22a2b771b978c67104ba8c79ae7acf7c7980a6ac9ebb9add470d2905e342a7f42f56660a6950bcd66d3a75e9ce7e6 + checksum: 10/53af9e74cf13327ed0872e813b88f9a31073803701d8ff2ed153bcd17b05738e76721781657ffea60c701afca9a381c60b842a832b0bd1de16346999c88926c0 languageName: node linkType: hard @@ -23789,19 +23675,19 @@ __metadata: languageName: node linkType: hard -"electron-updater@npm:6.6.4": - version: 6.6.4 - resolution: "electron-updater@npm:6.6.4" +"electron-updater@npm:6.7.3": + version: 6.7.3 + resolution: "electron-updater@npm:6.7.3" dependencies: - builder-util-runtime: "npm:9.3.2" + builder-util-runtime: "npm:9.5.1" fs-extra: "npm:^10.1.0" js-yaml: "npm:^4.1.0" lazy-val: "npm:^1.0.5" lodash.escaperegexp: "npm:^4.1.2" lodash.isequal: "npm:^4.5.0" - semver: "npm:^7.6.3" + semver: "npm:~7.7.3" tiny-typed-emitter: "npm:^2.1.0" - checksum: 10/1bdcd8df18c3bfd01c3420eaa2229f10ebe57afdd81a93a95ab3206326c7be076cce91f4b99034406a1d90ed6f99d00d8c39784c5035d27fe808ab8f31d43cde + checksum: 10/c274b26c79890b09289a3a92f95c8ce5b20275622c343ce0ed3d48ae9b1f93711eb0e0fd518507c106ddbf4737dd99dbac1f84cf7090c23e8f977e44338510b2 languageName: node linkType: hard @@ -27276,7 +27162,7 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": +"fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" dependencies: @@ -27763,7 +27649,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.0, glob@npm:^8.0.1, glob@npm:^8.0.3, glob@npm:^8.1.0": +"glob@npm:^8.0.0, glob@npm:^8.0.3": version: 8.1.0 resolution: "glob@npm:8.1.0" dependencies: @@ -28714,7 +28600,7 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1": +"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1": version: 4.1.1 resolution: "http-cache-semantics@npm:4.1.1" checksum: 10/362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f @@ -29113,13 +28999,6 @@ __metadata: languageName: node linkType: hard -"infer-owner@npm:^1.0.4": - version: 1.0.4 - resolution: "infer-owner@npm:1.0.4" - checksum: 10/181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89 - languageName: node - linkType: hard - "inflight@npm:^1.0.4": version: 1.0.6 resolution: "inflight@npm:1.0.6" @@ -29429,17 +29308,6 @@ __metadata: languageName: node linkType: hard -"is-ci@npm:^3.0.0": - version: 3.0.1 - resolution: "is-ci@npm:3.0.1" - dependencies: - ci-info: "npm:^3.2.0" - bin: - is-ci: bin.js - checksum: 10/192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e - languageName: node - linkType: hard - "is-core-module@npm:^2.12.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.16.1": version: 2.16.1 resolution: "is-core-module@npm:2.16.1" @@ -30920,7 +30788,7 @@ __metadata: languageName: node linkType: hard -"jiti@npm:^2.1.2": +"jiti@npm:^2.1.2, jiti@npm:^2.4.2": version: 2.6.1 resolution: "jiti@npm:2.6.1" bin: @@ -32597,7 +32465,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.10.1, lru-cache@npm:^7.14.1, lru-cache@npm:^7.7.1": +"lru-cache@npm:^7.10.1, lru-cache@npm:^7.14.1": version: 7.18.3 resolution: "lru-cache@npm:7.18.3" checksum: 10/6029ca5aba3aacb554e919d7ef804fffd4adfc4c83db00fac8248c7c78811fb6d4b6f70f7fd9d55032b3823446546a007edaa66ad1f2377ae833bd983fac5d98 @@ -32666,30 +32534,6 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^10.2.1": - version: 10.2.1 - resolution: "make-fetch-happen@npm:10.2.1" - dependencies: - agentkeepalive: "npm:^4.2.1" - cacache: "npm:^16.1.0" - http-cache-semantics: "npm:^4.1.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.0" - is-lambda: "npm:^1.0.1" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-fetch: "npm:^2.0.3" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - negotiator: "npm:^0.6.3" - promise-retry: "npm:^2.0.1" - socks-proxy-agent: "npm:^7.0.0" - ssri: "npm:^9.0.0" - checksum: 10/fef5acb865a46f25ad0b5ad7d979799125db5dbb24ea811ffa850fbb804bc8e495df2237a8ec3a4fc6250e73c2f95549cca6d6d36a73b1faa61224504eb1188f - languageName: node - linkType: hard - "make-fetch-happen@npm:^13.0.0": version: 13.0.1 resolution: "make-fetch-happen@npm:13.0.1" @@ -35227,7 +35071,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^10.0.0, minimatch@npm:^10.1.1": +"minimatch@npm:^10.0.3, minimatch@npm:^10.1.1": version: 10.1.1 resolution: "minimatch@npm:10.1.1" dependencies: @@ -35270,15 +35114,6 @@ __metadata: languageName: node linkType: hard -"minipass-collect@npm:^1.0.2": - version: 1.0.2 - resolution: "minipass-collect@npm:1.0.2" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10/14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10 - languageName: node - linkType: hard - "minipass-collect@npm:^2.0.1": version: 2.0.1 resolution: "minipass-collect@npm:2.0.1" @@ -35288,21 +35123,6 @@ __metadata: languageName: node linkType: hard -"minipass-fetch@npm:^2.0.3": - version: 2.1.2 - resolution: "minipass-fetch@npm:2.1.2" - dependencies: - encoding: "npm:^0.1.13" - minipass: "npm:^3.1.6" - minipass-sized: "npm:^1.0.3" - minizlib: "npm:^2.1.2" - dependenciesMeta: - encoding: - optional: true - checksum: 10/8cfc589563ae2a11eebbf79121ef9a526fd078fca949ed3f1e4a51472ca4a4aad89fcea1738982ce9d7d833116ecc9c6ae9ebbd844832a94e3f4a3d4d1b9d3b9 - languageName: node - linkType: hard - "minipass-fetch@npm:^3.0.0": version: 3.0.5 resolution: "minipass-fetch@npm:3.0.5" @@ -35345,7 +35165,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": +"minipass@npm:^3.0.0": version: 3.3.6 resolution: "minipass@npm:3.3.6" dependencies: @@ -35972,7 +35792,7 @@ __metadata: languageName: node linkType: hard -"node-abi@npm:^3.3.0, node-abi@npm:^3.45.0": +"node-abi@npm:^3.3.0": version: 3.77.0 resolution: "node-abi@npm:3.77.0" dependencies: @@ -35981,6 +35801,15 @@ __metadata: languageName: node linkType: hard +"node-abi@npm:^4.2.0": + version: 4.24.0 + resolution: "node-abi@npm:4.24.0" + dependencies: + semver: "npm:^7.6.3" + checksum: 10/08c59e0cb22f08e696bcc47652447cd36501b7893aa07eeb84ab9c354d75ecc70272a455e352bb9ced793290d47976c110986b7c075d5b38eff6de7fd99a651e + languageName: node + linkType: hard + "node-abort-controller@npm:^3.0.1, node-abort-controller@npm:^3.1.1": version: 3.1.1 resolution: "node-abort-controller@npm:3.1.1" @@ -35997,12 +35826,12 @@ __metadata: languageName: node linkType: hard -"node-api-version@npm:^0.2.0": - version: 0.2.0 - resolution: "node-api-version@npm:0.2.0" +"node-api-version@npm:^0.2.1": + version: 0.2.1 + resolution: "node-api-version@npm:0.2.1" dependencies: semver: "npm:^7.3.5" - checksum: 10/26146d0d4a6a252009e1926e2f3668a7ab1710d6ee59d615b0099ccdc0c6588a48b5f8668349d4eb313be0d904a67b106b7cf2d2a1a31609ff671394baaf6ce0 + checksum: 10/78a3056873a8a15c4b0f3ed1f64d294fe4e0ba4a4d08b5f9cfa06a8586ff9bc7c942ef17648171b000d7343d216b7e07dc4787d6ba98307f0a2de9ef13722f3a languageName: node linkType: hard @@ -36232,17 +36061,6 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^6.0.0": - version: 6.0.0 - resolution: "nopt@npm:6.0.0" - dependencies: - abbrev: "npm:^1.0.0" - bin: - nopt: bin/nopt.js - checksum: 10/3c1128e07cd0241ae66d6e6a472170baa9f3e84dd4203950ba8df5bafac4efa2166ce917a57ef02b01ba7c40d18b2cc64b29b225fd3640791fe07b24f0b33a32 - languageName: node - linkType: hard - "nopt@npm:^7.0.0": version: 7.2.0 resolution: "nopt@npm:7.2.0" @@ -37728,7 +37546,7 @@ __metadata: languageName: node linkType: hard -"plist@npm:^3.0.4, plist@npm:^3.0.5, plist@npm:^3.1.0": +"plist@npm:3.1.0, plist@npm:^3.0.4, plist@npm:^3.0.5, plist@npm:^3.1.0": version: 3.1.0 resolution: "plist@npm:3.1.0" dependencies: @@ -38522,13 +38340,6 @@ __metadata: languageName: node linkType: hard -"proc-log@npm:^2.0.1": - version: 2.0.1 - resolution: "proc-log@npm:2.0.1" - checksum: 10/f6f23564ff759097db37443e6e2765af84979a703d2c52c1b9df506ee9f87caa101ba49d8fdc115c1a313ec78e37e8134704e9069e6a870f3499d98bb24c436f - languageName: node - linkType: hard - "proc-log@npm:^3.0.0": version: 3.0.0 resolution: "proc-log@npm:3.0.0" @@ -38578,13 +38389,6 @@ __metadata: languageName: node linkType: hard -"promise-inflight@npm:^1.0.1": - version: 1.0.1 - resolution: "promise-inflight@npm:1.0.1" - checksum: 10/1560d413ea20c5a74f3631d39ba8cbd1972b9228072a755d01e1f5ca5110382d9af76a1582d889445adc6e75bb5ac4886b56dc4b6eae51b30145d7bb1ac7505b - languageName: node - linkType: hard - "promise-retry@npm:^2.0.1": version: 2.0.1 resolution: "promise-retry@npm:2.0.1" @@ -41407,7 +41211,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.0.0, semver@npm:^7.1.2, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.6.3, semver@npm:^7.7.1, semver@npm:^7.7.2, semver@npm:^7.7.3": +"semver@npm:^7.0.0, semver@npm:^7.1.2, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.6.3, semver@npm:^7.7.1, semver@npm:^7.7.2, semver@npm:^7.7.3, semver@npm:~7.7.3": version: 7.7.3 resolution: "semver@npm:7.7.3" bin: @@ -42260,18 +42064,7 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "socks-proxy-agent@npm:7.0.0" - dependencies: - agent-base: "npm:^6.0.2" - debug: "npm:^4.3.3" - socks: "npm:^2.6.2" - checksum: 10/26c75d9c62a9ed3fd494df60e65e88da442f78e0d4bc19bfd85ac37bd2c67470d6d4bba5202e804561cda6674db52864c9e2a2266775f879bc8d89c1445a5f4c - languageName: node - linkType: hard - -"socks@npm:^2.6.2, socks@npm:^2.8.3": +"socks@npm:^2.8.3": version: 2.8.3 resolution: "socks@npm:2.8.3" dependencies: @@ -42466,15 +42259,6 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^9.0.0": - version: 9.0.1 - resolution: "ssri@npm:9.0.1" - dependencies: - minipass: "npm:^3.1.1" - checksum: 10/7638a61e91432510718e9265d48d0438a17d53065e5184f1336f234ef6aa3479663942e41e97df56cda06bb24d9d0b5ef342c10685add3cac7267a82d7fa6718 - languageName: node - linkType: hard - "stack-generator@npm:^2.0.5": version: 2.0.10 resolution: "stack-generator@npm:2.0.10" @@ -44940,15 +44724,6 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^2.0.0": - version: 2.0.1 - resolution: "unique-filename@npm:2.0.1" - dependencies: - unique-slug: "npm:^3.0.0" - checksum: 10/807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f - languageName: node - linkType: hard - "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" @@ -44958,15 +44733,6 @@ __metadata: languageName: node linkType: hard -"unique-slug@npm:^3.0.0": - version: 3.0.0 - resolution: "unique-slug@npm:3.0.0" - dependencies: - imurmurhash: "npm:^0.1.4" - checksum: 10/26fc5bc209a875956dd5e84ca39b89bc3be777b112504667c35c861f9547df95afc80439358d836b878b6d91f6ee21fe5ba1a966e9ec2e9f071ddf3fd67d45ee - languageName: node - linkType: hard - "unique-slug@npm:^4.0.0": version: 4.0.0 resolution: "unique-slug@npm:4.0.0" @@ -46894,6 +46660,17 @@ __metadata: languageName: node linkType: hard +"which@npm:^5.0.0": + version: 5.0.0 + resolution: "which@npm:5.0.0" + dependencies: + isexe: "npm:^3.1.1" + bin: + node-which: bin/which.js + checksum: 10/6ec99e89ba32c7e748b8a3144e64bfc74aa63e2b2eacbb61a0060ad0b961eb1a632b08fb1de067ed59b002cec3e21de18299216ebf2325ef0f78e0f121e14e90 + languageName: node + linkType: hard + "wif@npm:^5.0.0": version: 5.0.0 resolution: "wif@npm:5.0.0"