aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Vijay Aravamudhan <vraravam@users.noreply.github.com>2023-08-15 23:38:04 +0000
committerLibravatar GitHub <noreply@github.com>2023-08-16 05:08:04 +0530
commitcbd0da469c4f509e8f4ff3ee530fabffa22983a8 (patch)
treed258d83209b2aa16ca05cb6b46a807a929c7636b /src
parentUpgrade 'electron' to '26.0.0' (diff)
downloadferdium-app-cbd0da469c4f509e8f4ff3ee530fabffa22983a8.tar.gz
ferdium-app-cbd0da469c4f509e8f4ff3ee530fabffa22983a8.tar.zst
ferdium-app-cbd0da469c4f509e8f4ff3ee530fabffa22983a8.zip
Upgrade npm modules (#1312)
Diffstat (limited to 'src')
-rw-r--r--src/components/services/content/ServiceWebview.tsx2
-rw-r--r--src/electron/exception.ts1
-rw-r--r--src/electron/ipc-api/appIndicator.ts2
-rw-r--r--src/electron/ipc-api/download.ts2
-rw-r--r--src/electron/ipc-api/localServer.ts2
-rw-r--r--src/electron/macOSPermissions.ts2
-rw-r--r--src/index.ts4
-rw-r--r--src/internal-server/app/Controllers/Http/UserController.js2
-rw-r--r--src/internal-server/app/ImageHelper.js2
-rw-r--r--src/internal-server/start.ts2
-rw-r--r--src/lib/Menu.ts2
-rw-r--r--src/lib/Tray.ts2
-rw-r--r--src/models/Recipe.ts2
-rw-r--r--src/models/Service.ts2
-rw-r--r--src/preload-safe-debug.ts2
-rw-r--r--src/stores/AppStore.ts2
-rw-r--r--src/stores/RecipesStore.ts4
-rw-r--r--src/stores/ServicesStore.ts2
-rw-r--r--src/webview/recipe.ts4
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 @@
1import { join } from 'node:path';
1import { Component, ReactElement } from 'react'; 2import { Component, ReactElement } from 'react';
2import { observer } from 'mobx-react'; 3import { observer } from 'mobx-react';
3import { action, makeObservable, observable, reaction } from 'mobx'; 4import { action, makeObservable, observable, reaction } from 'mobx';
4import ElectronWebView from 'react-electron-web-view'; 5import ElectronWebView from 'react-electron-web-view';
5import { join } from 'node:path';
6import ServiceModel from '../../../models/Service'; 6import ServiceModel from '../../../models/Service';
7 7
8const debug = require('../../../preload-safe-debug')('Ferdium:Services'); 8const 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
2process.on('uncaughtException', err => { 1process.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 @@
1import { app, ipcMain, BrowserWindow } from 'electron';
2import { join } from 'node:path'; 1import { join } from 'node:path';
2import { app, ipcMain, BrowserWindow } from 'electron';
3import { autorun } from 'mobx'; 3import { autorun } from 'mobx';
4import { isMac, isWindows, isLinux } from '../../environment'; 4import { isMac, isWindows, isLinux } from '../../environment';
5import TrayIcon from '../../lib/Tray'; 5import 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 @@
1import { PathLike } from 'node:fs';
1import { ipcMain, dialog, BrowserWindow } from 'electron'; 2import { ipcMain, dialog, BrowserWindow } from 'electron';
2import { download } from 'electron-dl'; 3import { download } from 'electron-dl';
3import { writeFileSync } from 'fs-extra'; 4import { writeFileSync } from 'fs-extra';
4import { PathLike } from 'node:fs';
5 5
6const debug = require('../../preload-safe-debug')('Ferdium:ipcApi:download'); 6const 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 @@
1import { randomBytes } from 'node:crypto'; 1import { randomBytes } from 'node:crypto';
2import { ipcMain, BrowserWindow } from 'electron';
3import { createServer } from 'node:net'; 2import { createServer } from 'node:net';
3import { ipcMain, BrowserWindow } from 'electron';
4import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config'; 4import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config';
5import { userDataPath } from '../../environment-remote'; 5import { userDataPath } from '../../environment-remote';
6import { server } from '../../internal-server/start'; 6import { 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 @@
1import { dirname } from 'node:path';
1import { systemPreferences, BrowserWindow, dialog } from 'electron'; 2import { systemPreferences, BrowserWindow, dialog } from 'electron';
2import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra'; 3import { pathExistsSync, mkdirSync, writeFileSync } from 'fs-extra';
3import macosVersion from 'macos-version'; 4import macosVersion from 'macos-version';
4import { 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
7import { askForScreenCaptureAccess } from 'node-mac-permissions'; 7import { 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
3import { join } from 'node:path';
4import { EventEmitter } from 'node:events';
3import { 5import {
4 app, 6 app,
5 BrowserWindow, 7 BrowserWindow,
@@ -11,11 +13,9 @@ import {
11} from 'electron'; 13} from 'electron';
12 14
13import { emptyDirSync, ensureFileSync } from 'fs-extra'; 15import { emptyDirSync, ensureFileSync } from 'fs-extra';
14import { join } from 'node:path';
15import windowStateKeeper from 'electron-window-state'; 16import windowStateKeeper from 'electron-window-state';
16import minimist from 'minimist'; 17import minimist from 'minimist';
17import ms from 'ms'; 18import ms from 'ms';
18import { EventEmitter } from 'node:events';
19import { initialize } from 'electron-react-titlebar/main'; 19import { initialize } from 'electron-react-titlebar/main';
20import { enableWebContents, initializeRemote } from './electron-util'; 20import { enableWebContents, initializeRemote } from './electron-util';
21import enforceMacOSAppLocation from './enforce-macos-app-location'; 21import 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');
4const Workspace = use('App/Models/Workspace'); 4const Workspace = use('App/Models/Workspace');
5const { validateAll } = use('Validator'); 5const { validateAll } = use('Validator');
6 6
7const crypto = require('node:crypto');
7const fetch = require('node-fetch'); 8const fetch = require('node-fetch');
8const { v4: uuid } = require('uuid'); 9const { v4: uuid } = require('uuid');
9const crypto = require('node:crypto');
10const { DEFAULT_APP_SETTINGS } = require('../../../../config'); 10const { DEFAULT_APP_SETTINGS } = require('../../../../config');
11const { convertToJSON } = require('../../../../jsUtils'); 11const { convertToJSON } = require('../../../../jsUtils');
12const { API_VERSION } = require('../../../../environment-remote'); 12const { 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 @@
1const Env = use('Env'); 1const Env = use('Env');
2 2
3const path = require('node:path');
3const { v4: uuid } = require('uuid'); 4const { v4: uuid } = require('uuid');
4 5
5const path = require('node:path');
6const fs = require('fs-extra'); 6const fs = require('fs-extra');
7const { API_VERSION } = require('../../environment-remote'); 7const { 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
18import { join } from 'node:path';
18import fold from '@adonisjs/fold'; 19import fold from '@adonisjs/fold';
19import { Ignitor, hooks } from '@adonisjs/ignitor'; 20import { Ignitor, hooks } from '@adonisjs/ignitor';
20import { readFile, stat, chmod, writeFile } from 'fs-extra'; 21import { readFile, stat, chmod, writeFile } from 'fs-extra';
21import { join } from 'node:path';
22import { LOCAL_HOSTNAME } from '../config'; 22import { LOCAL_HOSTNAME } from '../config';
23import { isWindows } from '../environment'; 23import { 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 @@
1import os from 'node:os';
1import { clipboard, MenuItemConstructorOptions } from 'electron'; 2import { clipboard, MenuItemConstructorOptions } from 'electron';
2import { 3import {
3 app, 4 app,
@@ -12,7 +13,6 @@ import { defineMessages, IntlShape } from 'react-intl';
12import osName from 'os-name'; 13import osName from 'os-name';
13import { fromJS } from 'immutable'; 14import { fromJS } from 'immutable';
14import semver from 'semver'; 15import semver from 'semver';
15import os from 'node:os';
16import { 16import {
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 @@
1import { join } from 'node:path';
1import { 2import {
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';
12import { join } from 'node:path';
13import macosVersion from 'macos-version'; 13import macosVersion from 'macos-version';
14import { isMac, isWindows, isLinux } from '../environment'; 14import { 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 @@
1import { join } from 'node:path';
1import semver from 'semver'; 2import semver from 'semver';
2import { pathExistsSync } from 'fs-extra'; 3import { pathExistsSync } from 'fs-extra';
3import { join } from 'node:path';
4import { DEFAULT_SERVICE_SETTINGS } from '../config'; 4import { DEFAULT_SERVICE_SETTINGS } from '../config';
5import { ifUndefined } from '../jsUtils'; 5import { 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 @@
1import { join } from 'node:path';
1import { autorun, action, computed, makeObservable, observable } from 'mobx'; 2import { autorun, action, computed, makeObservable, observable } from 'mobx';
2import { ipcRenderer } from 'electron'; 3import { ipcRenderer } from 'electron';
3import { webContents } from '@electron/remote'; 4import { webContents } from '@electron/remote';
4import { join } from 'node:path';
5import ElectronWebView from 'react-electron-web-view'; 5import ElectronWebView from 'react-electron-web-view';
6 6
7import { todosStore } from '../features/todos'; 7import { 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
12module.exports = function debug(namespace: string): (...params: any[]) => void { 12module.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 @@
1import { URL } from 'node:url';
1import { ipcRenderer } from 'electron'; 2import { ipcRenderer } from 'electron';
2import { 3import {
3 app, 4 app,
@@ -11,7 +12,6 @@ import { action, computed, makeObservable, observable } from 'mobx';
11import moment from 'moment'; 12import moment from 'moment';
12import AutoLaunch from 'auto-launch'; 13import AutoLaunch from 'auto-launch';
13import ms from 'ms'; 14import ms from 'ms';
14import { URL } from 'node:url';
15import { readJsonSync } from 'fs-extra'; 15import { readJsonSync } from 'fs-extra';
16 16
17import { Stores } from '../@types/stores.types'; 17import { 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 @@
1import { join } from 'node:path';
1import { ipcRenderer, shell } from 'electron'; 2import { ipcRenderer, shell } from 'electron';
2import { action, reaction, computed, observable, makeObservable } from 'mobx'; 3import { action, reaction, computed, observable, makeObservable } from 'mobx';
3import { debounce, remove } from 'lodash'; 4import { debounce, remove } from 'lodash';
4import ms from 'ms'; 5import ms from 'ms';
5import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra'; 6import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra';
6import { join } from 'node:path';
7 7
8import { Stores } from '../@types/stores.types'; 8import { Stores } from '../@types/stores.types';
9import { ApiInterface } from '../api'; 9import { 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
4import { join } from 'node:path';
5import { existsSync } from 'node:fs';
4import { noop, debounce } from 'lodash'; 6import { noop, debounce } from 'lodash';
5import { contextBridge, ipcRenderer } from 'electron'; 7import { contextBridge, ipcRenderer } from 'electron';
6import { join } from 'node:path';
7import { autorun, computed, makeObservable, observable } from 'mobx'; 8import { autorun, computed, makeObservable, observable } from 'mobx';
8import { pathExistsSync, readFileSync } from 'fs-extra'; 9import { pathExistsSync, readFileSync } from 'fs-extra';
9import { 10import {
@@ -11,7 +12,6 @@ import {
11 enable as enableDarkMode, 12 enable as enableDarkMode,
12} from 'darkreader'; 13} from 'darkreader';
13 14
14import { existsSync } from 'node:fs';
15import ignoreList from './darkmode/ignore'; 15import ignoreList from './darkmode/ignore';
16import customDarkModeCss from './darkmode/custom'; 16import customDarkModeCss from './darkmode/custom';
17 17