Merge pull request #11293 from qmonmert/angeslint1

Angular/ESLint: activate use-unknown-in-catch-callback-variable rule
jhipster · Nov 4, 2024 · b329294 · b329294
2 parents 36cbda0 + a74b539
commit b329294
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/src/main/resources/generator/client/angular/core/eslint.config.mjs.mustache b/src/main/resources/generator/client/angular/core/eslint.config.mjs.mustache
@@ -59,7 +59,6 @@ export default tseslint.config(
       '@typescript-eslint/no-non-null-assertion': 'off',
       '@typescript-eslint/no-unsafe-member-access': 'off',
       '@typescript-eslint/no-unsafe-argument': 'off',
-      '@typescript-eslint/use-unknown-in-catch-callback-variable': 'off',
       '@typescript-eslint/restrict-template-expressions': ['error', { allowNumber: true }],
       'arrow-body-style': 'error',
     },

diff --git a/src/main/resources/generator/client/angular/core/src/main/webapp/main.ts.mustache b/src/main/resources/generator/client/angular/core/src/main/webapp/main.ts.mustache
@@ -20,4 +20,4 @@ bootstrapApplication(AppComponent, {
     importProvidersFrom([BrowserAnimationsModule]),
     { provide: REMOVE_STYLES_ON_COMPONENT_DESTROY, useValue: true },
   ],
-}).catch(err => console.error(err));
+}).catch((err: unknown) => console.error(err));
diff --git a/...ent/angular/security/oauth2/src/main/webapp/app/auth/oauth2-auth.service.spec.ts.mustache b/...ent/angular/security/oauth2/src/main/webapp/app/auth/oauth2-auth.service.spec.ts.mustache
@@ -158,7 +158,7 @@ describe('Oauth2 Auth Service', () => {
       expect(keycloakInstance.updateToken).toHaveBeenCalledWith(70);
 
       await expect(updateTokenPromise).rejects.toEqual(new Error('unknown error'));
-      expect(console.error).toHaveBeenCalledWith('Failed to refresh token: Error: unknown error');
+      expect(console.error).toHaveBeenCalledWith('Failed to refresh token', new Error('unknown error'));
     });
   });
 

diff --git a/...r/client/angular/security/oauth2/src/main/webapp/app/auth/oauth2-auth.service.ts.mustache b/...r/client/angular/security/oauth2/src/main/webapp/app/auth/oauth2-auth.service.ts.mustache
@@ -54,6 +54,6 @@ export class Oauth2AuthService {
           console.debug(`Token not refreshed, valid for ${Math.round(exp + timeSkew - Date.now() / 1000)} seconds`);
         }
       })
-      .catch(e => console.error(`Failed to refresh token: ${e}`));
+      .catch((e: unknown) => console.error('Failed to refresh token', e));
   }
 }
diff --git a/src/test/resources/projects/angular/main.ts b/src/test/resources/projects/angular/main.ts
@@ -20,4 +20,4 @@ bootstrapApplication(AppComponent, {
     importProvidersFrom([BrowserAnimationsModule]),
     { provide: REMOVE_STYLES_ON_COMPONENT_DESTROY, useValue: true },
   ],
-}).catch(err => console.error(err));
+}).catch((err: unknown) => console.error(err));