Skip to content

Commit

Permalink
feat: allow @typescript-eslint/utils v7 as a direct dependency (#1567)
Browse files Browse the repository at this point in the history
* feat: allow @typescript-eslint/utils@7

* fix: typecheck and drop dependencies down

* chore: drop back down to one type argument

* chore: add utils to matrix

* ci: properly install different versions of utils package

---------

Co-authored-by: Gareth Jones <jones258@gmail.com>
  • Loading branch information
JoshuaKGoldberg and G-Rath authored May 3, 2024
1 parent 27f7e74 commit 1476f10
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
test-node:
name:
# prettier-ignore
Test on Node.js v${{ matrix.node-version }}, eslint v${{ matrix.eslint-version }}, and ts-eslint/plugin v${{ matrix.ts-eslint-plugin-version }}
Test on Node.js v${{ matrix.node-version }}, eslint v${{ matrix.eslint-version }}, and ts-eslint v${{ matrix.ts-eslint-plugin-version }}
needs: prepare-yarn-cache-ubuntu
strategy:
fail-fast: false
Expand Down Expand Up @@ -100,6 +100,7 @@ jobs:
install with eslint v${{ matrix.eslint-version }} and ts-eslint/plugin v${{ matrix.ts-eslint-plugin-version }}
run: |
yarn
yarn add @typescript-eslint/utils@${{ matrix.ts-eslint-plugin-version }}
yarn add --dev eslint@${{ matrix.eslint-version }} @typescript-eslint/eslint-plugin@${{ matrix.ts-eslint-plugin-version }} @typescript-eslint/parser@${{ matrix.ts-eslint-plugin-version }}
- name: run tests
# only collect coverage on eslint versions that support dynamic import
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
]
},
"dependencies": {
"@typescript-eslint/utils": "^6.0.0"
"@typescript-eslint/utils": "^6.0.0 || ^7.0.0"
},
"devDependencies": {
"@babel/cli": "^7.4.4",
Expand All @@ -83,6 +83,7 @@
"@types/node": "^14.18.26",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@typescript-eslint/utils": "^6.0.0",
"babel-jest": "^29.0.0",
"babel-plugin-replace-ts-export-assignment": "^0.0.2",
"dedent": "^1.5.0",
Expand Down

0 comments on commit 1476f10

Please sign in to comment.