chore: Update typescript-eslint monorepo to v5, eslint and elint-airb…

…nb related packages
stalniy · Dec 17, 2022 · c795e8b · c795e8b
1 parent 8f5909a
commit c795e8b
Show file tree

Hide file tree

Showing 8 changed files with 460 additions and 597 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -4,8 +4,10 @@
     "*.d.ts"
   ],
   "extends": [
+    "airbnb-base",
     "airbnb-typescript/base"
   ],
+  "plugins": ["import"],
   "parserOptions": {
     "project": "./tsconfig.json"
   },

diff --git a/packages/casl-ability/spec/spec_helper.js b/packages/casl-ability/spec/spec_helper.js
@@ -1,6 +1,6 @@
 import chai from 'chai'
 import spies from 'chai-spies'
-import '../../dx/lib/spec_helper'
+import '@casl/dx/lib/spec_helper'
 
 chai.use(spies)
 

diff --git a/packages/casl-ability/src/AbilityBuilder.ts b/packages/casl-ability/src/AbilityBuilder.ts
@@ -91,12 +91,12 @@ export class AbilityBuilder<T extends AnyAbility> {
   can<
     I extends InstanceOf<T, S>,
     S extends SubjectTypeOf<T> = SubjectTypeOf<T>
-  >(...args: BuilderCanParameters<S, I, T>): RuleBuilder<T>
+  >(...args: BuilderCanParameters<S, I, T>): RuleBuilder<T>;
   can<
     I extends InstanceOf<T, S>,
     F extends string = Keys<I>,
     S extends SubjectTypeOf<T> = SubjectTypeOf<T>
-  >(...args: BuilderCanParametersWithFields<S, I, F | Keys<I>, T>): RuleBuilder<T>
+  >(...args: BuilderCanParametersWithFields<S, I, F | Keys<I>, T>): RuleBuilder<T>;
   can(
     action: string | string[],
     subject?: SubjectType | SubjectType[],
@@ -127,12 +127,12 @@ export class AbilityBuilder<T extends AnyAbility> {
   cannot<
     I extends InstanceOf<T, S>,
     S extends SubjectTypeOf<T> = SubjectTypeOf<T>
-  >(...args: BuilderCanParameters<S, I, T>): RuleBuilder<T>
+  >(...args: BuilderCanParameters<S, I, T>): RuleBuilder<T>;
   cannot<
     I extends InstanceOf<T, S>,
     F extends string = Keys<I>,
     S extends SubjectTypeOf<T> = SubjectTypeOf<T>
-  >(...args: BuilderCanParametersWithFields<S, I, F | Keys<I>, T>): RuleBuilder<T>
+  >(...args: BuilderCanParametersWithFields<S, I, F | Keys<I>, T>): RuleBuilder<T>;
   cannot(
     action: string | string[],
     subject?: SubjectType | SubjectType[],

diff --git a/packages/casl-ability/src/ForbiddenError.ts b/packages/casl-ability/src/ForbiddenError.ts
@@ -45,13 +45,13 @@ export class ForbiddenError<T extends AnyAbility> extends NativeError {
     return this;
   }
 
-  throwUnlessCan(...args: Parameters<T['can']>): void
+  throwUnlessCan(...args: Parameters<T['can']>): void;
   throwUnlessCan(action: string, subject?: Subject, field?: string): void {
     const error = (this as any).unlessCan(action, subject, field);
     if (error) throw error;
   }
 
-  unlessCan(...args: Parameters<T['can']>): this | undefined
+  unlessCan(...args: Parameters<T['can']>): this | undefined;
   unlessCan(action: string, subject?: Subject, field?: string): this | undefined {
     const rule = this.ability.relevantRuleFor(action, subject, field);
 

diff --git a/packages/casl-ability/src/PureAbility.ts b/packages/casl-ability/src/PureAbility.ts
@@ -21,13 +21,13 @@ export class PureAbility<
   A extends Abilities = AbilityTuple,
   Conditions = unknown
 > extends RuleIndex<A, Conditions> {
-  can(...args: CanParameters<A>): boolean
+  can(...args: CanParameters<A>): boolean;
   can(action: string, subject?: Subject, field?: string): boolean {
     const rule = (this as PrimitiveAbility).relevantRuleFor(action, subject, field);
     return !!rule && !rule.inverted;
   }
 
-  relevantRuleFor(...args: CanParameters<A>): Rule<A, Conditions> | null
+  relevantRuleFor(...args: CanParameters<A>): Rule<A, Conditions> | null;
   relevantRuleFor(action: string, subject?: Subject, field?: string): Rule<A, Conditions> | null {
     const subjectType = this.detectSubjectType(subject);
     const rules = (this as any).rulesFor(action, subjectType, field);
@@ -41,7 +41,7 @@ export class PureAbility<
     return null;
   }
 
-  cannot(...args: CanParameters<A>): boolean
+  cannot(...args: CanParameters<A>): boolean;
   cannot(action: string, subject?: Subject, field?: string): boolean {
     return !(this as PrimitiveAbility).can(action, subject, field);
   }

diff --git a/packages/casl-ability/src/RuleIndex.ts b/packages/casl-ability/src/RuleIndex.ts
@@ -168,7 +168,7 @@ export class RuleIndex<A extends Abilities, Conditions> {
     return indexedRules;
   }
 
-  possibleRulesFor(...args: AbilitySubjectTypeParameters<A, false>): Rule<A, Conditions>[]
+  possibleRulesFor(...args: AbilitySubjectTypeParameters<A, false>): Rule<A, Conditions>[];
   possibleRulesFor(
     action: string,
     subjectType: SubjectType = this._anySubjectType
@@ -199,7 +199,7 @@ export class RuleIndex<A extends Abilities, Conditions> {
     return rules;
   }
 
-  rulesFor(...args: AbilitySubjectTypeParameters<A>): Rule<A, Conditions>[]
+  rulesFor(...args: AbilitySubjectTypeParameters<A>): Rule<A, Conditions>[];
   rulesFor(action: string, subjectType?: SubjectType, field?: string): Rule<A, Conditions>[] {
     const rules: Rule<A, Conditions>[] = (this as any).possibleRulesFor(action, subjectType);
 

diff --git a/packages/dx/package.json b/packages/dx/package.json
@@ -18,15 +18,12 @@
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@semantic-release/changelog": "^5.0.1",
     "@semantic-release/git": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.22.1",
-    "@typescript-eslint/parser": "^4.0.0",
-    "eslint": "^7.26.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-airbnb-typescript": "^12.3.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.21.5",
-    "eslint-plugin-react-hooks": "^4",
+    "@typescript-eslint/eslint-plugin": "^5.0.0",
+    "@typescript-eslint/parser": "^5.0.0",
+    "eslint": "^8.30.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-plugin-import": "^2.26.0",
     "jest": "^28.0.0",
     "lint-staged": "^11.0.0",
     "rollup": "^2.47.0",