diff options
author | 2023-07-23 20:08:52 -0600 | |
---|---|---|
committer | 2023-07-25 07:45:23 +0000 | |
commit | 8c131073730ec684145c2cc8ee8d6b39bbe9278d (patch) | |
tree | 1129d432ae88475909f0e5d38960395b75364902 /src/api | |
parent | 6.4.1-nightly.11 [skip ci] (diff) | |
download | ferdium-app-8c131073730ec684145c2cc8ee8d6b39bbe9278d.tar.gz ferdium-app-8c131073730ec684145c2cc8ee8d6b39bbe9278d.tar.zst ferdium-app-8c131073730ec684145c2cc8ee8d6b39bbe9278d.zip |
chore: improve lint setup
- update eslint config
- merged eslint rules for JS and TS to avoid duplicates
- extended stricter lint ruleset from typescript-eslint
- corrected wrong setup for certain eslint rulesets
- opt in to reportUnusedDisableDirectives config option
- fix or disable a lot of lint issues throughout codebase
- remove trailingComma: all from prettier config which is default in prettier v3
- add volta configuration to package.json to autoload correct node and pnpm versions
- upgrade all eslint and prettier related dependencies to latest
- remove config options from settings.json which are default anyways
- remove config options from settings.json which are outdated/unknown
- set up prettier as default formatter in settings.json
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/apiBase.ts | 7 | ||||
-rw-r--r-- | src/api/server/ServerApi.ts | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts index bc2cb3dd1..649895fbc 100644 --- a/src/api/apiBase.ts +++ b/src/api/apiBase.ts | |||
@@ -14,12 +14,7 @@ import { fixUrl } from '../helpers/url-helpers'; | |||
14 | 14 | ||
15 | // Note: This cannot be used from the internal-server since we are not running within the context of a browser window | 15 | // Note: This cannot be used from the internal-server since we are not running within the context of a browser window |
16 | export default function apiBase(withVersion = true) { | 16 | export default function apiBase(withVersion = true) { |
17 | if ( | 17 | if (!(window as any).ferdium?.stores.settings?.all?.app.server) { |
18 | !(window as any).ferdium || | ||
19 | !(window as any).ferdium.stores.settings || | ||
20 | !(window as any).ferdium.stores.settings.all || | ||
21 | !(window as any).ferdium.stores.settings.all.app.server | ||
22 | ) { | ||
23 | // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded | 18 | // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded |
24 | return SERVER_NOT_LOADED; | 19 | return SERVER_NOT_LOADED; |
25 | } | 20 | } |
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts index a3d873c65..860b7b76e 100644 --- a/src/api/server/ServerApi.ts +++ b/src/api/server/ServerApi.ts | |||
@@ -507,7 +507,7 @@ export default class ServerApi { | |||
507 | async _mapServiceModels(services: any[]) { | 507 | async _mapServiceModels(services: any[]) { |
508 | const recipes = services.map((s: { recipeId: string }) => s.recipeId); | 508 | const recipes = services.map((s: { recipeId: string }) => s.recipeId); |
509 | await this._bulkRecipeCheck(recipes); | 509 | await this._bulkRecipeCheck(recipes); |
510 | /* eslint-disable no-return-await */ | 510 | |
511 | return Promise.all( | 511 | return Promise.all( |
512 | services.map(async (service: any) => this._prepareServiceModel(service)), | 512 | services.map(async (service: any) => this._prepareServiceModel(service)), |
513 | ); | 513 | ); |