Skip to content
Permalink
Browse files

Merge pull request #10241 from cmgustavo/chore/electron-app-01

chore(desktop): Upgrade electron and electron-builder
  • Loading branch information...
matiu committed Nov 8, 2019
2 parents ceab915 + 41542b3 commit 5a7fb6619299576ec6065065d4a1ab36f4a4d95e
Showing with 12 additions and 5 deletions.
  1. +4 −1 electron/main.js
  2. +4 −3 package.json
  3. +4 −1 src/pages/integrations/coinbase/coinbase.ts
@@ -26,7 +26,10 @@ function createWindow() {
minWidth: 400,
maxWidth: 800,
minHeight: 650,
show: false
show: false,
webPreferences: {
nodeIntegration: true
}
});

// and load the index.html of the app.
@@ -32,6 +32,7 @@
},
"scripts": {
"postinstall": "npm run env:dev && npm run prompt",
"electron:patch": "(! grep -q 'com.apple.security.app-sandbox' ./node_modules/app-builder-lib/templates/entitlements.mac.plist && sed -i -e \"/<dict>/ a\\ \n<key>com.apple.security.app-sandbox</key><true/>\" ./node_modules/app-builder-lib/templates/entitlements.mac.plist) | echo 'electron patched.'",
"prompt": "\n\n\n\n\n\n#\n# Choose a distribution with:\n#\n# $ npm run apply:copay\n# or\n# $ npm run apply:bitpay\n#\n",
"start": "npm run ionic:serve",
"clean": "rm -rf platforms && rm -rf plugins && rm -f config.xml",
@@ -67,7 +68,7 @@
"open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android",
"final:ios": "npm run build:ios-release && npm run open:ios",
"final:android": "npm run build:android-release && npm run sign:android && npm run run:android-release",
"final:desktop": "npm run build:desktop-release && npm run build:electron",
"final:desktop": "npm run electron:patch && npm run build:desktop-release && npm run build:electron",
"run:android": "npm run env:dev && ionic cordova run android --device --debug",
"run:android-release": "npm run env:prod && ionic cordova run android --device",
"log:android": "adb logcat | grep chromium",
@@ -186,8 +187,8 @@
"@types/prismjs": "1.9.1",
"adm-zip": "0.4.13",
"codecov": "3.1.0",
"electron": "3.0.16",
"electron-builder": "20.40.2",
"electron": "4.2.12",
"electron-builder": "21.2.0",
"fs-extra": "5.0.0",
"ionic": "4.10.4",
"ionic-mocks": "1.2.1",
@@ -139,7 +139,10 @@ export class CoinbasePage {
const win = new BrowserWindow({
alwaysOnTop: true,
center: true,
webPreferences: { nodeIntegration: false }
webPreferences: {
contextIsolation: false,
nodeIntegration: false
}
});
win.once('ready-to-show', () => {
win.show();

0 comments on commit 5a7fb66

Please sign in to comment.
You can’t perform that action at this time.