Skip to content

Commit c795e8b

Browse files
renovate[bot]stalniy
authored andcommitted
chore: Update typescript-eslint monorepo to v5, eslint and elint-airbnb related packages
1 parent 8f5909a commit c795e8b

File tree

8 files changed

+460
-597
lines changed

8 files changed

+460
-597
lines changed

.eslintrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
"*.d.ts"
55
],
66
"extends": [
7+
"airbnb-base",
78
"airbnb-typescript/base"
89
],
10+
"plugins": ["import"],
911
"parserOptions": {
1012
"project": "./tsconfig.json"
1113
},

packages/casl-ability/spec/spec_helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import chai from 'chai'
22
import spies from 'chai-spies'
3-
import '../../dx/lib/spec_helper'
3+
import '@casl/dx/lib/spec_helper'
44

55
chai.use(spies)
66

packages/casl-ability/src/AbilityBuilder.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ export class AbilityBuilder<T extends AnyAbility> {
9191
can<
9292
I extends InstanceOf<T, S>,
9393
S extends SubjectTypeOf<T> = SubjectTypeOf<T>
94-
>(...args: BuilderCanParameters<S, I, T>): RuleBuilder<T>
94+
>(...args: BuilderCanParameters<S, I, T>): RuleBuilder<T>;
9595
can<
9696
I extends InstanceOf<T, S>,
9797
F extends string = Keys<I>,
9898
S extends SubjectTypeOf<T> = SubjectTypeOf<T>
99-
>(...args: BuilderCanParametersWithFields<S, I, F | Keys<I>, T>): RuleBuilder<T>
99+
>(...args: BuilderCanParametersWithFields<S, I, F | Keys<I>, T>): RuleBuilder<T>;
100100
can(
101101
action: string | string[],
102102
subject?: SubjectType | SubjectType[],
@@ -127,12 +127,12 @@ export class AbilityBuilder<T extends AnyAbility> {
127127
cannot<
128128
I extends InstanceOf<T, S>,
129129
S extends SubjectTypeOf<T> = SubjectTypeOf<T>
130-
>(...args: BuilderCanParameters<S, I, T>): RuleBuilder<T>
130+
>(...args: BuilderCanParameters<S, I, T>): RuleBuilder<T>;
131131
cannot<
132132
I extends InstanceOf<T, S>,
133133
F extends string = Keys<I>,
134134
S extends SubjectTypeOf<T> = SubjectTypeOf<T>
135-
>(...args: BuilderCanParametersWithFields<S, I, F | Keys<I>, T>): RuleBuilder<T>
135+
>(...args: BuilderCanParametersWithFields<S, I, F | Keys<I>, T>): RuleBuilder<T>;
136136
cannot(
137137
action: string | string[],
138138
subject?: SubjectType | SubjectType[],

packages/casl-ability/src/ForbiddenError.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ export class ForbiddenError<T extends AnyAbility> extends NativeError {
4545
return this;
4646
}
4747

48-
throwUnlessCan(...args: Parameters<T['can']>): void
48+
throwUnlessCan(...args: Parameters<T['can']>): void;
4949
throwUnlessCan(action: string, subject?: Subject, field?: string): void {
5050
const error = (this as any).unlessCan(action, subject, field);
5151
if (error) throw error;
5252
}
5353

54-
unlessCan(...args: Parameters<T['can']>): this | undefined
54+
unlessCan(...args: Parameters<T['can']>): this | undefined;
5555
unlessCan(action: string, subject?: Subject, field?: string): this | undefined {
5656
const rule = this.ability.relevantRuleFor(action, subject, field);
5757

packages/casl-ability/src/PureAbility.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ export class PureAbility<
2121
A extends Abilities = AbilityTuple,
2222
Conditions = unknown
2323
> extends RuleIndex<A, Conditions> {
24-
can(...args: CanParameters<A>): boolean
24+
can(...args: CanParameters<A>): boolean;
2525
can(action: string, subject?: Subject, field?: string): boolean {
2626
const rule = (this as PrimitiveAbility).relevantRuleFor(action, subject, field);
2727
return !!rule && !rule.inverted;
2828
}
2929

30-
relevantRuleFor(...args: CanParameters<A>): Rule<A, Conditions> | null
30+
relevantRuleFor(...args: CanParameters<A>): Rule<A, Conditions> | null;
3131
relevantRuleFor(action: string, subject?: Subject, field?: string): Rule<A, Conditions> | null {
3232
const subjectType = this.detectSubjectType(subject);
3333
const rules = (this as any).rulesFor(action, subjectType, field);
@@ -41,7 +41,7 @@ export class PureAbility<
4141
return null;
4242
}
4343

44-
cannot(...args: CanParameters<A>): boolean
44+
cannot(...args: CanParameters<A>): boolean;
4545
cannot(action: string, subject?: Subject, field?: string): boolean {
4646
return !(this as PrimitiveAbility).can(action, subject, field);
4747
}

packages/casl-ability/src/RuleIndex.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export class RuleIndex<A extends Abilities, Conditions> {
168168
return indexedRules;
169169
}
170170

171-
possibleRulesFor(...args: AbilitySubjectTypeParameters<A, false>): Rule<A, Conditions>[]
171+
possibleRulesFor(...args: AbilitySubjectTypeParameters<A, false>): Rule<A, Conditions>[];
172172
possibleRulesFor(
173173
action: string,
174174
subjectType: SubjectType = this._anySubjectType
@@ -199,7 +199,7 @@ export class RuleIndex<A extends Abilities, Conditions> {
199199
return rules;
200200
}
201201

202-
rulesFor(...args: AbilitySubjectTypeParameters<A>): Rule<A, Conditions>[]
202+
rulesFor(...args: AbilitySubjectTypeParameters<A>): Rule<A, Conditions>[];
203203
rulesFor(action: string, subjectType?: SubjectType, field?: string): Rule<A, Conditions>[] {
204204
const rules: Rule<A, Conditions>[] = (this as any).possibleRulesFor(action, subjectType);
205205

packages/dx/package.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@
1818
"@rollup/plugin-node-resolve": "^13.0.0",
1919
"@semantic-release/changelog": "^5.0.1",
2020
"@semantic-release/git": "^9.0.0",
21-
"@typescript-eslint/eslint-plugin": "^4.22.1",
22-
"@typescript-eslint/parser": "^4.0.0",
23-
"eslint": "^7.26.0",
24-
"eslint-config-airbnb-base": "^14.2.1",
25-
"eslint-config-airbnb-typescript": "^12.3.1",
26-
"eslint-plugin-import": "^2.22.1",
27-
"eslint-plugin-jsx-a11y": "^6.4.1",
28-
"eslint-plugin-react": "^7.21.5",
29-
"eslint-plugin-react-hooks": "^4",
21+
"@typescript-eslint/eslint-plugin": "^5.0.0",
22+
"@typescript-eslint/parser": "^5.0.0",
23+
"eslint": "^8.30.0",
24+
"eslint-config-airbnb-base": "^15.0.0",
25+
"eslint-config-airbnb-typescript": "^17.0.0",
26+
"eslint-plugin-import": "^2.26.0",
3027
"jest": "^28.0.0",
3128
"lint-staged": "^11.0.0",
3229
"rollup": "^2.47.0",

0 commit comments

Comments
 (0)