Merge pull request #1258 from shlinkio/dependabot/npm_and_yarn/eslint-plugins-5b4dfef153

Bump the eslint-plugins group with 3 updates

package.json

@@ -57,9 +57,9 @@
     "workbox-strategies": "^7.1.0"
   },
   "devDependencies": {
-    "@shlinkio/eslint-config-js-coding-standard": "~3.0.0",
+    "@shlinkio/eslint-config-js-coding-standard": "~3.0.1",
     "@shlinkio/stylelint-config-css-coding-standard": "~1.1.1",
-    "@stylistic/eslint-plugin": "^2.3.0",
+    "@stylistic/eslint-plugin": "^2.6.1",
     "@testing-library/jest-dom": "^6.4.8",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.2",
@@ -82,7 +82,7 @@
     "sass": "^1.77.8",
     "stylelint": "^15.11.0",
     "typescript": "^5.5.4",
-    "typescript-eslint": "^7.17.0",
+    "typescript-eslint": "^8.0.0",
     "vite": "^5.3.5",
     "vite-plugin-pwa": "^0.20.1",
     "vitest": "^2.0.2"

src/common/AppUpdateBanner.tsx

@@ -9,7 +9,7 @@ import './AppUpdateBanner.scss';
 interface AppUpdateBannerProps {
   isOpen: boolean;
   toggle: MouseEventHandler<any>;
-  forceUpdate: Function;
+  forceUpdate: () => void;
 }
 
 export const AppUpdateBanner = forwardRef<HTMLElement, AppUpdateBannerProps>(({ isOpen, toggle, forceUpdate }, ref) => {

src/common/Home.tsx

@@ -21,7 +21,9 @@ export const Home = ({ servers }: HomeProps) => {
   useEffect(() => {
     // Try to redirect to the first server marked as auto-connect
     const autoConnectServer = serversList.find(({ autoConnect }) => autoConnect);
-    autoConnectServer && navigate(`/server/${autoConnectServer.id}`);
+    if (autoConnectServer) {
+      navigate(`/server/${autoConnectServer.id}`);
+    }
   }, [serversList, navigate]);
 
   return (

src/common/MainHeader.tsx

@@ -15,7 +15,7 @@ type MainHeaderDeps = {
   ServersDropdown: FC;
 };
 
-const MainHeader: FCWithDeps<{}, MainHeaderDeps> = () => {
+const MainHeader: FCWithDeps<unknown, MainHeaderDeps> = () => {
   const { ServersDropdown } = useDependencies(MainHeader);
   const [isNotCollapsed, toggleCollapse, , collapse] = useToggle();
   const location = useLocation();

src/container/index.ts

@@ -9,13 +9,13 @@ import { provideServices as provideSettingsServices } from '../settings/services
 import { provideServices as provideUtilsServices } from '../utils/services/provideServices';
 import type { ConnectDecorator } from './types';
 
-type LazyActionMap = Record<string, Function>;
+type LazyActionMap = Record<string, (...args: unknown[]) => unknown>;
 
 const bottle = new Bottle();
 
 export const { container } = bottle;
 
-const lazyService = <T extends Function, K>(cont: IContainer, serviceName: string) =>
+const lazyService = <T extends (...args: unknown[]) => unknown, K>(cont: IContainer, serviceName: string) =>
   (...args: any[]) => (cont[serviceName] as T)(...args) as K;
 
 const mapActionService = (map: LazyActionMap, actionName: string): LazyActionMap => ({

src/servers/CreateServer.tsx

@@ -60,7 +60,11 @@ const CreateServer: FCWithDeps<CreateServerProps, CreateServerDeps> = ({ servers
       ({ url, apiKey }) => serverData?.url === url && serverData?.apiKey === apiKey,
     );
 
-    serverExists ? toggleConfirmModal() : saveNewServer(serverData);
+    if (serverExists) {
+      toggleConfirmModal();
+    } else {
+      saveNewServer(serverData);
+    }
   }, [saveNewServer, serverData, servers, toggleConfirmModal]);
 
   return (

src/servers/DeleteServerModal.tsx

@@ -30,7 +30,9 @@ export const DeleteServerModal: FC<DeleteServerModalConnectProps> = (
     }
 
     deleteServer(server);
-    redirectHome && navigate('/');
+    if (redirectHome) {
+      navigate('/');
+    }
   };
 
   return (

src/servers/EditServer.tsx

@@ -31,7 +31,9 @@ const EditServer: FCWithDeps<EditServerProps, EditServerDeps> = withSelectedServ
 
   const handleSubmit = (serverData: ServerData) => {
     editServer(selectedServer.id, serverData);
-    reconnect === 'true' && selectServer(selectedServer.id);
+    if (reconnect === 'true') {
+      selectServer(selectedServer.id);
+    }
     goBack();
   };
 

src/servers/helpers/ImportServersBtn.tsx

@@ -58,8 +58,12 @@ const ImportServersBtn: FCWithDeps<ImportServersBtnConnectProps, ImportServersBt
           const dupServers = newServers.filter((server) => serversInclude(existingServers, server));
           const hasDuplicatedServers = !!dupServers.length;
 
-          !hasDuplicatedServers ? create(newServers) : setDuplicatedServers(dupServers);
-          hasDuplicatedServers && showModal();
+          if (!hasDuplicatedServers) {
+            create(newServers);
+          } else {
+            setDuplicatedServers(dupServers);
+            showModal();
+          }
         })
         .then(() => {
           // Reset input after processing file

src/servers/helpers/ServerForm.tsx

@@ -17,9 +17,11 @@ export const ServerForm: FC<ServerFormProps> = ({ onSubmit, initialValues, child
   const handleSubmit = handleEventPreventingDefault(() => onSubmit({ name, url, apiKey }));
 
   useEffect(() => {
-    initialValues && setName(initialValues.name);
-    initialValues && setUrl(initialValues.url);
-    initialValues && setApiKey(initialValues.apiKey);
+    if (initialValues) {
+      setName(initialValues.name);
+      setUrl(initialValues.url);
+      setApiKey(initialValues.apiKey);
+    }
   }, [initialValues]);
 
   return (

src/servers/helpers/withSelectedServer.tsx

@@ -17,7 +17,7 @@ type WithSelectedServerPropsDeps = {
   ServerError: FC;
 };
 
-export function withSelectedServer<T = {}>(
+export function withSelectedServer<T extends object>(
   WrappedComponent: FCWithDeps<WithSelectedServerProps & T, WithSelectedServerPropsDeps>,
 ) {
   const ComponentWrapper: FCWithDeps<WithSelectedServerProps & T, WithSelectedServerPropsDeps> = (props) => {
@@ -26,7 +26,9 @@ export function withSelectedServer<T = {}>(
     const { selectServer, selectedServer } = props;
 
     useEffect(() => {
-      params.serverId && selectServer(params.serverId);
+      if (params.serverId) {
+        selectServer(params.serverId);
+      }
     }, [params.serverId, selectServer]);
 
     if (!selectedServer) {

src/servers/helpers/withoutSelectedServer.tsx

@@ -2,10 +2,10 @@ import type { FC } from 'react';
 import { useEffect } from 'react';
 
 interface WithoutSelectedServerProps {
-  resetSelectedServer: Function;
+  resetSelectedServer: () => unknown;
 }
 
-export function withoutSelectedServer<T = {}>(WrappedComponent: FC<WithoutSelectedServerProps & T>) {
+export function withoutSelectedServer<T extends object>(WrappedComponent: FC<WithoutSelectedServerProps & T>) {
   return (props: WithoutSelectedServerProps & T) => {
     const { resetSelectedServer } = props;
     useEffect(() => {

src/servers/reducers/selectedServer.ts

@@ -50,7 +50,7 @@ export const selectServer = (buildShlinkApiClient: ShlinkApiClientBuilder) => cr
         version,
         printableVersion,
       };
-    } catch (e) {
+    } catch {
       return { ...selectedServer, serverNotReachable: true };
     }
   },

src/settings/helpers/index.ts

@@ -7,8 +7,8 @@ export const migrateDeprecatedSettings = (state: Partial<ShlinkState>): Partial<
   }
 
   // The "last180Days" interval had a typo, with a lowercase d
-  if ((state.settings.visits?.defaultInterval as any) === 'last180days') {
-    state.settings.visits && (state.settings.visits.defaultInterval = 'last180Days');
+  if (state.settings.visits && (state.settings.visits.defaultInterval as any) === 'last180days') {
+    state.settings.visits.defaultInterval = 'last180Days';
   }
 
   return state;

src/utils/helpers/version.ts

@@ -38,7 +38,7 @@ export const versionMatch = (versionToMatch: SemVer | Empty, { maxVersion, minVe
 const versionIsValidSemVer = memoizeWith((v) => v, (version: string): version is SemVer => {
   try {
     return compare(version, version, '=');
-  } catch (e) {
+  } catch {
     return false;
   }
 });

test/servers/DeleteServerButton.test.tsx

@@ -32,7 +32,9 @@ describe('<DeleteServerButton />', () => {
 
     expect(screen.getByText(/DeleteServerModal/)).toHaveTextContent(/Closed/);
     expect(screen.getByText(/DeleteServerModal/)).not.toHaveTextContent(/Open/);
-    container.firstElementChild && await user.click(container.firstElementChild);
+    if (container.firstElementChild) {
+      await user.click(container.firstElementChild);
+    }
 
     await waitFor(() => expect(screen.getByText(/DeleteServerModal/)).toHaveTextContent(/Open/));
   });

test/servers/helpers/ImportServersBtn.test.tsx

@@ -57,7 +57,9 @@ describe('<ImportServersBtn />', () => {
     const { container } = setUp();
     const input = container.querySelector('[type=file]');
 
-    input && fireEvent.change(input, { target: { files: [''] } });
+    if (input) {
+      fireEvent.change(input, { target: { files: [''] } });
+    }
     expect(importServersFromFile).toHaveBeenCalledTimes(1);
     await waitFor(() => expect(createServersMock).toHaveBeenCalledTimes(1));
   });
@@ -73,7 +75,9 @@ describe('<ImportServersBtn />', () => {
     importServersFromFile.mockResolvedValue([existingServer, newServer]);
 
     expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    input && fireEvent.change(input, { target: { files: [''] } });
+    if (input) {
+      fireEvent.change(input, { target: { files: [''] } });
+    }
     await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
     await user.click(screen.getByRole('button', { name: btnName }));