From da49ac51e6ce980bd7130a45a610aaae33d4146f Mon Sep 17 00:00:00 2001 From: ziajka Date: Fri, 20 Jul 2018 13:28:49 +0200 Subject: [PATCH] Disable sentry, Ref: #158 --- electron-builder.yml | 2 +- main.js | 11 +++- package.json | 2 +- sentry.js | 38 ++++++------ yarn.lock | 135 +++++++++++++++++++++++++++---------------- 5 files changed, 116 insertions(+), 72 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index 77ede302..25db9f3b 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -39,7 +39,7 @@ linux: icon: "dist/assets/icons/png" category: "Network" packageCategory: "Network" - description: "GNS3 Web Ui Prototype application. Please don't use it as long as it's not officially announced." + description: "GNS3 Web UI Prototype application. Please don't use it as long as it's not officially announced." target: - deb - AppImage diff --git a/main.js b/main.js index 9ed733a8..c47d44ad 100644 --- a/main.js +++ b/main.js @@ -6,7 +6,7 @@ const path = require('path'); const url = require('url'); const yargs = require('yargs'); -require('./sentry'); +// require('./sentry'); // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. @@ -70,7 +70,13 @@ const exitServerProc = () => { function createWindow () { // Create the browser window. - mainWindow = new BrowserWindow({width: 800, height: 600}); + mainWindow = new BrowserWindow({ + width: 800, + height: 600, + webPreferences: { + preload: path.join(__dirname, 'sentry.js') + } + }); // and load the index.html of the app. @@ -83,6 +89,7 @@ function createWindow () { protocol: 'file:', slashes: true })); + mainWindow.maximize(); } if(argv.d) { diff --git a/package.json b/package.json index c31189ee..54d7464a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "@angular/platform-browser-dynamic": "^6.0.7", "@angular/router": "^6.0.7", "@ng-bootstrap/ng-bootstrap": "^2.2.0", - "@sentry/electron": "^0.5.5", "angular-persistence": "^1.0.1", "angular2-hotkeys": "^2.1.2", "angular2-indexeddb": "^1.2.2", @@ -66,6 +65,7 @@ "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.2", "@types/node": "~10.5.2", + "@sentry/electron": "^0.7.0", "codelyzer": "~4.4.2", "electron": "2.0.4", "electron-builder": "^20.19.2", diff --git a/sentry.js b/sentry.js index 14df2c57..b8cbf25f 100644 --- a/sentry.js +++ b/sentry.js @@ -1,26 +1,26 @@ -const { init } = require('@sentry/electron'); -const fs = require('fs'); -const { ipcMain } = require('electron'); +// const { init } = require('@sentry/electron'); +// const fs = require('fs'); +// const { ipcMain } = require('electron'); -let crashReportsEnabled = true; -const DSN = - 'https://cb7b474b2e874afb8e400c47d1452ecc:7876224cbff543d992cb0ac4021962f8@sentry.io/1040940'; +// let crashReportsEnabled = true; +// const DSN = +// 'https://cb7b474b2e874afb8e400c47d1452ecc:7876224cbff543d992cb0ac4021962f8@sentry.io/1040940'; -const isDev = () => { - return fs.existsSync('.git'); -}; +// const isDev = () => { +// return fs.existsSync('.git'); +// }; -const shouldSendCallback = () => { - return !isDev() && crashReportsEnabled; -}; +// const shouldSendCallback = () => { +// return !isDev() && crashReportsEnabled; +// }; -ipcMain.on('settings.changed', function (event, settings) { - crashReportsEnabled = settings.crash_reports; -}); +// ipcMain.on('settings.changed', function (event, settings) { +// crashReportsEnabled = settings.crash_reports; +// }); -init({ - dsn: DSN, - shouldSendCallback: shouldSendCallback -}); +// init({ +// dsn: DSN, +// shouldSendCallback: shouldSendCallback +// }); diff --git a/yarn.lock b/yarn.lock index 53fcc639..5bffba41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -224,47 +224,84 @@ semver "^5.3.0" semver-intersect "^1.1.2" -"@sentry/browser@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-0.5.4.tgz#621ff972182b73b62856584b92fc65fde96904cc" +"@sentry/browser@4.0.0-beta.9": + version "4.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-4.0.0-beta.9.tgz#1ec41cdac2dfaf509651d9ffc41b25d9c009bce9" dependencies: - "@sentry/core" "0.5.4" - "@sentry/shim" "0.5.4" + "@sentry/core" "4.0.0-beta.9" + "@sentry/hub" "4.0.0-beta.9" + "@sentry/minimal" "4.0.0-beta.9" + "@sentry/types" "4.0.0-beta.9" + "@sentry/utils" "4.0.0-beta.9" -"@sentry/core@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-0.5.4.tgz#9b0a842b442131b3801bae70be2ca4e9c510574e" +"@sentry/core@4.0.0-beta.9": + version "4.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-4.0.0-beta.9.tgz#5b0f4f5693165731136d196cc6e011b555230f20" dependencies: - "@sentry/shim" "0.5.4" + "@sentry/hub" "4.0.0-beta.9" + "@sentry/minimal" "4.0.0-beta.9" + "@sentry/types" "4.0.0-beta.9" + "@sentry/utils" "4.0.0-beta.9" -"@sentry/electron@^0.5.5": - version "0.5.5" - resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-0.5.5.tgz#9089d6342db6c6bd6c092a53747708031d5fb7c3" +"@sentry/electron@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-0.7.0.tgz#ad456c3319c995d84a470304d9890803863587ac" dependencies: - "@sentry/browser" "0.5.4" - "@sentry/core" "0.5.4" - "@sentry/node" "0.5.4" - "@sentry/shim" "0.5.4" - "@sentry/utils" "0.5.4" + "@sentry/browser" "4.0.0-beta.9" + "@sentry/core" "4.0.0-beta.9" + "@sentry/hub" "4.0.0-beta.9" + "@sentry/minimal" "4.0.0-beta.9" + "@sentry/node" "4.0.0-beta.9" + "@sentry/types" "4.0.0-beta.9" + "@sentry/utils" "4.0.0-beta.9" electron-fetch "^1.1.0" form-data "^2.3.2" util.promisify "^1.0.0" -"@sentry/node@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-0.5.4.tgz#b3e7349d1b361239959036eaae19cebf3564c3d3" +"@sentry/hub@4.0.0-beta.9": + version "4.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-4.0.0-beta.9.tgz#a90d666a30d16e6e43b930b49bee46999dbd8a78" dependencies: - "@sentry/core" "0.5.4" - "@sentry/shim" "0.5.4" - raven "^2.6.0" + "@sentry/types" "4.0.0-beta.9" + "@sentry/utils" "4.0.0-beta.9" -"@sentry/shim@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@sentry/shim/-/shim-0.5.4.tgz#cb826b1a34765ae5e1b21e61df2def2f8da91dc1" +"@sentry/minimal@4.0.0-beta.9": + version "4.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-4.0.0-beta.9.tgz#d9b95e6586f1be30375c123c4a69b05e18af5669" + dependencies: + "@sentry/hub" "4.0.0-beta.9" + "@sentry/types" "4.0.0-beta.9" -"@sentry/utils@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-0.5.4.tgz#8ede78ace960216dd632fd561c83f50062e5aee1" +"@sentry/node@4.0.0-beta.9": + version "4.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-4.0.0-beta.9.tgz#4ba35faa585c17c24e6755f6607fde95e8516433" + dependencies: + "@sentry/core" "4.0.0-beta.9" + "@sentry/hub" "4.0.0-beta.9" + "@sentry/minimal" "4.0.0-beta.9" + "@sentry/types" "4.0.0-beta.9" + "@sentry/utils" "4.0.0-beta.9" + "@types/cookie" "0.3.1" + "@types/md5" "2.1.32" + "@types/stack-trace" "0.0.29" + cookie "0.3.1" + lsmod "1.0.0" + md5 "2.2.1" + stack-trace "0.0.10" + +"@sentry/types@4.0.0-beta.9": + version "4.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-4.0.0-beta.9.tgz#1a2f88bfcf62356372a60359b5204e94c079c27d" + +"@sentry/utils@4.0.0-beta.9": + version "4.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-4.0.0-beta.9.tgz#99c61c44280f36b557387d3d37d31240545a7700" + dependencies: + "@sentry/types" "4.0.0-beta.9" + +"@types/cookie@0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.1.tgz#720a756ea8e760a258708b52441bd341f1ef4296" "@types/d3-array@*", "@types/d3-array@1.2": version "1.2.1" @@ -439,10 +476,20 @@ dependencies: "@types/jasmine" "*" +"@types/md5@2.1.32": + version "2.1.32" + resolved "https://registry.yarnpkg.com/@types/md5/-/md5-2.1.32.tgz#93e23437fcd17a7b9ca98d02aa6002e835842fe8" + dependencies: + "@types/node" "*" + "@types/mousetrap@^1.6.0": version "1.6.0" resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.0.tgz#c3951ab98b88ff6093cd0b1e4f8591af439141b8" +"@types/node@*", "@types/node@~10.5.2": + version "10.5.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707" + "@types/node@^6.0.46": version "6.0.114" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.114.tgz#c42cd56479f32bc1576a5cb19f8a208da9a2b052" @@ -451,10 +498,6 @@ version "8.10.21" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.21.tgz#12b3f2359b27aa05a45d886c8ba1eb8d1a77e285" -"@types/node@~10.5.2": - version "10.5.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.2.tgz#f19f05314d5421fe37e74153254201a7bf00a707" - "@types/q@^0.0.32": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5" @@ -463,6 +506,10 @@ version "3.0.10" resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.10.tgz#e98cc6f05b4b436277671c784ee2f9d05a634f9b" +"@types/stack-trace@0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/stack-trace/-/stack-trace-0.0.29.tgz#eb7a7c60098edb35630ed900742a5ecb20cfcb4d" + "@webassemblyjs/ast@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a" @@ -5048,6 +5095,10 @@ lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2: pseudomap "^1.0.2" yallist "^2.1.2" +lsmod@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lsmod/-/lsmod-1.0.0.tgz#9a00f76dca36eb23fa05350afe1b585d4299e64b" + mailcomposer@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4" @@ -5108,7 +5159,7 @@ md5.js@^1.3.4: hash-base "^3.0.0" inherits "^2.0.1" -md5@^2.2.1: +md5@2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9" dependencies: @@ -6606,16 +6657,6 @@ raven-js@^3.24.1: version "3.26.3" resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.26.3.tgz#0efb49969b5b11ab965f7b0d6da4ca102b763cb0" -raven@^2.6.0: - version "2.6.3" - resolved "https://registry.yarnpkg.com/raven/-/raven-2.6.3.tgz#207475a12809277ef54eaceafe2597ff65262ab4" - dependencies: - cookie "0.3.1" - md5 "^2.2.1" - stack-trace "0.0.10" - timed-out "4.0.1" - uuid "3.0.0" - raw-body@2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89" @@ -7956,7 +7997,7 @@ thunky@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371" -timed-out@4.0.1, timed-out@^4.0.0: +timed-out@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" @@ -8385,10 +8426,6 @@ utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" -uuid@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.0.tgz#6728fc0459c450d796a99c31837569bdf672d728" - uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"