Bump typescript-eslint from 7.14.1 to 8.12.2 (#48275)

* Bump typescript-eslint from 7.14.1 to 8.12.2 Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 7.14.1 to 8.12.2. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.12.2/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Allow conditionals for no-unused-expressions, fix remaining issues * Fix no-unused-vars violations in try catch blocks * no-empty-object-type: Allow empty interfaces with single extends * Allow no-require-imports in JS files * Mark force reflow with void --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rafał Cieślak <[email protected]> Co-authored-by: Michael Myers <[email protected]>
gravitational · Nov 19, 2024 · 18652a7 · 18652a7
1 parent 1936663
commit 18652a7
Show file tree

Hide file tree

Showing 19 changed files with 164 additions and 80 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/web/packages/build/.eslintrc.js b/web/packages/build/.eslintrc.js
@@ -65,6 +65,14 @@ module.exports = {
         'jest/no-large-snapshots': ['warn', { maxSize: 200 }],
       },
     },
+    // Allow require imports in .js files, as migrating our project to ESM modules requires a lot of
+    // changes.
+    {
+      files: ['**/*.js'],
+      rules: {
+        '@typescript-eslint/no-require-imports': 'warn',
+      },
+    },
   ],
   rules: {
     'import/order': [
@@ -88,6 +96,16 @@ module.exports = {
     'import/no-unresolved': 0,
     'no-unused-vars': 'off', // disabled to allow the typescript one to take over and avoid errors in reporting
     '@typescript-eslint/no-unused-vars': ['error'],
+    'no-unused-expressions': 'off',
+    '@typescript-eslint/no-unused-expressions': [
+      'error',
+      { allowShortCircuit: true, allowTernary: true, enforceForJSX: true },
+    ],
+    '@typescript-eslint/no-empty-object-type': [
+      'error',
+      // with-single-extends is needed to allow for interface extends like we have in jest.d.ts.
+      { allowInterfaces: 'with-single-extends' },
+    ],
 
     // Severity should be one of the following:
     // "off" or 0 - turn the rule off

diff --git a/web/packages/build/jest/setupTests.ts b/web/packages/build/jest/setupTests.ts
@@ -18,13 +18,15 @@
 
 import 'whatwg-fetch';
 
-const crypt = require('crypto');
-const path = require('path');
+import crypto from 'node:crypto';
+import path from 'node:path';
 
-const failOnConsole = require('jest-fail-on-console');
+import failOnConsole from 'jest-fail-on-console';
 
 let entFailOnConsoleIgnoreList = [];
 try {
+  // Cannot do `await import` yet here.
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
   entFailOnConsoleIgnoreList = require('../../../../e/web/testsWithIgnoredConsole');
 } catch (err) {
   // Ignore errors related to teleport.e not being present. This allows OSS users and OSS CI to run
@@ -36,7 +38,7 @@ try {
 
 Object.defineProperty(globalThis, 'crypto', {
   value: {
-    randomUUID: () => crypt.randomUUID(),
+    randomUUID: () => crypto.randomUUID(),
   },
 });
 

diff --git a/web/packages/build/package.json b/web/packages/build/package.json
@@ -32,7 +32,7 @@
     "jest-fail-on-console": "^3.3.0",
     "jsdom": "^25.0.1",
     "rollup-plugin-visualizer": "^5.12.0",
-    "typescript-eslint": "^7.14.1",
+    "typescript-eslint": "^8.12.2",
     "vite-plugin-wasm": "^3.3.0",
     "vite-tsconfig-paths": "^5.0.1"
   }

diff --git a/web/packages/design/src/utils/copyToClipboard.ts b/web/packages/design/src/utils/copyToClipboard.ts
@@ -36,7 +36,7 @@ function showErrorInBrowser(error: unknown, textToCopy: string): void {
   try {
     // window.prompt doesn't work in Electron.
     window.prompt(message, textToCopy);
-  } catch (error) {
+  } catch {
     window.alert(message);
   }
 }
diff --git a/web/packages/shared/hooks/useLocalStorage.ts b/web/packages/shared/hooks/useLocalStorage.ts
@@ -37,7 +37,7 @@ export function useLocalStorage<T>(
 
     try {
       return JSON.parse(value) as T;
-    } catch (err) {
+    } catch {
       return initialValue;
     }
   }, [initialValue, key]);

diff --git a/web/packages/shared/redirects/processRedirectUri.ts b/web/packages/shared/redirects/processRedirectUri.ts
@@ -58,7 +58,7 @@ export function processRedirectUri(redirectUri: string | null): string {
     }
 
     return `${BASE_PATH}${path.startsWith('/') ? '' : '/'}${path}`;
-  } catch (error) {
+  } catch {
     // If it's not a valid URL, it might be a relative path
     if (redirectUri.startsWith('/')) {
       return redirectUri.startsWith(BASE_PATH)

diff --git a/web/packages/teleport/src/Bots/Add/GitHubActions/useGitHubFlow.tsx b/web/packages/teleport/src/Bots/Add/GitHubActions/useGitHubFlow.tsx
@@ -197,7 +197,7 @@ export function parseRepoAddress(repoAddr: string): {
   let url;
   try {
     url = new URL(repoAddr);
-  } catch (e) {
+  } catch {
     throw new Error('Must be a valid URL');
   }
 

diff --git a/web/packages/teleport/src/Console/DocumentSsh/httpFileTransferHandlers.ts b/web/packages/teleport/src/Console/DocumentSsh/httpFileTransferHandlers.ts
@@ -184,7 +184,7 @@ function getErrorText(response: string | undefined): string {
   try {
     const json = JSON.parse(response);
     return json.error?.message || json.message || badRequest;
-  } catch (err) {
+  } catch {
     return 'Bad request, failed to parse error message.';
   }
 }

diff --git a/web/packages/teleport/src/LocksV2/Locks/Locks.tsx b/web/packages/teleport/src/LocksV2/Locks/Locks.tsx
@@ -183,7 +183,7 @@ export function Locks() {
 function getFormattedDate(d: string): string {
   try {
     return formatRelative(new Date(d), Date.now());
-  } catch (e) {
+  } catch {
     return '';
   }
 }

diff --git a/web/packages/teleport/src/Navigation/RecentHistory.tsx b/web/packages/teleport/src/Navigation/RecentHistory.tsx
@@ -176,7 +176,7 @@ function AnimatedHistoryItem({
       const height = item.category ? 60 : 40;
       itemRef.current.style.height = `${height}px`;
       itemRef.current.style.opacity = '1';
-      itemRef.current.offsetHeight; // Force reflow
+      void itemRef.current.offsetHeight; // Force reflow
       requestAnimationFrame(() => {
         if (itemRef.current) {
           itemRef.current.style.height = '0px';
@@ -189,7 +189,7 @@ function AnimatedHistoryItem({
       const height = item.category ? 60 : 40;
       itemRef.current.style.height = `0px`;
       itemRef.current.style.opacity = '0';
-      itemRef.current.offsetHeight; // Force reflow
+      void itemRef.current.offsetHeight; // Force reflow
       requestAnimationFrame(() => {
         if (itemRef.current) {
           itemRef.current.style.height = `${height}px`;

diff --git a/web/packages/teleport/src/User/UserContext.tsx b/web/packages/teleport/src/User/UserContext.tsx
@@ -109,7 +109,7 @@ export function UserContextProvider(props: PropsWithChildren<unknown>) {
 
       setPreferences(preferences);
       storageService.setUserPreferences(preferences);
-    } catch (err) {
+    } catch {
       if (storedPreferences) {
         setPreferences(storedPreferences);
 

diff --git a/web/packages/teleport/src/lib/term/terminal.ts b/web/packages/teleport/src/lib/term/terminal.ts
@@ -107,7 +107,7 @@ export default class TtyTerminal {
         this.fallbackToCanvas();
       });
       this.term.loadAddon(this._webglAddon);
-    } catch (err) {
+    } catch {
       this.fallbackToCanvas();
     }
 
@@ -137,7 +137,7 @@ export default class TtyTerminal {
     this._webglAddon = undefined;
     try {
       this.term.loadAddon(this._canvasAddon);
-    } catch (err) {
+    } catch {
       logger.error(
         'Canvas renderer could not be loaded. Falling back to default'
       );

diff --git a/web/packages/teleport/src/services/api/api.test.ts b/web/packages/teleport/src/services/api/api.test.ts
@@ -168,15 +168,16 @@ const makeFoo = (): { foo: string } => {
 // This is a bogus test to satisfy Jest. We don't even need to execute the code that's in the async
 // function, we're interested only in the type system checking the code.
 test('fetchJson does not return any', () => {
-  async () => {
+  const bogusFunction = async () => {
     const result = await fooService.doSomething();
     // Reading foo is correct. We add a bogus expect to satisfy Jest.
-    result.foo;
+    JSON.stringify(result.foo);
 
     // @ts-expect-error If there's no error here, it means that api.fetchJson returns any, which it
     // shouldn't.
-    result.bar;
+    JSON.stringify(result.bar);
   };
+  bogusFunction.toString(); // Just to satisfy the linter
 
   expect(true).toBe(true);
 });

diff --git a/web/packages/teleport/src/services/api/api.ts b/web/packages/teleport/src/services/api/api.ts
@@ -184,7 +184,7 @@ const api = {
       webauthnResponseForRetry = await auth.getWebauthnResponse(
         MfaChallengeScope.ADMIN_ACTION
       );
-    } catch (err) {
+    } catch {
       throw new Error(
         'Failed to fetch webauthn credentials, please connect a registered hardware key and try again. If you do not have a hardware key registered, you can add one from your account settings page.'
       );

diff --git a/web/packages/teleport/src/stores/storeNotifications.ts b/web/packages/teleport/src/stores/storeNotifications.ts
@@ -131,7 +131,7 @@ export class StoreNotifications extends Store<NotificationStoreState> {
 
     try {
       return JSON.parse(value) as LocalNotificationStates;
-    } catch (err) {
+    } catch {
       return defaultLocalNotificationStates;
     }
   }

diff --git a/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.ts b/web/packages/teleterm/src/mainProcess/loadInstallationId/loadInstallationId.ts
@@ -31,7 +31,7 @@ export function loadInstallationId(filePath: string): string {
   let id = '';
   try {
     id = fs.readFileSync(filePath, 'utf-8');
-  } catch (error) {
+  } catch {
     return writeInstallationId(filePath);
   }
   if (!UUID_V4_REGEX.test(id)) {

diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.tsx
@@ -80,7 +80,7 @@ export function Status(props: { closeDocument?: () => void }) {
   const downloadAndStartAgentAndIgnoreErrors = useCallback(async () => {
     try {
       await downloadAndStartAgent();
-    } catch (error) {
+    } catch {
       // Ignore the error, it'll be shown in the UI by inspecting the attempts.
     }
   }, [downloadAndStartAgent]);

diff --git a/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.tsx b/web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.tsx
@@ -435,7 +435,7 @@ export const ConnectMyComputerContextProvider: FC<
       (async () => {
         try {
           await downloadAndStartAgent();
-        } catch (error) {
+        } catch {
           // Turn off autostart if it fails, otherwise the user wouldn't be able to turn it off by
           // themselves.
           workspacesService.setConnectMyComputerAutoStart(