Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-28 12:35:40 +01:00
Code Issues Projects Releases Wiki Activity

Patch electron-builder for node 10. (#807)

Browse Source
This commit is contained in:
Oscar Hinton 2021-03-22 21:21:57 +01:00 committed by GitHub
parent 29c10073fe
commit 316de9109d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/app-builder-lib+22.10.5.patch
View File

@ -1,8 +1,8 @@
diff --git a/node_modules/app-builder-lib/out/macPackager.js b/node_modules/app-builder-lib/out/macPackager.js diff --git a/node_modules/app-builder-lib/out/macPackager.js b/node_modules/app-builder-lib/out/macPackager.js
index 41e067c..0607d09 100644 index 41e067c..1aec3a6 100644
--- a/node_modules/app-builder-lib/out/macPackager.js --- a/node_modules/app-builder-lib/out/macPackager.js
+++ b/node_modules/app-builder-lib/out/macPackager.js +++ b/node_modules/app-builder-lib/out/macPackager.js
@@ -292,6 +292,18 @@ class MacPackager extends _platformPackager().PlatformPackager { @@ -292,6 +292,23 @@ class MacPackager extends _platformPackager().PlatformPackager {
const appFile = `${this.appInfo.productFilename}.app`; const appFile = `${this.appInfo.productFilename}.app`;
@ -10,25 +10,36 @@ index 41e067c..0607d09 100644
+ // is already cross-compiled. Hence we remove it prior to making the universal package, and re-add + // is already cross-compiled. Hence we remove it prior to making the universal package, and re-add
+ // it afterwards + // it afterwards
+ // https://github.com/electron-userland/electron-builder/issues/5552 + // https://github.com/electron-userland/electron-builder/issues/5552
+ const rmdir2 = (0, _util().promisify)(require('fs').rmdir); + const rmdir = (0, _fsExtra().remove);
+ await rmdir2(`${x64AppOutDir}/Bitwarden.app/Contents/PlugIns`, { + try {
+ await rmdir(`${x64AppOutDir}/Bitwarden.app/Contents/PlugIns`, {
+ recursive: true + recursive: true
+ }); + });
+ await rmdir2(`${arm64AppOutPath}/Bitwarden.app/Contents/PlugIns`, { + await rmdir(`${arm64AppOutPath}/Bitwarden.app/Contents/PlugIns`, {
+ recursive: true + recursive: true
+ }); + });
+ } catch (e) {
+ // Catches errors where PlugIns does not exist
+ console.log(e);
+ }
+ +
const { const {
makeUniversalApp makeUniversalApp
} = require('@electron/universal'); } = require('@electron/universal');
@@ -302,6 +314,10 @@ class MacPackager extends _platformPackager().PlatformPackager { @@ -302,7 +319,15 @@ class MacPackager extends _platformPackager().PlatformPackager {
outAppPath: path.join(appOutDir, appFile), outAppPath: path.join(appOutDir, appFile),
force: true force: true
}); });
- const rmdir = (0, _util().promisify)(require('fs').rmdir);
+ +
+ // Bitwarden Patch: Re-add PlugIns dir to Universal binary + // Bitwarden Patch: Re-add PlugIns dir to Universal binary
+ try {
+ await ((0, _fsExtra().copy)(path.join(this.projectDir, 'PlugIns'), `${path.join(appOutDir, appFile)}/Contents/PlugIns`)); + await ((0, _fsExtra().copy)(path.join(this.projectDir, 'PlugIns'), `${path.join(appOutDir, appFile)}/Contents/PlugIns`));
+ } catch (e) {
+ // Catches errors where PlugIns does not exist
+ console.log(e);
+ }
+ +
const rmdir = (0, _util().promisify)(require('fs').rmdir);
await rmdir(x64AppOutDir, { await rmdir(x64AppOutDir, {
recursive: true recursive: true
});