Skip to content

Commit

Permalink
chore: bump electron@13.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
deepak1556 committed Jun 29, 2021
1 parent a6494ee commit 886f0c2
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
disturl "https://electronjs.org/headers"
target "13.1.2"
target "13.1.4"
runtime "electron"
8 changes: 4 additions & 4 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "chromium",
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
"commitHash": "40b11e7395bc65181fbf3259b6a4514f6c6ab839"
"commitHash": "1b673f6c28b5095292d5b9cabb1d72cc8bee25fa"
}
},
"licenseDetail": [
Expand Down Expand Up @@ -40,7 +40,7 @@
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
],
"isOnlyProductionDependency": true,
"version": "91.0.4472.77"
"version": "91.0.4472.106"
},
{
"component": {
Expand All @@ -60,12 +60,12 @@
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
"commitHash": "839dcbbbdb98fae9b391ff0a948299a8503c5e49"
"commitHash": "9942b2ba8014f9025b4c8cb3e894476b58cc8f86"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
"version": "13.1.2"
"version": "13.1.4"
},
{
"component": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"cssnano": "^4.1.11",
"debounce": "^1.0.0",
"deemon": "^1.4.0",
"electron": "13.1.2",
"electron": "13.1.4",
"eslint": "6.8.0",
"eslint-plugin-jsdoc": "^19.1.0",
"event-stream": "3.3.4",
Expand Down
23 changes: 14 additions & 9 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,18 @@ const argvConfig = configureCommandlineSwitchesSync(args);

// Configure crash reporter
perf.mark('code/willStartCrashReporter');
configureCrashReporter();
// If a crash-reporter-directory is specified we store the crash reports
// in the specified directory and don't upload them to the crash server.
//
// Appcenter crash reporting is enabled if
// * enable-crash-reporter runtime argument is set to 'true'
// * --disable-crash-reporter command line parameter is not set
//
// Disable crash reporting in all other cases.
if (args['crash-reporter-directory'] ||
(argvConfig['enable-crash-reporter'] && !args['disable-crash-reporter'])) {
configureCrashReporter();
}
perf.mark('code/didStartCrashReporter');

// Set logs path before app 'ready' event if running portable
Expand Down Expand Up @@ -321,8 +332,6 @@ function getArgvConfigPath() {

function configureCrashReporter() {

// If a crash-reporter-directory is specified we store the crash reports
// in the specified directory and don't upload them to the crash server.
let crashReporterDirectory = args['crash-reporter-directory'];
let submitURL = '';
if (crashReporterDirectory) {
Expand Down Expand Up @@ -351,11 +360,7 @@ function configureCrashReporter() {
// Otherwise we configure the crash reporter from product.json
else {
const appCenter = product.appCenter;
// Disable Appcenter crash reporting if
// * --crash-reporter-directory is specified
// * enable-crash-reporter runtime argument is set to 'false'
// * --disable-crash-reporter command line parameter is set
if (appCenter && argvConfig['enable-crash-reporter'] && !args['disable-crash-reporter']) {
if (appCenter) {
const isWindows = (process.platform === 'win32');
const isLinux = (process.platform === 'linux');
const isDarwin = (process.platform === 'darwin');
Expand Down Expand Up @@ -414,7 +419,7 @@ function configureCrashReporter() {
companyName: companyName,
productName: process.env['VSCODE_DEV'] ? `${productName} Dev` : productName,
submitURL,
uploadToServer: !crashReporterDirectory,
uploadToServer: !crashReporterDirectory && !process.env['VSCODE_DEV'],
compress: true
});
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3039,10 +3039,10 @@ electron-to-chromium@^1.3.723:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.737.tgz#196f2e9656f4f3c31930750e1899c091b72d36b5"
integrity sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg==

electron@13.1.2:
version "13.1.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90"
integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g==
electron@13.1.4:
version "13.1.4"
resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz#6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b"
integrity sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^14.6.2"
Expand Down

0 comments on commit 886f0c2

Please sign in to comment.