diff options
| author | Oskar <oskar@mullvad.net> | 2024-09-20 16:29:26 +0200 |
|---|---|---|
| committer | Oskar <oskar@mullvad.net> | 2024-09-24 13:18:18 +0200 |
| commit | 4bb25616f02af4e15b0140767c07b61e49e8aa83 (patch) | |
| tree | ed5371911d23ba2bab8e701f351d822202d63d57 /gui/src/main | |
| parent | 659aa11f05ae2b278eef6ab0ef5bc537e756109a (diff) | |
| download | mullvadvpn-4bb25616f02af4e15b0140767c07b61e49e8aa83.tar.xz mullvadvpn-4bb25616f02af4e15b0140767c07b61e49e8aa83.zip | |
Fix linting errors
Diffstat (limited to 'gui/src/main')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 2 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 5 | ||||
| -rw-r--r-- | gui/src/main/linux-desktop-entry.ts | 1 | ||||
| -rw-r--r-- | gui/src/main/linux-split-tunneling.ts | 4 | ||||
| -rw-r--r-- | gui/src/main/logging.ts | 2 | ||||
| -rw-r--r-- | gui/src/main/user-interface.ts | 2 | ||||
| -rw-r--r-- | gui/src/main/windows-split-tunneling.ts | 2 |
7 files changed, 8 insertions, 10 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 31f6ddcfab..1c96be12bb 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -791,7 +791,6 @@ export class DaemonRpc { } private channelOptions(): grpc.ClientOptions { - /* eslint-disable @typescript-eslint/naming-convention */ return { 'grpc.max_reconnect_backoff_ms': 3000, 'grpc.initial_reconnect_backoff_ms': 3000, @@ -799,7 +798,6 @@ export class DaemonRpc { 'grpc.keepalive_timeout_ms': Math.pow(2, 30), 'grpc.client_idle_timeout_ms': Math.pow(2, 30), }; - /* eslint-enable @typescript-eslint/naming-convention */ } private connectivityChangeCallback(timeoutErr?: Error) { diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index c5144ee99e..be6c6609a0 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -70,6 +70,7 @@ import Version, { GUI_VERSION } from './version'; const execAsync = util.promisify(exec); // Only import split tunneling library on correct OS. +// eslint-disable-next-line @typescript-eslint/no-require-imports const linuxSplitTunneling = process.platform === 'linux' && require('./linux-split-tunneling'); // This is used on Windows and macOS and will be undefined on Linux. const splitTunneling: ISplitTunnelingAppListRetriever | undefined = importSplitTunneling(); @@ -1115,11 +1116,11 @@ class ApplicationMain function importSplitTunneling() { if (process.platform === 'win32') { - // eslint-disable-next-line @typescript-eslint/no-var-requires + // eslint-disable-next-line @typescript-eslint/no-require-imports const { WindowsSplitTunnelingAppListRetriever } = require('./windows-split-tunneling'); return new WindowsSplitTunnelingAppListRetriever(); } else if (process.platform === 'darwin') { - // eslint-disable-next-line @typescript-eslint/no-var-requires + // eslint-disable-next-line @typescript-eslint/no-require-imports const { MacOsSplitTunnelingAppListRetriever } = require('./macos-split-tunneling'); return new MacOsSplitTunnelingAppListRetriever(); } diff --git a/gui/src/main/linux-desktop-entry.ts b/gui/src/main/linux-desktop-entry.ts index d6c11c7943..7cc46862a5 100644 --- a/gui/src/main/linux-desktop-entry.ts +++ b/gui/src/main/linux-desktop-entry.ts @@ -265,7 +265,6 @@ function getGtkThemeDirectories(): Promise<DirectoryDescription[]> { process.env.ORIGINAL_XDG_CURRENT_DESKTOP ?? process.env.XDG_CURRENT_DESKTOP ?? ''; child_process.exec( 'gsettings get org.gnome.desktop.interface icon-theme', - // eslint-disable-next-line @typescript-eslint/naming-convention { env: { XDG_CURRENT_DESKTOP: xdgCurrentDesktop } }, (error, stdout) => { if (error) { diff --git a/gui/src/main/linux-split-tunneling.ts b/gui/src/main/linux-split-tunneling.ts index 3ae1a15390..6d690aa453 100644 --- a/gui/src/main/linux-split-tunneling.ts +++ b/gui/src/main/linux-split-tunneling.ts @@ -113,7 +113,7 @@ export async function getApplications(locale: string): Promise<ILinuxSplitTunnel for (const entryPath of desktopEntryPaths) { try { desktopEntries.push(await readDesktopEntry(entryPath, locale)); - } catch (e) { + } catch { // no-op } } @@ -141,7 +141,7 @@ async function replaceIconNameWithDataUrl( } return { ...app, icon: await getImageDataUrl(iconPath) }; - } catch (e) { + } catch { return app; } } diff --git a/gui/src/main/logging.ts b/gui/src/main/logging.ts index f71e3a62f0..a1942d5007 100644 --- a/gui/src/main/logging.ts +++ b/gui/src/main/logging.ts @@ -113,7 +113,7 @@ function fileExists(filePath: string): boolean { try { fs.accessSync(filePath); return true; - } catch (e) { + } catch { return false; } } diff --git a/gui/src/main/user-interface.ts b/gui/src/main/user-interface.ts index a0b4662c48..f7b81247ff 100644 --- a/gui/src/main/user-interface.ts +++ b/gui/src/main/user-interface.ts @@ -494,7 +494,7 @@ export default class UserInterface implements WindowControllerDelegate { return; } - // eslint-disable-next-line @typescript-eslint/no-var-requires + // eslint-disable-next-line @typescript-eslint/no-require-imports const { NSEventMonitor, NSEventMask } = require('nseventmonitor'); const macEventMonitor = new NSEventMonitor(); const eventMask = NSEventMask.leftMouseDown | NSEventMask.rightMouseDown; diff --git a/gui/src/main/windows-split-tunneling.ts b/gui/src/main/windows-split-tunneling.ts index 5ba594f7cc..7ae73827d0 100644 --- a/gui/src/main/windows-split-tunneling.ts +++ b/gui/src/main/windows-split-tunneling.ts @@ -288,7 +288,7 @@ export class WindowsSplitTunnelingAppListRetriever implements ISplitTunnelingApp let fileHandle: fs.promises.FileHandle; try { fileHandle = await fs.promises.open(path, fs.constants.O_RDONLY); - } catch (e) { + } catch { return false; } |
