diff --git a/src/services/appUpdater.ts b/src/services/appUpdater.ts index 84a2bfeba..99ecef8b9 100644 --- a/src/services/appUpdater.ts +++ b/src/services/appUpdater.ts @@ -12,7 +12,7 @@ import { import fetch from 'node-fetch'; import { logErrorSentry } from './sentry'; import ElectronLog from 'electron-log'; -import { isPlatform } from '../utils/main'; +import { isPlatform } from '../utils/common/platform'; const FIVE_MIN_IN_MICROSECOND = 5 * 60 * 1000; const ONE_DAY_IN_MICROSECOND = 1 * 24 * 60 * 60 * 1000; diff --git a/src/services/autoLauncher.ts b/src/services/autoLauncher.ts index c28eb177c..139d5166c 100644 --- a/src/services/autoLauncher.ts +++ b/src/services/autoLauncher.ts @@ -1,4 +1,4 @@ -import { isPlatform } from '../utils/main'; +import { isPlatform } from '../utils/common/platform'; import { AutoLauncherClient } from '../types/autoLauncher'; import linuxAutoLauncher from './autoLauncherClients/linuxAutoLauncher'; import macAndWindowsAutoLauncher from './autoLauncherClients/macAndWindowsAutoLauncher'; diff --git a/src/utils/common.ts b/src/utils/common/index.ts similarity index 100% rename from src/utils/common.ts rename to src/utils/common/index.ts diff --git a/src/utils/common/platform.ts b/src/utils/common/platform.ts new file mode 100644 index 000000000..2ee705d5f --- /dev/null +++ b/src/utils/common/platform.ts @@ -0,0 +1,11 @@ +export function isPlatform(platform: 'mac' | 'windows' | 'linux') { + if (process.platform === 'darwin') { + return platform === 'mac'; + } else if (process.platform === 'win32') { + return platform === 'windows'; + } else if (process.platform === 'linux') { + return platform === 'linux'; + } else { + return false; + } +} diff --git a/src/utils/createWindow.ts b/src/utils/createWindow.ts index db356d467..d2e02dffd 100644 --- a/src/utils/createWindow.ts +++ b/src/utils/createWindow.ts @@ -3,7 +3,7 @@ import * as path from 'path'; import { isDev } from './common'; import { isAppQuitting } from '../main'; import { PROD_HOST_URL } from '../config'; -import { isPlatform } from './main'; +import { isPlatform } from './common/platform'; import { getHideDockIconPreference } from '../services/userPreference'; import autoLauncher from '../services/autoLauncher'; diff --git a/src/utils/main.ts b/src/utils/main.ts index 81fedbf7a..729bc3d3b 100644 --- a/src/utils/main.ts +++ b/src/utils/main.ts @@ -11,6 +11,7 @@ import { getHideDockIconPreference } from '../services/userPreference'; import { setupAutoUpdater } from '../services/appUpdater'; import ElectronLog from 'electron-log'; import os from 'os'; +import { isPlatform } from './common/platform'; export function handleUpdates(mainWindow: BrowserWindow) { if (!isDev) { @@ -84,18 +85,6 @@ export function setupNextElectronServe() { }); } -export function isPlatform(platform: 'mac' | 'windows' | 'linux') { - if (process.platform === 'darwin') { - return platform === 'mac'; - } else if (process.platform === 'win32') { - return platform === 'windows'; - } else if (process.platform === 'linux') { - return platform === 'linux'; - } else { - return false; - } -} - export async function handleDockIconHideOnAutoLaunch() { const shouldHideDockIcon = getHideDockIconPreference(); const wasAutoLaunched = await autoLauncher.wasAutoLaunched(); diff --git a/src/utils/menu.ts b/src/utils/menu.ts index 5002a1205..6ecb8459b 100644 --- a/src/utils/menu.ts +++ b/src/utils/menu.ts @@ -11,7 +11,7 @@ import { } from '../services/userPreference'; import { setIsAppQuitting } from '../main'; import autoLauncher from '../services/autoLauncher'; -import { isPlatform } from './main'; +import { isPlatform } from './common/platform'; import ElectronLog from 'electron-log'; export function buildContextMenu(