From d6ff53e0434d940537736f9605db5942f4324e16 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Thu, 17 Nov 2022 15:47:39 +0530 Subject: [PATCH] update sentry symbol js fix get electron version --- sentry-symbols.js | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/sentry-symbols.js b/sentry-symbols.js index 478d9caaa..955cda5f5 100644 --- a/sentry-symbols.js +++ b/sentry-symbols.js @@ -12,15 +12,13 @@ try { process.exit(1); } -const VERSION = /\bv?(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[\da-z-]+(?:\.[\da-z-]+)*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?\b/i; const SYMBOL_CACHE_FOLDER = '.electron-symbols'; -const package = require('./package.json'); const sentryCli = new SentryCli('./sentry.properties'); async function main() { - let version = getElectronVersion(); + const version = getElectronVersion(); if (!version) { - console.error('Cannot detect electron version, check package.json'); + console.error('Cannot detect electron version, check that electron is installed'); return; } @@ -68,20 +66,11 @@ async function main() { } function getElectronVersion() { - if (!package) { - return false; + try { + return require('electron/package.json').version; + } catch (error) { + return undefined; } - - let electronVersion = - (package.dependencies && package.dependencies.electron) || - (package.devDependencies && package.devDependencies.electron); - - if (!electronVersion) { - return false; - } - - const matches = VERSION.exec(electronVersion); - return matches ? matches[0] : false; } async function downloadSymbols(options) {