diff --git a/.github/workflows/build-suite-native-adhoc.yml b/.github/workflows/build-suite-native-adhoc.yml index 6885cc92c8..6c8894a26f 100644 --- a/.github/workflows/build-suite-native-adhoc.yml +++ b/.github/workflows/build-suite-native-adhoc.yml @@ -41,7 +41,6 @@ jobs: - name: Install libs run: | yarn workspaces focus @suite-native/app - rm ./patches/app-builder-lib+26.4.0.patch # Hotfix for desktop-only package, which is not installed and crashes patch-package npx patch-package # Apply global patches. - name: Trigger adhoc build Android if: ${{ github.event.inputs.PLATFORM == 'android' || github.event.inputs.PLATFORM == 'all' }} diff --git a/.github/workflows/build-suite-native-preview.yml b/.github/workflows/build-suite-native-preview.yml index ca79bd6efb..dbb1c7bc14 100644 --- a/.github/workflows/build-suite-native-preview.yml +++ b/.github/workflows/build-suite-native-preview.yml @@ -51,7 +51,6 @@ jobs: - name: Install libs run: | yarn workspaces focus @suite-native/app - rm ./patches/app-builder-lib+26.4.0.patch # Hotfix for desktop-only package, which is not installed and crashes patch-package npx patch-package # Apply global patches. - name: Check runtimeVersion builds diff --git a/.github/workflows/release-suite-native-develop.yml b/.github/workflows/release-suite-native-develop.yml index bc1096fd33..92e9f47c39 100644 --- a/.github/workflows/release-suite-native-develop.yml +++ b/.github/workflows/release-suite-native-develop.yml @@ -36,7 +36,6 @@ jobs: - name: Install libs run: | yarn workspaces focus @suite-native/app - rm ./patches/app-builder-lib+26.4.0.patch # Hotfix for desktop-only package, which is not installed and crashes patch-package npx patch-package # Apply global patches. - name: Build on EAS Android run: eas build diff --git a/.github/workflows/release-suite-native-production.yml b/.github/workflows/release-suite-native-production.yml index d8d0f474dd..f2e9f62782 100644 --- a/.github/workflows/release-suite-native-production.yml +++ b/.github/workflows/release-suite-native-production.yml @@ -43,7 +43,6 @@ jobs: - name: Install libs run: | yarn workspaces focus @suite-native/app - rm ./patches/app-builder-lib+26.4.0.patch # Hotfix for desktop-only package, which is not installed and crashes patch-package npx patch-package # Apply global patches. - name: Build on EAS iOS run: eas build @@ -74,7 +73,6 @@ jobs: - name: Install libs run: | yarn workspaces focus @suite-native/app - rm ./patches/app-builder-lib+26.4.0.patch # Hotfix for desktop-only package, which is not installed and crashes patch-package npx patch-package # Apply global patches. - name: Build on EAS Android run: eas build @@ -111,7 +109,6 @@ jobs: - name: Install libs run: | yarn workspaces focus @suite-native/app - rm ./patches/app-builder-lib+26.4.0.patch # Hotfix for desktop-only package, which is not installed and crashes patch-package npx patch-package # Apply global patches. - name: Get Suite version diff --git a/packages/connect-examples/electron-main-process/package.json b/packages/connect-examples/electron-main-process/package.json index 0fb3edd842..a02e0e31eb 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.2.7", - "electron-builder": "26.4.0" + "electron-builder": "26.4.1" } } diff --git a/packages/suite-desktop/package.json b/packages/suite-desktop/package.json index 51e24f3ef0..f8d52cbb4a 100644 --- a/packages/suite-desktop/package.json +++ b/packages/suite-desktop/package.json @@ -30,6 +30,6 @@ }, "devDependencies": { "electron": "39.2.7", - "electron-builder": "26.4.0" + "electron-builder": "26.4.1" } } diff --git a/patches/README.md b/patches/README.md index 01ee423ece..d95db48bfa 100644 --- a/patches/README.md +++ b/patches/README.md @@ -11,13 +11,6 @@ --- -## app-builder-lib - -Desktop-only, is hotfixed in: `build-suite-native-adhoc.yml, build-suite-native-preview.yml, release-suite-native-develop.yml, release-suite-native-production.yml` - -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 Native-only, but does not break any CI. diff --git a/patches/app-builder-lib+26.4.0.patch b/patches/app-builder-lib+26.4.0.patch deleted file mode 100644 index 0cb31f8d2a..0000000000 --- a/patches/app-builder-lib+26.4.0.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 296b1378ff..a5e17b91ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15103,7 +15103,7 @@ __metadata: dependencies: blake-hash: "npm:^2.0.0" electron: "npm:39.2.7" - electron-builder: "npm:26.4.0" + electron-builder: "npm:26.4.1" openpgp: "npm:^6.3.0" usb: "npm:^2.15.0" languageName: unknown @@ -18597,9 +18597,9 @@ __metadata: languageName: node linkType: hard -"app-builder-lib@npm:26.4.0": - version: 26.4.0 - resolution: "app-builder-lib@npm:26.4.0" +"app-builder-lib@npm:26.4.1": + version: 26.4.1 + resolution: "app-builder-lib@npm:26.4.1" dependencies: "@develar/schema-utils": "npm:~2.6.5" "@electron/asar": "npm:3.4.1" @@ -18611,7 +18611,7 @@ __metadata: "@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.3.4" + builder-util: "npm:26.4.1" builder-util-runtime: "npm:9.5.1" chromium-pickle-js: "npm:^0.2.0" ci-info: "npm:4.3.1" @@ -18619,7 +18619,7 @@ __metadata: dotenv: "npm:^16.4.5" dotenv-expand: "npm:^11.0.6" ejs: "npm:^3.1.8" - electron-publish: "npm:26.3.4" + electron-publish: "npm:26.4.1" fs-extra: "npm:^10.1.0" hosted-git-info: "npm:^4.1.0" isbinaryfile: "npm:^5.0.0" @@ -18636,9 +18636,9 @@ __metadata: tiny-async-pool: "npm:1.3.0" which: "npm:^5.0.0" peerDependencies: - dmg-builder: 26.4.0 - electron-builder-squirrel-windows: 26.4.0 - checksum: 10/9ae2f38d06c3d677929eea10a6890756eaf14bc4f802ebb1249a16f57c4b99a38e5e2fbb1eed09ad516b09b942542ad215ba6900c425ae29f08f372d3837f445 + dmg-builder: 26.4.1 + electron-builder-squirrel-windows: 26.4.1 + checksum: 10/329ae315324bf6ed3efeeee3c4c80c442010562a67241682f469c6de33f4ebdb72dcda6912a802ae094c64b754dffb6bbec720d8fa619203112c4d73e012316a languageName: node linkType: hard @@ -20068,9 +20068,9 @@ __metadata: languageName: node linkType: hard -"builder-util@npm:26.3.4": - version: 26.3.4 - resolution: "builder-util@npm:26.3.4" +"builder-util@npm:26.4.1": + version: 26.4.1 + resolution: "builder-util@npm:26.4.1" dependencies: 7zip-bin: "npm:~5.2.0" "@types/debug": "npm:^4.1.6" @@ -20088,7 +20088,7 @@ __metadata: stat-mode: "npm:^1.0.0" temp-file: "npm:^3.4.0" tiny-async-pool: "npm:1.3.0" - checksum: 10/7d411dd9cdd14341bb4992dcd674b8ef279d40a18fc8cca87a870fcbd5dec99cc00b79240ed436b4c96febc48abf235b7eff274fa24e9c088c79b189742f53c9 + checksum: 10/945f4f0a54befefdc7836029286e29e48d8ba3ecb7625937229d48d8677fa3a2328a45ca3d14521a0ee2d3521588e8203667abb2e2cfb9fe3325e4916fe5922b languageName: node linkType: hard @@ -21392,7 +21392,7 @@ __metadata: "@trezor/connect": "workspace:*" "@trezor/eslint": "workspace:*" electron: "npm:39.2.7" - electron-builder: "npm:26.4.0" + electron-builder: "npm:26.4.1" languageName: unknown linkType: soft @@ -23352,12 +23352,12 @@ __metadata: languageName: node linkType: hard -"dmg-builder@npm:26.4.0": - version: 26.4.0 - resolution: "dmg-builder@npm:26.4.0" +"dmg-builder@npm:26.4.1": + version: 26.4.1 + resolution: "dmg-builder@npm:26.4.1" dependencies: - app-builder-lib: "npm:26.4.0" - builder-util: "npm:26.3.4" + app-builder-lib: "npm:26.4.1" + builder-util: "npm:26.4.1" dmg-license: "npm:^1.0.11" fs-extra: "npm:^10.1.0" iconv-lite: "npm:^0.6.2" @@ -23365,7 +23365,7 @@ __metadata: dependenciesMeta: dmg-license: optional: true - checksum: 10/03be1a1df41b3a55cfb7288c4f26d042ecb45c122ebed16a9326a924404f64edafa0cc3d24c1fe9bbe8febb0853b9ea442f6ff44f001972cceab011aed2cc1d1 + checksum: 10/64800ff9777af76e70b1e2e64726980e5a9c496aff2f7e0a739d3804ef65157489ed3f037b5f6d4164feb3bfe5081ed9738530bbf05fcdc1f268bf8856a3a317 languageName: node linkType: hard @@ -23706,16 +23706,16 @@ __metadata: languageName: node linkType: hard -"electron-builder@npm:26.4.0": - version: 26.4.0 - resolution: "electron-builder@npm:26.4.0" +"electron-builder@npm:26.4.1": + version: 26.4.1 + resolution: "electron-builder@npm:26.4.1" dependencies: - app-builder-lib: "npm:26.4.0" - builder-util: "npm:26.3.4" + app-builder-lib: "npm:26.4.1" + builder-util: "npm:26.4.1" builder-util-runtime: "npm:9.5.1" chalk: "npm:^4.1.2" ci-info: "npm:^4.2.0" - dmg-builder: "npm:26.4.0" + dmg-builder: "npm:26.4.1" fs-extra: "npm:^10.1.0" lazy-val: "npm:^1.0.5" simple-update-notifier: "npm:2.0.0" @@ -23723,7 +23723,7 @@ __metadata: bin: electron-builder: cli.js install-app-deps: install-app-deps.js - checksum: 10/efa604068181f7dde3a66e94eb06a01c7adeefbe98f43d58b4a63e31fd633ef3aebd2a2c8b2aa89819b9e0eb628576b58d91ed0e1ae0355d19572ffa70791fd2 + checksum: 10/e7f1dc6586bc4d8f854b2fde6771d87b09bffe0abbf6714e440ccf0a84eb05164a96989f37f26445e61ef98e34e3c8762553b83924a3a93aee0c2cf1a9b6654c languageName: node linkType: hard @@ -23755,19 +23755,19 @@ __metadata: languageName: node linkType: hard -"electron-publish@npm:26.3.4": - version: 26.3.4 - resolution: "electron-publish@npm:26.3.4" +"electron-publish@npm:26.4.1": + version: 26.4.1 + resolution: "electron-publish@npm:26.4.1" dependencies: "@types/fs-extra": "npm:^9.0.11" - builder-util: "npm:26.3.4" + builder-util: "npm:26.4.1" 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/53af9e74cf13327ed0872e813b88f9a31073803701d8ff2ed153bcd17b05738e76721781657ffea60c701afca9a381c60b842a832b0bd1de16346999c88926c0 + checksum: 10/5cd45efbbfd17ca9889c162b8ecdf4f1639d203ac3bc11388b6209ad0c8f2d52ff0d36b9fb914cbafef5a781af7658586b34cc1aa0d1d197068b086c3e92db8b languageName: node linkType: hard