Skip to content

Commit cdfc4fd

Browse files
authored
Fix lint file pattern (#225)
Fixes that the same files were being linted in two separate lint tasks. Also does a bit more cleanup.
1 parent 408c7c9 commit cdfc4fd

File tree

5 files changed

+52
-61
lines changed

5 files changed

+52
-61
lines changed

.eslintrc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@typescript-eslint/no-inferrable-types": "off",
3434
"@typescript-eslint/member-ordering": "off",
3535
"@typescript-eslint/no-unused-vars": "error",
36-
"@typescript-eslint/no-non-null-assertion": "off",
36+
"@typescript-eslint/no-non-null-assertion": "error",
3737
"@typescript-eslint/quotes": [
3838
"error",
3939
"single",
@@ -74,10 +74,10 @@
7474
],
7575
"no-duplicate-imports": "error",
7676
"no-redeclare": "error",
77-
"object-shorthand": "off",
77+
"object-shorthand": "error",
7878
"no-underscore-dangle": "off",
7979
"prefer-arrow/prefer-arrow-functions": "off",
80-
"jsdoc/newline-after-description": "off",
80+
"jsdoc/newline-after-description": "error",
8181
"quote-props": "off"
8282
}
8383
},

angular.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
"builder": "@angular-eslint/builder:lint",
7777
"options": {
7878
"lintFilePatterns": [
79-
"src/**/*.ts",
80-
"src/**/*.html"
79+
"src/demo/**/*.ts",
80+
"src/demo/**/*.html"
8181
]
8282
}
8383
},

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
"devDependencies": {
3737
"@angular-devkit/architect": "^0.1300.0-next.7",
3838
"@angular-devkit/build-angular": "~13.0.0-next.7",
39-
"@angular-eslint/builder": "12.5.0",
40-
"@angular-eslint/eslint-plugin": "12.5.0",
41-
"@angular-eslint/eslint-plugin-template": "12.5.0",
42-
"@angular-eslint/schematics": "12.5.0",
43-
"@angular-eslint/template-parser": "12.5.0",
39+
"@angular-eslint/builder": "~12.5.0",
40+
"@angular-eslint/eslint-plugin": "~12.5.0",
41+
"@angular-eslint/eslint-plugin-template": "~12.5.0",
42+
"@angular-eslint/schematics": "~12.5.0",
43+
"@angular-eslint/template-parser": "~12.5.0",
4444
"@angular/cli": "~13.0.0-next.7",
4545
"@angular/common": "~13.0.0-next.9",
4646
"@angular/compiler": "~13.0.0-next.9",
@@ -54,9 +54,9 @@
5454
"angular-cli-ghpages": "^1.0.0-rc.2",
5555
"eslint": "^7.26.0",
5656
"eslint-plugin-ban": "^1.5.2",
57-
"eslint-plugin-import": "latest",
58-
"eslint-plugin-jsdoc": "latest",
59-
"eslint-plugin-prefer-arrow": "latest",
57+
"eslint-plugin-import": "^2.42.2",
58+
"eslint-plugin-jsdoc": "^31.1.0",
59+
"eslint-plugin-prefer-arrow": "^1.2.3",
6060
"ng-packagr": "~13.0.0-next.5",
6161
"rxjs": "~6.6.3",
6262
"tslib": "^2.3.0",

src/lib/round-progress/round-progress.service.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ export class RoundProgressService {
4848

4949
/**
5050
* Generates the value for an SVG arc.
51-
* @param current Current value.
52-
* @param total Maximum value.
53-
* @param pathRadius Radius of the SVG path.
51+
*
52+
* @param current Current value.
53+
* @param total Maximum value.
54+
* @param pathRadius Radius of the SVG path.
5455
* @param elementRadius Radius of the SVG container.
55-
* @param isSemicircle Whether the element should be a semicircle.
56+
* @param isSemicircle Whether the element should be a semicircle.
5657
*/
5758
getArc(current: number, total: number, pathRadius: number, elementRadius: number,
5859
isSemicircle = false): string {
@@ -68,8 +69,9 @@ export class RoundProgressService {
6869

6970
/**
7071
* Converts polar cooradinates to Cartesian.
71-
* @param elementRadius Radius of the wrapper element.
72-
* @param pathRadius Radius of the path being described.
72+
*
73+
* @param elementRadius Radius of the wrapper element.
74+
* @param pathRadius Radius of the path being described.
7375
* @param angleInDegrees Degree to be converted.
7476
*/
7577
private _polarToCartesian(elementRadius: number, pathRadius: number,

yarn.lock

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@
122122
ora "5.4.1"
123123
rxjs "6.6.7"
124124

125-
"@angular-eslint/[email protected]":
125+
"@angular-eslint/builder@~12.5.0":
126126
version "12.5.0"
127127
resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-12.5.0.tgz#e53946ffe9873579ff2a9ce46d3b7e44ea62905d"
128128
integrity sha512-abex1KdqEvUYbJqLkqhEeW4r0DuJPDzlMZYODMyBDDFTcBFYQCzLFUkhIjRNet9Vjto3Y3DbkkFUfS4DEEwjTw==
129129
dependencies:
130130
"@nrwl/devkit" "12.6.0"
131131

132-
"@angular-eslint/[email protected]":
132+
"@angular-eslint/[email protected]", "@angular-eslint/eslint-plugin-template@~12.5.0":
133133
version "12.5.0"
134134
resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-12.5.0.tgz#9b77647c7d850a956d4e2fc8343230f3076e5892"
135135
integrity sha512-qvgJieWFiK61kyuGPbRWBBmsP2J/bRjYply/aAuqpctnlLnae1/+GCsosWWP/AzOlR2TvHN62j7ZW6GSxTkUOg==
@@ -138,15 +138,15 @@
138138
aria-query "^4.2.2"
139139
axobject-query "^2.2.0"
140140

141-
"@angular-eslint/[email protected]":
141+
"@angular-eslint/[email protected]", "@angular-eslint/eslint-plugin@~12.5.0":
142142
version "12.5.0"
143143
resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-12.5.0.tgz#cb4eca50338bf41398bd62796c1068b937ff53a1"
144144
integrity sha512-BugzzvgghcaxHMvUFQBdu6dwB167CwiTxjIBT9KxIYYm0IY3RUKiyVQDdSs4tcwZqsyWNWuiju4ZfGPNHGjcWw==
145145
dependencies:
146146
"@angular-eslint/utils" "12.5.0"
147147
"@typescript-eslint/experimental-utils" "4.28.2"
148148

149-
"@angular-eslint/[email protected]":
149+
"@angular-eslint/schematics@~12.5.0":
150150
version "12.5.0"
151151
resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-12.5.0.tgz#bbfe5f543f26ddb38727163a7426fcd99572b282"
152152
integrity sha512-918oLA4Z/sQl/WWzeQNPmy23VgU1fAdlqKnZmBWFE6Mrpstoa8emX9dIl4mbQT1UbS9XtzI2OglmbX2lQR0jRw==
@@ -157,7 +157,7 @@
157157
strip-json-comments "3.1.1"
158158
tmp "0.2.1"
159159

160-
"@angular-eslint/[email protected]":
160+
"@angular-eslint/template-parser@~12.5.0":
161161
version "12.5.0"
162162
resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-12.5.0.tgz#e4cade69ce485eba9f6b7f9fdcabfb6516d4ef25"
163163
integrity sha512-aAcwoy0X6B2IUvuH6i0zK7leKqM1Lx3QqzFI2gyOWLIgtT81182Wm0VT+3GWwr4pudw+L6n4NhDVDvxBkRJFtA==
@@ -1166,15 +1166,6 @@
11661166
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3"
11671167
integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==
11681168

1169-
1170-
version "0.10.8"
1171-
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz#b3152887e25246410ed4ea569a55926ec13b2b05"
1172-
integrity sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ==
1173-
dependencies:
1174-
comment-parser "1.2.4"
1175-
esquery "^1.4.0"
1176-
jsdoc-type-pratt-parser "1.1.1"
1177-
11781169
"@eslint/eslintrc@^0.4.3":
11791170
version "0.4.3"
11801171
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -2387,10 +2378,10 @@ commander@^8.0.0:
23872378
resolved "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz#37fe2bde301d87d47a53adeff8b5915db1381ca8"
23882379
integrity sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==
23892380

2390-
comment-parser@1.2.4:
2391-
version "1.2.4"
2392-
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760"
2393-
integrity sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==
2381+
comment-parser@1.1.2:
2382+
version "1.1.2"
2383+
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.2.tgz#e5317d7a2ec22b470dcb54a29b25426c30bf39d8"
2384+
integrity sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ==
23942385

23952386
commondir@^1.0.1:
23962387
version "1.0.1"
@@ -2619,7 +2610,7 @@ [email protected], debug@^2.6.9:
26192610
dependencies:
26202611
ms "2.0.0"
26212612

2622-
debug@4, [email protected], debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
2613+
debug@4, [email protected], debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
26232614
version "4.3.2"
26242615
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
26252616
integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -3059,7 +3050,7 @@ eslint-plugin-ban@^1.5.2:
30593050
dependencies:
30603051
requireindex "~1.2.0"
30613052

3062-
eslint-plugin-import@latest:
3053+
eslint-plugin-import@^2.42.2:
30633054
version "2.24.2"
30643055
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
30653056
integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
@@ -3080,22 +3071,20 @@ eslint-plugin-import@latest:
30803071
resolve "^1.20.0"
30813072
tsconfig-paths "^3.11.0"
30823073

3083-
eslint-plugin-jsdoc@latest:
3084-
version "36.1.0"
3085-
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.0.tgz#8dfe5f27edfb6aa3812e6d86ccaea849ddc86b03"
3086-
integrity sha512-Qpied2AJCQcScxfzTObLKRiP5QgLXjMU/ITjBagEV5p2Q/HpumD1EQtazdRYdjDSwPmXhwOl2yquwOGQ4HOJNw==
3074+
eslint-plugin-jsdoc@^31.1.0:
3075+
version "31.6.1"
3076+
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.6.1.tgz#98040c801500572fff71c984a097d89946f1e450"
3077+
integrity sha512-5hCV3u+1VSEUMyfdTl+dpWsioD7tqQr2ILQw+KbXrF42AVxCLO8gnNLR6zDCDjqGGpt79V1sgY0RRchCWuCigg==
30873078
dependencies:
3088-
"@es-joy/jsdoccomment" "0.10.8"
3089-
comment-parser "1.2.4"
3090-
debug "^4.3.2"
3091-
esquery "^1.4.0"
3092-
jsdoc-type-pratt-parser "^1.1.1"
3093-
lodash "^4.17.21"
3094-
regextras "^0.8.0"
3095-
semver "^7.3.5"
3079+
comment-parser "1.1.2"
3080+
debug "^4.3.1"
3081+
jsdoctypeparser "^9.0.0"
3082+
lodash "^4.17.20"
3083+
regextras "^0.7.1"
3084+
semver "^7.3.4"
30963085
spdx-expression-parse "^3.0.1"
30973086

3098-
eslint-plugin-prefer-arrow@latest:
3087+
eslint-plugin-prefer-arrow@^1.2.3:
30993088
version "1.2.3"
31003089
resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz#e7fbb3fa4cd84ff1015b9c51ad86550e55041041"
31013090
integrity sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==
@@ -4340,10 +4329,10 @@ jsbn@~0.1.0:
43404329
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
43414330
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
43424331

4343-
[email protected], jsdoc-type-pratt-parser@^1.1.1:
4344-
version "1.1.1"
4345-
resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz#10fe5e409ba38de22a48b555598955a26ff0160f"
4346-
integrity sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==
4332+
jsdoctypeparser@^9.0.0:
4333+
version "9.0.0"
4334+
resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz#8c97e2fb69315eb274b0f01377eaa5c940bd7b26"
4335+
integrity sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==
43474336

43484337
jsesc@^2.5.1:
43494338
version "2.5.2"
@@ -4570,7 +4559,7 @@ lodash.truncate@^4.4.2:
45704559
resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
45714560
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
45724561

4573-
lodash@^4.17.14, lodash@^4.17.21:
4562+
lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21:
45744563
version "4.17.21"
45754564
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
45764565
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6085,10 +6074,10 @@ regexpu-core@^4.7.1:
60856074
unicode-match-property-ecmascript "^2.0.0"
60866075
unicode-match-property-value-ecmascript "^2.0.0"
60876076

6088-
regextras@^0.8.0:
6089-
version "0.8.0"
6090-
resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217"
6091-
integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==
6077+
regextras@^0.7.1:
6078+
version "0.7.1"
6079+
resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz#be95719d5f43f9ef0b9fa07ad89b7c606995a3b2"
6080+
integrity sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==
60926081

60936082
regjsgen@^0.5.2:
60946083
version "0.5.2"

0 commit comments

Comments
 (0)