From 68ab7ea0ae825a0d87f21c1e1a9502cf2e14ff61 Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Sun, 20 Nov 2022 22:00:13 +0200 Subject: [PATCH 1/5] Store Expresslrs data in c:/.expresslrs due to the xtensa compiler issues when handling special character windows usernames in paths --- src/main.dev.ts | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main.dev.ts b/src/main.dev.ts index ef4713532..360d018cb 100644 --- a/src/main.dev.ts +++ b/src/main.dev.ts @@ -31,7 +31,15 @@ import { FirmwareParamsLoaderType } from './api/src/config'; import packageJson from '../package.json'; -const logsPath = path.join(app.getPath('userData'), 'logs'); +const isWindows = process.platform.startsWith('win'); +const isMacOS = process.platform.startsWith('darwin'); + +let userDataDirectory = app.getPath('userData'); +if (isWindows) { + userDataDirectory = path.join('c:', '.expresslrs'); +} + +const logsPath = path.join(userDataDirectory, 'logs'); const logsFilename = 'expressslrs-configurator.log'; const winstonLogger = winston.createLogger({ level: 'debug', @@ -142,9 +150,6 @@ const installExtensions = async () => { }); }; -const isWindows = process.platform.startsWith('win'); -const isMacOS = process.platform.startsWith('darwin'); - const createWindow = async () => { if ( process.env.NODE_ENV === 'development' || @@ -166,13 +171,9 @@ const createWindow = async () => { logger.log(`received unused port`, { port }); logger.log('starting server...'); - const firmwaresPath = path.join( - app.getPath('userData'), - 'firmwares', - 'github' - ); + const firmwaresPath = path.join(userDataDirectory, 'firmwares', 'github'); const targetsStoragePath = path.join( - app.getPath('userData'), + userDataDirectory, 'firmwares', 'targets' ); @@ -190,7 +191,7 @@ const createWindow = async () => { } const userDefinesStoragePath = path.join( - app.getPath('userData'), + userDataDirectory, 'firmwares', 'userDefines' ); @@ -209,13 +210,13 @@ const createWindow = async () => { const getPlatformioPath = path.join(dependenciesPath, 'get-platformio.py'); const platformioStateTempStoragePath = path.join( - app.getPath('userData'), + userDataDirectory, 'platformio-temp-state-storage' ); await mkdirp(firmwaresPath); const localApiServerEnv = process.env; - localApiServerEnv.PLATFORMIO_INSTALLER_TMPDIR = app.getPath('userData'); + localApiServerEnv.PLATFORMIO_INSTALLER_TMPDIR = userDataDirectory; /* We manually prepend $PATH on Windows and macOS machines with portable Git and Python locations. From d6a0e8c69177d91bae5041c59229bfed2ae4b72b Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Sun, 20 Nov 2022 22:14:06 +0200 Subject: [PATCH 2/5] graceful fallback to usual windows firmware path --- src/main.dev.ts | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main.dev.ts b/src/main.dev.ts index 360d018cb..0f9acc975 100644 --- a/src/main.dev.ts +++ b/src/main.dev.ts @@ -31,15 +31,7 @@ import { FirmwareParamsLoaderType } from './api/src/config'; import packageJson from '../package.json'; -const isWindows = process.platform.startsWith('win'); -const isMacOS = process.platform.startsWith('darwin'); - -let userDataDirectory = app.getPath('userData'); -if (isWindows) { - userDataDirectory = path.join('c:', '.expresslrs'); -} - -const logsPath = path.join(userDataDirectory, 'logs'); +const logsPath = path.join(app.getPath('userData'), 'logs'); const logsFilename = 'expressslrs-configurator.log'; const winstonLogger = winston.createLogger({ level: 'debug', @@ -70,6 +62,26 @@ logger.log('path', { PATH: process.env.PATH, }); +const isWindows = process.platform.startsWith('win'); +const isMacOS = process.platform.startsWith('darwin'); +let userDataDirectory = app.getPath('userData'); +if (isWindows) { + const dirtyUserDataDirectory = path.join('c:', '.expresslrs'); + try { + mkdirp.sync(dirtyUserDataDirectory); + userDataDirectory = dirtyUserDataDirectory; + logger.log('using c:/.expresslrs directory for firmware storage'); + } catch (err) { + logger.error( + 'failed to create c:/.expresslrs directory, will use usual path', + undefined, + { + err, + } + ); + } +} + // eslint-disable-next-line @typescript-eslint/ban-types const handleFatalError = (err: Error | object | null | undefined) => { logger.error(`handling fatal error: ${err}`); @@ -172,6 +184,7 @@ const createWindow = async () => { logger.log('starting server...'); const firmwaresPath = path.join(userDataDirectory, 'firmwares', 'github'); + await mkdirp(firmwaresPath); const targetsStoragePath = path.join( userDataDirectory, 'firmwares', @@ -214,7 +227,6 @@ const createWindow = async () => { 'platformio-temp-state-storage' ); - await mkdirp(firmwaresPath); const localApiServerEnv = process.env; localApiServerEnv.PLATFORMIO_INSTALLER_TMPDIR = userDataDirectory; From bc9e0940e17835ec9cbb64877020a139ef37ff0c Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Sun, 20 Nov 2022 22:48:37 +0200 Subject: [PATCH 3/5] Upgrade serialport --- src/package.json | 2 +- src/yarn.lock | 157 ++++++++++++++++++++++++++--------------------- 2 files changed, 88 insertions(+), 71 deletions(-) diff --git a/src/package.json b/src/package.json index 9922c0a5b..5d0520c37 100644 --- a/src/package.json +++ b/src/package.json @@ -15,6 +15,6 @@ }, "license": "GPL-3.0-or-later", "dependencies": { - "serialport": "^10.4.0" + "serialport": "^10.5.0" } } diff --git a/src/yarn.lock b/src/yarn.lock index 6a1bd926d..1b0dfa570 100644 --- a/src/yarn.lock +++ b/src/yarn.lock @@ -10,80 +10,97 @@ "@serialport/bindings-interface" "^1.2.1" debug "^4.3.3" -"@serialport/bindings-cpp@10.7.0": - version "10.7.0" - resolved "https://registry.yarnpkg.com/@serialport/bindings-cpp/-/bindings-cpp-10.7.0.tgz#9cf7dda78d914ba597933089abe2a8511e875851" - integrity sha512-Xx1wA2UCG2loS32hxNvWJI4smCzGKhWqE85//fLRzHoGgE1lSLe3Nk7W40/ebrlGFHWRbQZmeaIF4chb2XLliA== +"@serialport/bindings-cpp@10.8.0": + version "10.8.0" + resolved "https://registry.yarnpkg.com/@serialport/bindings-cpp/-/bindings-cpp-10.8.0.tgz#79507b57022ac264e963e7fbf3647a3821569a20" + integrity sha512-OMQNJz5kJblbmZN5UgJXLwi2XNtVLxSKmq5VyWuXQVsUIJD4l9UGHnLPqM5LD9u3HPZgDI5w7iYN7gxkQNZJUw== dependencies: - "@serialport/bindings-interface" "1.2.1" + "@serialport/bindings-interface" "1.2.2" "@serialport/parser-readline" "^10.2.1" debug "^4.3.2" - node-addon-api "^4.3.0" + node-addon-api "^5.0.0" node-gyp-build "^4.3.0" -"@serialport/bindings-interface@1.2.1", "@serialport/bindings-interface@^1.2.1": +"@serialport/bindings-interface@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz#c4ae9c1c85e26b02293f62f37435478d90baa460" + integrity sha512-CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA== + +"@serialport/bindings-interface@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@serialport/bindings-interface/-/bindings-interface-1.2.1.tgz#1ee80b0951ef4e4fd8a5a186621feff046aa2faf" integrity sha512-63Dyqz2gtryRDDckFusOYqLYhR3Hq/M4sEdbF9i/VsvDb6T+tNVgoAKUZ+FMrXXKnCSu+hYbk+MTc0XQANszxw== -"@serialport/parser-byte-length@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/parser-byte-length/-/parser-byte-length-10.3.0.tgz#c650b8883f716af77196e8466e86861b55290201" - integrity sha512-pJ/VoFemzKRRNDHLhFfPThwP40QrGaEnm9TtwL7o2GihEPwzBg3T0bN13ew5TpbbUYZdMpUtpm3CGfl6av9rUQ== +"@serialport/parser-byte-length@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-byte-length/-/parser-byte-length-10.5.0.tgz#f3d4c1c7923222df2f3d3c7c8aaaa207fe373b49" + integrity sha512-eHhr4lHKboq1OagyaXAqkemQ1XyoqbLQC8XJbvccm95o476TmEdW5d7AElwZV28kWprPW68ZXdGF2VXCkJgS2w== -"@serialport/parser-cctalk@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/parser-cctalk/-/parser-cctalk-10.3.0.tgz#d8fc7ab480910b28362b1ff154c01c170ac201a3" - integrity sha512-8ujmk8EvVbDPrNF4mM33bWvUYJOZ0wXbY3WCRazHRWvyCdL0VO0DQvW81ZqgoTpiDQZm5r8wQu9rmuemahF6vQ== +"@serialport/parser-cctalk@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-cctalk/-/parser-cctalk-10.5.0.tgz#0ee88db0768a361b7cfb9a394b74e480c38e1992" + integrity sha512-Iwsdr03xmCKAiibLSr7b3w6ZUTBNiS+PwbDQXdKU/clutXjuoex83XvsOtYVcNZmwJlVNhAUbkG+FJzWwIa4DA== "@serialport/parser-delimiter@10.3.0": version "10.3.0" resolved "https://registry.yarnpkg.com/@serialport/parser-delimiter/-/parser-delimiter-10.3.0.tgz#4bcbbeed7e3c6fed2c116535f0754bbf8a33f015" integrity sha512-9E4Vj6s0UbbcCCTclwegHGPYjJhdm9qLCS0lowXQDEQC5naZnbsELemMHs93nD9jHPcyx1B4oXkMnVZLxX5TYw== -"@serialport/parser-inter-byte-timeout@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-10.3.0.tgz#57e4fceeeeb13415dcded3ef1ba5d28a9fa0c611" - integrity sha512-wKP0QK85NHgvT6BBB1qBfKBBU4pf8kespNXAZBUYmFT+P4n8r8IZE2mqigCD+AiZcfWNQoAizwOsT/Jx/qeVig== - -"@serialport/parser-packet-length@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/parser-packet-length/-/parser-packet-length-10.3.0.tgz#9faefc91841c011925a6d4fa4fad6ed44bf11ed6" - integrity sha512-bj0cWzt8YSQj/E5fRQVYdi4TsfTlZQrXlXrUwjyTsCONv8IPOHzsz+yY0fw5SEMiJtaLyqvPkCHLsttOd/zFsg== +"@serialport/parser-delimiter@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-delimiter/-/parser-delimiter-10.5.0.tgz#b0d93100cdfd0619d020a427d652495073f3b828" + integrity sha512-/uR/yT3jmrcwnl2FJU/2ySvwgo5+XpksDUR4NF/nwTS5i3CcuKS+FKi/tLzy1k8F+rCx5JzpiK+koqPqOUWArA== + +"@serialport/parser-inter-byte-timeout@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-10.5.0.tgz#8665ee5e6138f794ac055e83ef2d1c3653a577c0" + integrity sha512-WPvVlSx98HmmUF9jjK6y9mMp3Wnv6JQA0cUxLeZBgS74TibOuYG3fuUxUWGJALgAXotOYMxfXSezJ/vSnQrkhQ== + +"@serialport/parser-packet-length@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-packet-length/-/parser-packet-length-10.5.0.tgz#4c4d733bdff8cc4749f2bd750e42e66f8f478def" + integrity sha512-jkpC/8w4/gUBRa2Teyn7URv1D7T//0lGj27/4u9AojpDVXsR6dtdcTG7b7dNirXDlOrSLvvN7aS5/GNaRlEByw== + +"@serialport/parser-readline@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-readline/-/parser-readline-10.5.0.tgz#df23365ae7f45679b1735deae26f72ba42802862" + integrity sha512-0aXJknodcl94W9zSjvU+sLdXiyEG2rqjQmvBWZCr8wJZjWEtv3RgrnYiWq4i2OTOyC8C/oPK8ZjpBjQptRsoJQ== + dependencies: + "@serialport/parser-delimiter" "10.5.0" -"@serialport/parser-readline@10.3.0", "@serialport/parser-readline@^10.2.1": +"@serialport/parser-readline@^10.2.1": version "10.3.0" resolved "https://registry.yarnpkg.com/@serialport/parser-readline/-/parser-readline-10.3.0.tgz#7db9143ce9a2537a4086b3824a70fe53ae2107b3" integrity sha512-ki3ATZ3/RAqnqGROBKE7k+OeZ0DZXZ53GTca4q71OU5RazbbNhTOBQLKLXD3v9QZXCMJdg4hGW/2Y0DuMUqMQg== dependencies: "@serialport/parser-delimiter" "10.3.0" -"@serialport/parser-ready@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/parser-ready/-/parser-ready-10.3.0.tgz#6a93d8970dc827e57829a9ee54802469be71f185" - integrity sha512-1owywJ4p592dJyVrEJZPIh6pUZ3/y/LN6kGTDH2wxdewRUITo/sGvDy0er5i2+dJD3yuowiAz0dOHSdz8tevJA== - -"@serialport/parser-regex@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/parser-regex/-/parser-regex-10.3.0.tgz#7c7314036535414bb7ada3520598d233f5ea09d0" - integrity sha512-tIogTs7CvTH+UUFnsvE7i33MSISyTPTGPWlglWYH2/5coipXY503jlaYS1YGe818wWNcSx6YAjMZRdhTWwM39w== - -"@serialport/parser-slip-encoder@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/parser-slip-encoder/-/parser-slip-encoder-10.3.0.tgz#ff01cd7cda2258ad2ca3ebb113145a0aa7272c78" - integrity sha512-JI0ILF5sylWn8f0MuMzHFBix/iMUTa79/Z95KaPZYnVaEdA7h7hh/o21Jmon/26P3RJwL1SNJCjZ81zfan+LtQ== - -"@serialport/parser-spacepacket@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/parser-spacepacket/-/parser-spacepacket-10.3.0.tgz#447d49b0690527ea770410ffe0a2ade2079ae7b2" - integrity sha512-PDF73ClEPsClD1FEJZHNuBevDKsJCkqy/XD5+S5eA6+tY5D4HLrVgSWsg+3qqB6+dlpwf2CzHe+uO8D3teuKHA== - -"@serialport/stream@10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@serialport/stream/-/stream-10.3.0.tgz#fdb13ed4487379615819203217060b114548c0a6" - integrity sha512-7sooi5fHogYNVEJwxVdg872xO6TuMgQd2E9iRmv+o8pk/1dbBnPkmH6Ka3st1mVE+0KnIJqVlgei+ncSsqXIGw== +"@serialport/parser-ready@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-ready/-/parser-ready-10.5.0.tgz#1d9029f57b1abd664cb468e21bfccf7b44c6e8ea" + integrity sha512-QIf65LTvUoxqWWHBpgYOL+soldLIIyD1bwuWelukem2yDZVWwEjR288cLQ558BgYxH4U+jLAQahhqoyN1I7BaA== + +"@serialport/parser-regex@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-regex/-/parser-regex-10.5.0.tgz#f98eab6e3d9bc99086269e9acf39a82db36d245f" + integrity sha512-9jnr9+PCxRoLjtGs7uxwsFqvho+rxuJlW6ZWSB7oqfzshEZWXtTJgJRgac/RuLft4hRlrmRz5XU40i3uoL4HKw== + +"@serialport/parser-slip-encoder@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-slip-encoder/-/parser-slip-encoder-10.5.0.tgz#cb79ac0fda1fc87f049690ff7b498c787da67991" + integrity sha512-wP8m+uXQdkWSa//3n+VvfjLthlabwd9NiG6kegf0fYweLWio8j4pJRL7t9eTh2Lbc7zdxuO0r8ducFzO0m8CQw== + +"@serialport/parser-spacepacket@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/parser-spacepacket/-/parser-spacepacket-10.5.0.tgz#2fc077c0ec16a9532c511ad5f2ab12d588796bc7" + integrity sha512-BEZ/HAEMwOd8xfuJSeI/823IR/jtnThovh7ils90rXD4DPL1ZmrP4abAIEktwe42RobZjIPfA4PaVfyO0Fjfhg== + +"@serialport/stream@10.5.0": + version "10.5.0" + resolved "https://registry.yarnpkg.com/@serialport/stream/-/stream-10.5.0.tgz#cda8fb3e8d03094b0962a3d14b73adfcd591be58" + integrity sha512-gbcUdvq9Kyv2HsnywS7QjnEB28g+6OGB5Z8TLP7X+UPpoMIWoUsoQIq5Kt0ZTgMoWn3JGM2lqwTsSHF+1qhniA== dependencies: - "@serialport/bindings-interface" "1.2.1" + "@serialport/bindings-interface" "1.2.2" debug "^4.3.2" debug@^4.3.2: @@ -105,32 +122,32 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -node-addon-api@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" - integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== +node-addon-api@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501" + integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA== node-gyp-build@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== -serialport@^10.4.0: - version "10.4.0" - resolved "https://registry.yarnpkg.com/serialport/-/serialport-10.4.0.tgz#93c95ecccc0e314d5bbee3f06cde2c70be70e671" - integrity sha512-PszPM5SnFMgSXom60PkKS2A9nMlNbHkuoyRBlzdSWw9rmgOn258+V0dYbWMrETJMM+TJV32vqBzjg5MmmUMwMw== +serialport@^10.5.0: + version "10.5.0" + resolved "https://registry.yarnpkg.com/serialport/-/serialport-10.5.0.tgz#b85f614def6e8914e5865c798b0555330903a0f8" + integrity sha512-7OYLDsu5i6bbv3lU81pGy076xe0JwpK6b49G6RjNvGibstUqQkI+I3/X491yBGtf4gaqUdOgoU1/5KZ/XxL4dw== dependencies: "@serialport/binding-mock" "10.2.2" - "@serialport/bindings-cpp" "10.7.0" - "@serialport/parser-byte-length" "10.3.0" - "@serialport/parser-cctalk" "10.3.0" - "@serialport/parser-delimiter" "10.3.0" - "@serialport/parser-inter-byte-timeout" "10.3.0" - "@serialport/parser-packet-length" "10.3.0" - "@serialport/parser-readline" "10.3.0" - "@serialport/parser-ready" "10.3.0" - "@serialport/parser-regex" "10.3.0" - "@serialport/parser-slip-encoder" "10.3.0" - "@serialport/parser-spacepacket" "10.3.0" - "@serialport/stream" "10.3.0" + "@serialport/bindings-cpp" "10.8.0" + "@serialport/parser-byte-length" "10.5.0" + "@serialport/parser-cctalk" "10.5.0" + "@serialport/parser-delimiter" "10.5.0" + "@serialport/parser-inter-byte-timeout" "10.5.0" + "@serialport/parser-packet-length" "10.5.0" + "@serialport/parser-readline" "10.5.0" + "@serialport/parser-ready" "10.5.0" + "@serialport/parser-regex" "10.5.0" + "@serialport/parser-slip-encoder" "10.5.0" + "@serialport/parser-spacepacket" "10.5.0" + "@serialport/stream" "10.5.0" debug "^4.3.3" From ec528bec743ed6f7ef576560b4d0fde878254286 Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Sun, 20 Nov 2022 23:00:54 +0200 Subject: [PATCH 4/5] upgrade electron --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5f487fff4..83069dc70 100644 --- a/package.json +++ b/package.json @@ -258,7 +258,7 @@ "css-loader": "^6.7.1", "css-minimizer-webpack-plugin": "^4.0.0", "detect-port": "^1.3.0", - "electron": "20.3.3", + "electron": "21.3.0", "electron-builder": "23.6.0", "electron-devtools-installer": "^3.2.0", "electron-notarize": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index bb6f6d1d7..bdcbd4c89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5760,10 +5760,10 @@ electron-updater@^5.3.0: semver "^7.3.5" typed-emitter "^2.1.0" -electron@20.3.3: - version "20.3.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-20.3.3.tgz#19dd8a02b333ad5d7bf3fa37cfd9382c28f8d5b5" - integrity sha512-6Cp3vMZGFEEtaIZrQ49iLqO2qogLWThlIYgH4a6dEl7xfaNQ6CjfXNBxFJRJTg7XRBFpeNtzuXkeGfNv9Kwfcg== +electron@21.3.0: + version "21.3.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-21.3.0.tgz#e9905e240add950443dc115b4be13d36162f0a05" + integrity sha512-MGRpshN8fBcx4IRuBABIsGDv0tB/MclIFsyFHFFXsBCUc+vIXaE/E6vuWaniGIFSz5WyeuapfTH5IeRb+7yIfw== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" From de3d8b72fe1b480d123f6c58d570ad96dd0432e2 Mon Sep 17 00:00:00 2001 From: Julius Jurgelenas Date: Sun, 20 Nov 2022 23:17:18 +0200 Subject: [PATCH 5/5] Revert "upgrade electron" This reverts commit ec528bec743ed6f7ef576560b4d0fde878254286. --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 83069dc70..5f487fff4 100644 --- a/package.json +++ b/package.json @@ -258,7 +258,7 @@ "css-loader": "^6.7.1", "css-minimizer-webpack-plugin": "^4.0.0", "detect-port": "^1.3.0", - "electron": "21.3.0", + "electron": "20.3.3", "electron-builder": "23.6.0", "electron-devtools-installer": "^3.2.0", "electron-notarize": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index bdcbd4c89..bb6f6d1d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5760,10 +5760,10 @@ electron-updater@^5.3.0: semver "^7.3.5" typed-emitter "^2.1.0" -electron@21.3.0: - version "21.3.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-21.3.0.tgz#e9905e240add950443dc115b4be13d36162f0a05" - integrity sha512-MGRpshN8fBcx4IRuBABIsGDv0tB/MclIFsyFHFFXsBCUc+vIXaE/E6vuWaniGIFSz5WyeuapfTH5IeRb+7yIfw== +electron@20.3.3: + version "20.3.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-20.3.3.tgz#19dd8a02b333ad5d7bf3fa37cfd9382c28f8d5b5" + integrity sha512-6Cp3vMZGFEEtaIZrQ49iLqO2qogLWThlIYgH4a6dEl7xfaNQ6CjfXNBxFJRJTg7XRBFpeNtzuXkeGfNv9Kwfcg== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26"