diff --git a/desktop/src/main.ts b/desktop/src/main.ts index cb0d3f6e5b96fd570eca882f8cd009286f39c4d8..3644e3b249f7c8e5608bcecb1dcf1cf38f3d03da 100644 --- a/desktop/src/main.ts +++ b/desktop/src/main.ts @@ -8,12 +8,12 @@ * * https://www.electronjs.org/docs/latest/tutorial/process-model#the-main-process */ -import * as log from "electron-log"; +import log from "electron-log"; import { app, BrowserWindow } from "electron/main"; import serveNextAt from "next-electron-server"; import { existsSync } from "node:fs"; -import * as fs from "node:fs/promises"; -import * as path from "node:path"; +import fs from "node:fs/promises"; +import path from "node:path"; import { isDev } from "./main/general"; import { attachFSWatchIPCHandlers, attachIPCHandlers } from "./main/ipc"; import { logErrorSentry, setupLogging } from "./main/log"; diff --git a/desktop/src/main/dialogs.ts b/desktop/src/main/dialogs.ts index a4efed473a0ac7864f09e401cfad78d2e053655d..80813a78f5fdc92566a17c9d6fb34c2348e324ff 100644 --- a/desktop/src/main/dialogs.ts +++ b/desktop/src/main/dialogs.ts @@ -1,5 +1,5 @@ import { dialog } from "electron/main"; -import * as path from "node:path"; +import path from "node:path"; import { getDirFilePaths, getElectronFile } from "../services/fs"; import { getElectronFilesFromGoogleZip } from "../services/upload"; import type { ElectronFile } from "../types"; diff --git a/desktop/src/main/fs.ts b/desktop/src/main/fs.ts index f56e765c0b517fe597c28e41199396d4620857ea..cf34acb78266128f4d5cf5b7de4e125410ac10c2 100644 --- a/desktop/src/main/fs.ts +++ b/desktop/src/main/fs.ts @@ -2,8 +2,8 @@ * @file file system related functions exposed over the context bridge. */ import { createWriteStream, existsSync } from "node:fs"; -import * as fs from "node:fs/promises"; -import * as path from "node:path"; +import fs from "node:fs/promises"; +import path from "node:path"; import { Readable } from "node:stream"; import { logError } from "./log"; diff --git a/desktop/src/main/general.ts b/desktop/src/main/general.ts index a92656e31cc5a381e1b5a0a3d8bf67331ad33054..e0b7654fe136af66808f03644d0dbc10a05af434 100644 --- a/desktop/src/main/general.ts +++ b/desktop/src/main/general.ts @@ -1,6 +1,6 @@ import { shell } from "electron"; /* TODO(MR): Why is this not in /main? */ import { app } from "electron/main"; -import * as path from "node:path"; +import path from "node:path"; /** `true` if the app is running in development mode. */ export const isDev = !app.isPackaged; diff --git a/desktop/src/services/chokidar.ts b/desktop/src/services/chokidar.ts index 81107536e3662a2cdb2e428631d1188eab00e340..57a0e504ee53ede9ff7a039b2d35b560e7d73a1e 100644 --- a/desktop/src/services/chokidar.ts +++ b/desktop/src/services/chokidar.ts @@ -1,6 +1,6 @@ import chokidar from "chokidar"; import { BrowserWindow } from "electron"; -import * as path from "path"; +import path from "path"; import { logError } from "../main/log"; import { getWatchMappings } from "../services/watch"; import { getElectronFile } from "./fs"; diff --git a/desktop/src/services/clipService.ts b/desktop/src/services/clipService.ts index a01501d1f36981529b8d8fff80f3ed2c0f476c67..7874d56207dda0e7090a28d1e2a1cb20583956b6 100644 --- a/desktop/src/services/clipService.ts +++ b/desktop/src/services/clipService.ts @@ -1,8 +1,8 @@ -import * as log from "electron-log"; +import log from "electron-log"; import { app, net } from "electron/main"; import { existsSync } from "fs"; -import * as fs from "node:fs/promises"; -import * as path from "node:path"; +import fs from "node:fs/promises"; +import path from "node:path"; import util from "util"; import { CustomErrors } from "../constants/errors"; import { writeStream } from "../main/fs"; diff --git a/desktop/src/services/ffmpeg.ts b/desktop/src/services/ffmpeg.ts index 50fcfd54f05484651740b326756b21f4ba9e3703..b04c84c793e3dcc1bd2d82559cd18af960a28530 100644 --- a/desktop/src/services/ffmpeg.ts +++ b/desktop/src/services/ffmpeg.ts @@ -1,7 +1,7 @@ import log from "electron-log"; import pathToFfmpeg from "ffmpeg-static"; import { existsSync } from "node:fs"; -import * as fs from "node:fs/promises"; +import fs from "node:fs/promises"; import util from "util"; import { CustomErrors } from "../constants/errors"; import { writeStream } from "../main/fs"; diff --git a/desktop/src/services/fs.ts b/desktop/src/services/fs.ts index 6e4fff214c50606dbe8f4dc214f4a96a03f3925e..3b9a63802c05d98993e238dae44c818da674af9f 100644 --- a/desktop/src/services/fs.ts +++ b/desktop/src/services/fs.ts @@ -1,7 +1,7 @@ import StreamZip from "node-stream-zip"; import { existsSync } from "node:fs"; -import * as fs from "node:fs/promises"; -import * as path from "node:path"; +import fs from "node:fs/promises"; +import path from "node:path"; import { logError } from "../main/log"; import { ElectronFile } from "../types"; diff --git a/desktop/src/services/imageProcessor.ts b/desktop/src/services/imageProcessor.ts index a799ba83fc4a73204148cea8f5089e9469316e7b..1abc78451e949d83a9a535388b0ad3fa44a4f1cb 100644 --- a/desktop/src/services/imageProcessor.ts +++ b/desktop/src/services/imageProcessor.ts @@ -1,7 +1,7 @@ import { exec } from "child_process"; import log from "electron-log"; import { existsSync } from "fs"; -import * as fs from "node:fs/promises"; +import fs from "node:fs/promises"; import path from "path"; import util from "util"; import { CustomErrors } from "../constants/errors"; diff --git a/desktop/src/utils/createWindow.ts b/desktop/src/utils/createWindow.ts index 23dd5128c3c4b6fdb73f834654171fe5d924ea54..baebfed9868eea3e516432051c1925d5a61fdfd2 100644 --- a/desktop/src/utils/createWindow.ts +++ b/desktop/src/utils/createWindow.ts @@ -1,11 +1,11 @@ import { app, BrowserWindow, nativeImage } from "electron"; import ElectronLog from "electron-log"; -import * as path from "path"; +import path from "path"; import { isAppQuitting, rendererURL } from "../main"; -import autoLauncher from "../services/autoLauncher"; +import { isDev } from "../main/general"; import { logErrorSentry } from "../main/log"; +import autoLauncher from "../services/autoLauncher"; import { getHideDockIconPreference } from "../services/userPreference"; -import { isDev } from "../main/general"; import { isPlatform } from "./common/platform"; /** diff --git a/desktop/src/utils/temp.ts b/desktop/src/utils/temp.ts index 099e6b667497246ed2f4e08c9b1f18a11980ebe6..489e5cbd4748675e8972f87215e63ed42a5ea4a9 100644 --- a/desktop/src/utils/temp.ts +++ b/desktop/src/utils/temp.ts @@ -1,6 +1,6 @@ import { app } from "electron/main"; import { existsSync } from "node:fs"; -import * as fs from "node:fs/promises"; +import fs from "node:fs/promises"; import path from "path"; const CHARACTERS =