diff --git a/package.json b/package.json index 11b5c3b8..ee4c7069 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,8 @@ }, "patchedDependencies": { "vudio@2.1.1": "patches/vudio@2.1.1.patch", - "@xhayper/discord-rpc@1.1.2": "patches/@xhayper__discord-rpc@1.1.2.patch" + "@xhayper/discord-rpc@1.1.2": "patches/@xhayper__discord-rpc@1.1.2.patch", + "app-builder-lib@24.13.3": "patches/app-builder-lib@24.13.3.patch" } }, "dependencies": { diff --git a/patches/app-builder-lib@24.13.3.patch b/patches/app-builder-lib@24.13.3.patch new file mode 100644 index 00000000..7641f382 --- /dev/null +++ b/patches/app-builder-lib@24.13.3.patch @@ -0,0 +1,21 @@ +diff --git a/out/targets/snap.js b/out/targets/snap.js +index f72c36355d27cd2d69fc5fdf2d8bb2451db0287f..baae112fe25ebb49ab8e25aaa48efd6bc43b598f 100644 +--- a/out/targets/snap.js ++++ b/out/targets/snap.js +@@ -212,14 +212,14 @@ class SnapTarget extends core_1.Target { + args.push("--template-url", `electron4:${snapArch}`); + } + await (0, builder_util_1.executeAppBuilder)(args); +- const publishConfig = findSnapPublishConfig(this.packager.config); ++ + await packager.info.callArtifactBuildCompleted({ + file: artifactPath, + safeArtifactName: packager.computeSafeArtifactName(artifactName, "snap", arch, false), + target: this, + arch, + packager, +- publishConfig: publishConfig == null ? { provider: "snapStore" } : publishConfig, ++ publishConfig: options.publish == null ? { provider: "snapStore" } : null, + }); + } + isElectronVersionGreaterOrEqualThan(version) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index af5fe75f..cebf7524 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,6 +16,9 @@ patchedDependencies: '@xhayper/discord-rpc@1.1.2': hash: 7eeaht6k4r7cw3nunras7mx7iu path: patches/@xhayper__discord-rpc@1.1.2.patch + app-builder-lib@24.13.3: + hash: zcnm2qnjaggm2keyecnhiglkke + path: patches/app-builder-lib@24.13.3.patch vudio@2.1.1: hash: 7iux5msqpgl3octdmwy4uspwoe path: patches/vudio@2.1.1.patch @@ -2101,7 +2104,7 @@ packages: resolution: {integrity: sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==} dev: true - /app-builder-lib@24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3): + /app-builder-lib@24.13.3(patch_hash=zcnm2qnjaggm2keyecnhiglkke)(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3): resolution: {integrity: sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2140,6 +2143,7 @@ packages: transitivePeerDependencies: - supports-color dev: true + patched: true /arch@2.2.0: resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==} @@ -3143,7 +3147,7 @@ packages: /dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3): resolution: {integrity: sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==} dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) + app-builder-lib: 24.13.3(patch_hash=zcnm2qnjaggm2keyecnhiglkke)(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) builder-util: 24.13.1 builder-util-runtime: 9.2.4 fs-extra: 10.1.0 @@ -3250,7 +3254,7 @@ packages: /electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3): resolution: {integrity: sha512-oHkV0iogWfyK+ah9ZIvMDpei1m9ZRpdXcvde1wTpra2U8AFDNNpqJdnin5z+PM1GbQ5BoaKCWas2HSjtR0HwMg==} dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) + app-builder-lib: 24.13.3(patch_hash=zcnm2qnjaggm2keyecnhiglkke)(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) archiver: 5.3.2 builder-util: 24.13.1 fs-extra: 10.1.0 @@ -3264,7 +3268,7 @@ packages: engines: {node: '>=14.0.0'} hasBin: true dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) + app-builder-lib: 24.13.3(patch_hash=zcnm2qnjaggm2keyecnhiglkke)(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) builder-util: 24.13.1 builder-util-runtime: 9.2.4 chalk: 4.1.2