Skip to content

Commit e7d0d70

Browse files
chore(deps): decrease min tseslint version (#10)
- Decrease minimum version of `typescript-eslint` for more compatibility (now matches `import-x` plugin). - Internally bump linter deps and fix new errors. Would've liked to drop to `typescript-eslint` v7 for even more compatibility, but had some early problems. Maybe in the future.
1 parent 07206eb commit e7d0d70

File tree

6 files changed

+123
-112
lines changed

6 files changed

+123
-112
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
- Decrease minimum `typescript-eslint` version to ^8.1.0 (matches import-x plugin).
6+
37
## v0.2.0
48

59
- Improved CJS typing to avoid needing `.default`.

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"typecheck": "tsc --noEmit"
5454
},
5555
"dependencies": {
56-
"@typescript-eslint/scope-manager": "^8.12.2",
57-
"@typescript-eslint/utils": "^8.12.2",
56+
"@typescript-eslint/scope-manager": "^8.1.0",
57+
"@typescript-eslint/utils": "^8.1.0",
5858
"common-tags": "^1.8.0",
5959
"decamelize": "^5.0.1",
6060
"ts-api-utils": "^1.3.0",
@@ -66,28 +66,28 @@
6666
"typescript": ">=4.2.0"
6767
},
6868
"devDependencies": {
69-
"@eslint/js": "^9.13.0",
69+
"@eslint/js": "^9.14.0",
7070
"@stylistic/eslint-plugin": "^2.10.1",
7171
"@types/common-tags": "^1.8.4",
7272
"@types/node": "^18.18.0",
73-
"@typescript-eslint/rule-tester": "^8.12.2",
73+
"@typescript-eslint/rule-tester": "^8.13.0",
7474
"@typescript/vfs": "^1.6.0",
7575
"@vitest/coverage-v8": "^2.1.4",
7676
"@vitest/eslint-plugin": "^1.1.7",
7777
"bumpp": "^9.8.0",
78-
"eslint": "^9.13.0",
78+
"eslint": "^9.14.0",
7979
"eslint-config-flat-gitignore": "^0.3.0",
8080
"eslint-doc-generator": "^1.7.1",
8181
"eslint-import-resolver-typescript": "^3.6.3",
8282
"eslint-plugin-eslint-plugin": "^6.3.1",
8383
"eslint-plugin-import-x": "^4.4.0",
84-
"eslint-plugin-n": "^17.12.0",
84+
"eslint-plugin-n": "^17.13.1",
8585
"markdownlint-cli2": "^0.14.0",
8686
"rxjs": "^7.0.0",
8787
"tsup": "^8.3.5",
8888
"tsx": "^4.19.2",
8989
"typescript": "~5.6.3",
90-
"typescript-eslint": "^8.12.2",
90+
"typescript-eslint": "^8.13.0",
9191
"vitest": "^2.1.4"
9292
},
9393
"engines": {

src/rules/finnish.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ export const finnishRule = ruleCreator({
118118
}
119119
: () => { /* noop */ };
120120
if (
121-
couldBeObservable(typeNode || nameNode)
122-
|| couldReturnObservable(typeNode || nameNode)
121+
couldBeObservable(typeNode ?? nameNode)
122+
|| couldReturnObservable(typeNode ?? nameNode)
123123
) {
124124
for (const name of names) {
125125
const { regExp, validate } = name;
@@ -131,8 +131,8 @@ export const finnishRule = ruleCreator({
131131
for (const type of types) {
132132
const { regExp, validate } = type;
133133
if (
134-
(couldBeType(typeNode || nameNode, regExp)
135-
|| couldReturnType(typeNode || nameNode, regExp))
134+
(couldBeType(typeNode ?? nameNode, regExp)
135+
|| couldReturnType(typeNode ?? nameNode, regExp))
136136
&& !validate
137137
) {
138138
shouldNotBeFinnish();

src/rules/no-finnish.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export const noFinnishRule = ruleCreator({
2626

2727
function checkNode(nameNode: es.Node, typeNode?: es.Node) {
2828
if (
29-
couldBeObservable(typeNode || nameNode)
30-
|| couldReturnObservable(typeNode || nameNode)
29+
couldBeObservable(typeNode ?? nameNode)
30+
|| couldReturnObservable(typeNode ?? nameNode)
3131
) {
3232
const tsNode = esTreeNodeToTSNodeMap.get(nameNode);
3333
if (/[$]+$/.test(tsNode.getText())) {

src/rules/suffix-subjects.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ export const suffixSubjectsRule = ruleCreator({
7676
const text = tsNode.getText();
7777
if (
7878
!suffixRegex.test(text)
79-
&& couldBeType(typeNode || nameNode, 'Subject')
79+
&& couldBeType(typeNode ?? nameNode, 'Subject')
8080
) {
8181
for (const type of types) {
8282
const { regExp, validate } = type;
83-
if (couldBeType(typeNode || nameNode, regExp) && !validate) {
83+
if (couldBeType(typeNode ?? nameNode, regExp) && !validate) {
8484
return;
8585
}
8686
}

0 commit comments

Comments
 (0)