diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/services/content/ServiceWebview.tsx | 2 | ||||
-rw-r--r-- | src/electron/exception.ts | 1 | ||||
-rw-r--r-- | src/electron/ipc-api/appIndicator.ts | 2 | ||||
-rw-r--r-- | src/electron/ipc-api/download.ts | 2 | ||||
-rw-r--r-- | src/electron/ipc-api/localServer.ts | 2 | ||||
-rw-r--r-- | src/electron/macOSPermissions.ts | 2 | ||||
-rw-r--r-- | src/index.ts | 4 | ||||
-rw-r--r-- | src/internal-server/app/Controllers/Http/UserController.js | 2 | ||||
-rw-r--r-- | src/internal-server/app/ImageHelper.js | 2 | ||||
-rw-r--r-- | src/internal-server/start.ts | 2 | ||||
-rw-r--r-- | src/lib/Menu.ts | 2 | ||||
-rw-r--r-- | src/lib/Tray.ts | 2 | ||||
-rw-r--r-- | src/models/Recipe.ts | 2 | ||||
-rw-r--r-- | src/models/Service.ts | 2 | ||||
-rw-r--r-- | src/preload-safe-debug.ts | 2 | ||||
-rw-r--r-- | src/stores/AppStore.ts | 2 | ||||
-rw-r--r-- | src/stores/RecipesStore.ts | 4 | ||||
-rw-r--r-- | src/stores/ServicesStore.ts | 2 | ||||
-rw-r--r-- | src/webview/recipe.ts | 4 |
19 files changed, 21 insertions, 22 deletions
diff --git a/src/components/services/content/ServiceWebview.tsx b/src/components/services/content/ServiceWebview.tsx index 50b5d478f..c598d4be6 100644 --- a/src/components/services/content/ServiceWebview.tsx +++ b/src/components/services/content/ServiceWebview.tsx | |||
@@ -1,8 +1,8 @@ | |||
1 | import { join } from 'node:path'; | ||
1 | import { Component, ReactElement } from 'react'; | 2 | import { Component, ReactElement } from 'react'; |
2 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
3 | import { action, makeObservable, observable, reaction } from 'mobx'; | 4 | import { action, makeObservable, observable, reaction } from 'mobx'; |
4 | import ElectronWebView from 'react-electron-web-view'; | 5 | import ElectronWebView from 'react-electron-web-view'; |
5 | import { join } from 'node:path'; | ||
6 | import ServiceModel from '../../../models/Service'; | 6 | import ServiceModel from '../../../models/Service'; |
7 | 7 | ||
8 | const debug = require('../../../preload-safe-debug')('Ferdium:Services'); | 8 | const debug = require('../../../preload-safe-debug')('Ferdium:Services'); |
diff --git a/src/electron/exception.ts b/src/electron/exception.ts index a445a6475..ada98d17b 100644 --- a/src/electron/exception.ts +++ b/src/electron/exception.ts | |||
@@ -1,4 +1,3 @@ | |||
1 | // eslint-disable-next-line unicorn/no-empty-file | ||
2 | process.on('uncaughtException', err => { | 1 | process.on('uncaughtException', err => { |
3 | // handle the error safely | 2 | // handle the error safely |
4 | console.error(err); | 3 | console.error(err); |
diff --git a/src/electron/ipc-api/appIndicator.ts b/src/electron/ipc-api/appIndicator.ts index c3232d89f..f4a5ba480 100644 --- a/src/electron/ipc-api/appIndicator.ts +++ b/src/electron/ipc-api/appIndicator.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { app, ipcMain, BrowserWindow } from 'electron'; | ||
2 | import { join } from 'node:path'; | 1 | import { join } from 'node:path'; |
2 | import { app, ipcMain, BrowserWindow } from 'electron'; | ||
3 | import { autorun } from 'mobx'; | 3 | import { autorun } from 'mobx'; |
4 | import { isMac, isWindows, isLinux } from '../../environment'; | 4 | import { isMac, isWindows, isLinux } from '../../environment'; |
5 | import TrayIcon from '../../lib/Tray'; | 5 | import TrayIcon from '../../lib/Tray'; |
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts index 0c7e022d4..44eec9fc1 100644 --- a/src/electron/ipc-api/download.ts +++ b/src/electron/ipc-api/download.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { PathLike } from 'node:fs'; | ||
1 | import { ipcMain, dialog, BrowserWindow } from 'electron'; | 2 | import { ipcMain, dialog, BrowserWindow } from 'electron'; |
2 | import { download } from 'electron-dl'; | 3 | import { download } from 'electron-dl'; |
3 | import { writeFileSync } from 'fs-extra'; | 4 | import { writeFileSync } from 'fs-extra'; |
4 | import { PathLike } from 'node:fs'; | ||
5 | 5 | ||
6 | const debug = require('../../preload-safe-debug')('Ferdium:ipcApi:download'); | 6 | const debug = require('../../preload-safe-debug')('Ferdium:ipcApi:download'); |
7 | 7 | ||
diff --git a/src/electron/ipc-api/localServer.ts b/src/electron/ipc-api/localServer.ts index 5fdfad32c..bcc2f9d78 100644 --- a/src/electron/ipc-api/localServer.ts +++ b/src/electron/ipc-api/localServer.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { randomBytes } from 'node:crypto'; | 1 | import { randomBytes } from 'node:crypto'; |
2 | import { ipcMain, BrowserWindow } from 'electron'; | ||
3 | import { createServer } from 'node:net'; | 2 | import { createServer } from 'node:net'; |
3 | import { ipcMain, BrowserWindow } from 'electron'; | ||
4 | import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config'; | 4 | import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config'; |
5 | import { userDataPath } from '../../environment-remote'; | 5 | import { userDataPath } from '../../environment-remote'; |
6 | import { server } from '../../internal-server/start'; | 6 | import { server } from '../../internal-server/start'; |
diff --git a/src/electron/macOSPermissions.ts b/src/electron/macOSPermissions.ts index 90056f59c..2ad3d6cd0 100644 --- a/src/electron/macOSPermissions.ts +++ b/src/electron/macOSPermissions.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { dirname } from 'node:path'; | ||
1 | import { systemPreferences, BrowserWindow, dialog } from 'electron'; | 2 | import { systemPreferences, BrowserWindow, dialog } from 'electron'; |
2 | import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra'; | 3 | import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra'; |
3 | import macosVersion from 'macos-version'; | 4 | import macosVersion from 'macos-version'; |
4 | import { dirname } from 'node:path'; | ||
5 | // eslint-disable-next-line @typescript-eslint/ban-ts-comment, @typescript-eslint/prefer-ts-expect-error | 5 | // eslint-disable-next-line @typescript-eslint/ban-ts-comment, @typescript-eslint/prefer-ts-expect-error |
6 | // @ts-ignore | 6 | // @ts-ignore |
7 | import { askForScreenCaptureAccess } from 'node-mac-permissions'; | 7 | import { askForScreenCaptureAccess } from 'node-mac-permissions'; |
diff --git a/src/index.ts b/src/index.ts index e76298dec..cbc10bdbe 100644 --- a/src/index.ts +++ b/src/index.ts | |||
@@ -1,5 +1,7 @@ | |||
1 | /* eslint-disable import/first */ | 1 | /* eslint-disable import/first */ |
2 | 2 | ||
3 | import { join } from 'node:path'; | ||
4 | import { EventEmitter } from 'node:events'; | ||
3 | import { | 5 | import { |
4 | app, | 6 | app, |
5 | BrowserWindow, | 7 | BrowserWindow, |
@@ -11,11 +13,9 @@ import { | |||
11 | } from 'electron'; | 13 | } from 'electron'; |
12 | 14 | ||
13 | import { emptyDirSync, ensureFileSync } from 'fs-extra'; | 15 | import { emptyDirSync, ensureFileSync } from 'fs-extra'; |
14 | import { join } from 'node:path'; | ||
15 | import windowStateKeeper from 'electron-window-state'; | 16 | import windowStateKeeper from 'electron-window-state'; |
16 | import minimist from 'minimist'; | 17 | import minimist from 'minimist'; |
17 | import ms from 'ms'; | 18 | import ms from 'ms'; |
18 | import { EventEmitter } from 'node:events'; | ||
19 | import { initialize } from 'electron-react-titlebar/main'; | 19 | import { initialize } from 'electron-react-titlebar/main'; |
20 | import { enableWebContents, initializeRemote } from './electron-util'; | 20 | import { enableWebContents, initializeRemote } from './electron-util'; |
21 | import enforceMacOSAppLocation from './enforce-macos-app-location'; | 21 | import enforceMacOSAppLocation from './enforce-macos-app-location'; |
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js index 89ccd1549..d0c4d73b7 100644 --- a/src/internal-server/app/Controllers/Http/UserController.js +++ b/src/internal-server/app/Controllers/Http/UserController.js | |||
@@ -4,9 +4,9 @@ const Service = use('App/Models/Service'); | |||
4 | const Workspace = use('App/Models/Workspace'); | 4 | const Workspace = use('App/Models/Workspace'); |
5 | const { validateAll } = use('Validator'); | 5 | const { validateAll } = use('Validator'); |
6 | 6 | ||
7 | const crypto = require('node:crypto'); | ||
7 | const fetch = require('node-fetch'); | 8 | const fetch = require('node-fetch'); |
8 | const { v4: uuid } = require('uuid'); | 9 | const { v4: uuid } = require('uuid'); |
9 | const crypto = require('node:crypto'); | ||
10 | const { DEFAULT_APP_SETTINGS } = require('../../../../config'); | 10 | const { DEFAULT_APP_SETTINGS } = require('../../../../config'); |
11 | const { convertToJSON } = require('../../../../jsUtils'); | 11 | const { convertToJSON } = require('../../../../jsUtils'); |
12 | const { API_VERSION } = require('../../../../environment-remote'); | 12 | const { API_VERSION } = require('../../../../environment-remote'); |
diff --git a/src/internal-server/app/ImageHelper.js b/src/internal-server/app/ImageHelper.js index b24a97836..222df6f07 100644 --- a/src/internal-server/app/ImageHelper.js +++ b/src/internal-server/app/ImageHelper.js | |||
@@ -1,8 +1,8 @@ | |||
1 | const Env = use('Env'); | 1 | const Env = use('Env'); |
2 | 2 | ||
3 | const path = require('node:path'); | ||
3 | const { v4: uuid } = require('uuid'); | 4 | const { v4: uuid } = require('uuid'); |
4 | 5 | ||
5 | const path = require('node:path'); | ||
6 | const fs = require('fs-extra'); | 6 | const fs = require('fs-extra'); |
7 | const { API_VERSION } = require('../../environment-remote'); | 7 | const { API_VERSION } = require('../../environment-remote'); |
8 | 8 | ||
diff --git a/src/internal-server/start.ts b/src/internal-server/start.ts index b6ee65986..bcd3ee3a1 100644 --- a/src/internal-server/start.ts +++ b/src/internal-server/start.ts | |||
@@ -15,10 +15,10 @@ | |||
15 | | Make sure to pass a relative path from the project root. | 15 | | Make sure to pass a relative path from the project root. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | import { join } from 'node:path'; | ||
18 | import fold from '@adonisjs/fold'; | 19 | import fold from '@adonisjs/fold'; |
19 | import { Ignitor, hooks } from '@adonisjs/ignitor'; | 20 | import { Ignitor, hooks } from '@adonisjs/ignitor'; |
20 | import { readFile, stat, chmod, writeFile } from 'fs-extra'; | 21 | import { readFile, stat, chmod, writeFile } from 'fs-extra'; |
21 | import { join } from 'node:path'; | ||
22 | import { LOCAL_HOSTNAME } from '../config'; | 22 | import { LOCAL_HOSTNAME } from '../config'; |
23 | import { isWindows } from '../environment'; | 23 | import { isWindows } from '../environment'; |
24 | 24 | ||
diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts index 08ad9dabe..a90fd8bea 100644 --- a/src/lib/Menu.ts +++ b/src/lib/Menu.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import os from 'node:os'; | ||
1 | import { clipboard, MenuItemConstructorOptions } from 'electron'; | 2 | import { clipboard, MenuItemConstructorOptions } from 'electron'; |
2 | import { | 3 | import { |
3 | app, | 4 | app, |
@@ -12,7 +13,6 @@ import { defineMessages, IntlShape } from 'react-intl'; | |||
12 | import osName from 'os-name'; | 13 | import osName from 'os-name'; |
13 | import { fromJS } from 'immutable'; | 14 | import { fromJS } from 'immutable'; |
14 | import semver from 'semver'; | 15 | import semver from 'semver'; |
15 | import os from 'node:os'; | ||
16 | import { | 16 | import { |
17 | isWindows, | 17 | isWindows, |
18 | cmdOrCtrlShortcutKey, | 18 | cmdOrCtrlShortcutKey, |
diff --git a/src/lib/Tray.ts b/src/lib/Tray.ts index 0d567fc13..c8f113346 100644 --- a/src/lib/Tray.ts +++ b/src/lib/Tray.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import { join } from 'node:path'; | ||
1 | import { | 2 | import { |
2 | app, | 3 | app, |
3 | Menu, | 4 | Menu, |
@@ -9,7 +10,6 @@ import { | |||
9 | BrowserWindow, | 10 | BrowserWindow, |
10 | NativeImage, | 11 | NativeImage, |
11 | } from 'electron'; | 12 | } from 'electron'; |
12 | import { join } from 'node:path'; | ||
13 | import macosVersion from 'macos-version'; | 13 | import macosVersion from 'macos-version'; |
14 | import { isMac, isWindows, isLinux } from '../environment'; | 14 | import { isMac, isWindows, isLinux } from '../environment'; |
15 | 15 | ||
diff --git a/src/models/Recipe.ts b/src/models/Recipe.ts index a6d2fd86d..53d6c4b89 100644 --- a/src/models/Recipe.ts +++ b/src/models/Recipe.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { join } from 'node:path'; | ||
1 | import semver from 'semver'; | 2 | import semver from 'semver'; |
2 | import { pathExistsSync } from 'fs-extra'; | 3 | import { pathExistsSync } from 'fs-extra'; |
3 | import { join } from 'node:path'; | ||
4 | import { DEFAULT_SERVICE_SETTINGS } from '../config'; | 4 | import { DEFAULT_SERVICE_SETTINGS } from '../config'; |
5 | import { ifUndefined } from '../jsUtils'; | 5 | import { ifUndefined } from '../jsUtils'; |
6 | 6 | ||
diff --git a/src/models/Service.ts b/src/models/Service.ts index 4a9fcf4fb..265b3e13c 100644 --- a/src/models/Service.ts +++ b/src/models/Service.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { join } from 'node:path'; | ||
1 | import { autorun, action, computed, makeObservable, observable } from 'mobx'; | 2 | import { autorun, action, computed, makeObservable, observable } from 'mobx'; |
2 | import { ipcRenderer } from 'electron'; | 3 | import { ipcRenderer } from 'electron'; |
3 | import { webContents } from '@electron/remote'; | 4 | import { webContents } from '@electron/remote'; |
4 | import { join } from 'node:path'; | ||
5 | import ElectronWebView from 'react-electron-web-view'; | 5 | import ElectronWebView from 'react-electron-web-view'; |
6 | 6 | ||
7 | import { todosStore } from '../features/todos'; | 7 | import { todosStore } from '../features/todos'; |
diff --git a/src/preload-safe-debug.ts b/src/preload-safe-debug.ts index 471ae1a1f..905140306 100644 --- a/src/preload-safe-debug.ts +++ b/src/preload-safe-debug.ts | |||
@@ -8,7 +8,7 @@ | |||
8 | * We disable the `debug` package in context isolated renderers, | 8 | * We disable the `debug` package in context isolated renderers, |
9 | * because they correspond to preload scripts. | 9 | * because they correspond to preload scripts. |
10 | */ | 10 | */ |
11 | // eslint-disable-next-line unicorn/no-empty-file | 11 | |
12 | module.exports = function debug(namespace: string): (...params: any[]) => void { | 12 | module.exports = function debug(namespace: string): (...params: any[]) => void { |
13 | if ( | 13 | if ( |
14 | typeof process === 'object' && | 14 | typeof process === 'object' && |
diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts index 0bf845e4d..b317d99fc 100644 --- a/src/stores/AppStore.ts +++ b/src/stores/AppStore.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import { URL } from 'node:url'; | ||
1 | import { ipcRenderer } from 'electron'; | 2 | import { ipcRenderer } from 'electron'; |
2 | import { | 3 | import { |
3 | app, | 4 | app, |
@@ -11,7 +12,6 @@ import { action, computed, makeObservable, observable } from 'mobx'; | |||
11 | import moment from 'moment'; | 12 | import moment from 'moment'; |
12 | import AutoLaunch from 'auto-launch'; | 13 | import AutoLaunch from 'auto-launch'; |
13 | import ms from 'ms'; | 14 | import ms from 'ms'; |
14 | import { URL } from 'node:url'; | ||
15 | import { readJsonSync } from 'fs-extra'; | 15 | import { readJsonSync } from 'fs-extra'; |
16 | 16 | ||
17 | import { Stores } from '../@types/stores.types'; | 17 | import { Stores } from '../@types/stores.types'; |
diff --git a/src/stores/RecipesStore.ts b/src/stores/RecipesStore.ts index b645a5989..9b5565dcf 100644 --- a/src/stores/RecipesStore.ts +++ b/src/stores/RecipesStore.ts | |||
@@ -158,8 +158,8 @@ export default class RecipesStore extends TypedStore { | |||
158 | router.push('/settings/recipes'); | 158 | router.push('/settings/recipes'); |
159 | debug(`Recipe ${recipeId} is not installed, trying to install it`); | 159 | debug(`Recipe ${recipeId} is not installed, trying to install it`); |
160 | 160 | ||
161 | const recipe = await this.installRecipeRequest.execute(recipeId) | 161 | const recipe = |
162 | .promise; | 162 | await this.installRecipeRequest.execute(recipeId).promise; |
163 | if (recipe) { | 163 | if (recipe) { |
164 | await this.allRecipesRequest.invalidate({ immediately: true }) | 164 | await this.allRecipesRequest.invalidate({ immediately: true }) |
165 | .promise; | 165 | .promise; |
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts index 1cee0c57f..9c0072586 100644 --- a/src/stores/ServicesStore.ts +++ b/src/stores/ServicesStore.ts | |||
@@ -1,9 +1,9 @@ | |||
1 | import { join } from 'node:path'; | ||
1 | import { ipcRenderer, shell } from 'electron'; | 2 | import { ipcRenderer, shell } from 'electron'; |
2 | import { action, reaction, computed, observable, makeObservable } from 'mobx'; | 3 | import { action, reaction, computed, observable, makeObservable } from 'mobx'; |
3 | import { debounce, remove } from 'lodash'; | 4 | import { debounce, remove } from 'lodash'; |
4 | import ms from 'ms'; | 5 | import ms from 'ms'; |
5 | import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra'; | 6 | import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra'; |
6 | import { join } from 'node:path'; | ||
7 | 7 | ||
8 | import { Stores } from '../@types/stores.types'; | 8 | import { Stores } from '../@types/stores.types'; |
9 | import { ApiInterface } from '../api'; | 9 | import { ApiInterface } from '../api'; |
diff --git a/src/webview/recipe.ts b/src/webview/recipe.ts index ee7fa26d2..b394f1517 100644 --- a/src/webview/recipe.ts +++ b/src/webview/recipe.ts | |||
@@ -1,9 +1,10 @@ | |||
1 | /* eslint-disable global-require */ | 1 | /* eslint-disable global-require */ |
2 | /* eslint-disable import/no-dynamic-require */ | 2 | /* eslint-disable import/no-dynamic-require */ |
3 | 3 | ||
4 | import { join } from 'node:path'; | ||
5 | import { existsSync } from 'node:fs'; | ||
4 | import { noop, debounce } from 'lodash'; | 6 | import { noop, debounce } from 'lodash'; |
5 | import { contextBridge, ipcRenderer } from 'electron'; | 7 | import { contextBridge, ipcRenderer } from 'electron'; |
6 | import { join } from 'node:path'; | ||
7 | import { autorun, computed, makeObservable, observable } from 'mobx'; | 8 | import { autorun, computed, makeObservable, observable } from 'mobx'; |
8 | import { pathExistsSync, readFileSync } from 'fs-extra'; | 9 | import { pathExistsSync, readFileSync } from 'fs-extra'; |
9 | import { | 10 | import { |
@@ -11,7 +12,6 @@ import { | |||
11 | enable as enableDarkMode, | 12 | enable as enableDarkMode, |
12 | } from 'darkreader'; | 13 | } from 'darkreader'; |
13 | 14 | ||
14 | import { existsSync } from 'node:fs'; | ||
15 | import ignoreList from './darkmode/ignore'; | 15 | import ignoreList from './darkmode/ignore'; |
16 | import customDarkModeCss from './darkmode/custom'; | 16 | import customDarkModeCss from './darkmode/custom'; |
17 | 17 | ||