Skip to content

Commit fb07b5b

Browse files
chore(deps): update typescript-eslint monorepo to v6 (major) (#210)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Haoqun Jiang <[email protected]>
1 parent cb50bbb commit fb07b5b

File tree

5 files changed

+80
-100
lines changed

5 files changed

+80
-100
lines changed

.eslintrc.cjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module.exports = defineConfig({
88
'eslint:recommended',
99
'plugin:node/recommended',
1010
'plugin:@typescript-eslint/recommended',
11+
'plugin:@typescript-eslint/stylistic',
1112
'plugin:regexp/recommended',
1213
],
1314
plugins: ['import', 'regexp'],
@@ -73,7 +74,6 @@ module.exports = defineConfig({
7374
],
7475
'@typescript-eslint/no-empty-interface': 'off',
7576
'@typescript-eslint/no-explicit-any': 'off', // maybe we should turn this on in a new PR
76-
'@typescript-eslint/no-extra-semi': 'off', // conflicts with prettier
7777
'@typescript-eslint/no-inferrable-types': 'off',
7878
'@typescript-eslint/no-non-null-assertion': 'off', // maybe we should turn this on in a new PR
7979
'@typescript-eslint/no-unused-vars': 'off', // maybe we should turn this on in a new PR
@@ -89,6 +89,7 @@ module.exports = defineConfig({
8989
],
9090
'import/no-duplicates': 'error',
9191
'import/order': 'error',
92+
'no-extra-semi': 'off', // conflicts with prettier
9293
'sort-imports': [
9394
'error',
9495
{

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"@types/prompts": "^2.4.4",
4242
"@types/resolve": "^1.20.2",
4343
"@types/semver": "^7.5.0",
44-
"@typescript-eslint/eslint-plugin": "^5.62.0",
45-
"@typescript-eslint/parser": "^5.62.0",
44+
"@typescript-eslint/eslint-plugin": "^6.4.0",
45+
"@typescript-eslint/parser": "^6.4.0",
4646
"conventional-changelog-cli": "^2.2.2",
4747
"eslint": "^8.47.0",
4848
"eslint-define-config": "^1.23.0",

packages/plugin-vue/src/utils/descriptorCache.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { ResolvedOptions, VueQuery } from '..'
88
// compiler-sfc should be exported so it can be re-used
99
export interface SFCParseResult {
1010
descriptor: SFCDescriptor
11-
errors: Array<CompilerError | SyntaxError>
11+
errors: (CompilerError | SyntaxError)[]
1212
}
1313

1414
export const cache = new Map<string, SFCDescriptor>()

playground/test-utils.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -193,18 +193,18 @@ type UntilBrowserLogAfterCallback = (logs: string[]) => PromiseLike<void> | void
193193

194194
export async function untilBrowserLogAfter(
195195
operation: () => any,
196-
target: string | RegExp | Array<string | RegExp>,
196+
target: string | RegExp | (string | RegExp)[],
197197
expectOrder?: boolean,
198198
callback?: UntilBrowserLogAfterCallback,
199199
): Promise<string[]>
200200
export async function untilBrowserLogAfter(
201201
operation: () => any,
202-
target: string | RegExp | Array<string | RegExp>,
202+
target: string | RegExp | (string | RegExp)[],
203203
callback?: UntilBrowserLogAfterCallback,
204204
): Promise<string[]>
205205
export async function untilBrowserLogAfter(
206206
operation: () => any,
207-
target: string | RegExp | Array<string | RegExp>,
207+
target: string | RegExp | (string | RegExp)[],
208208
arg3?: boolean | UntilBrowserLogAfterCallback,
209209
arg4?: UntilBrowserLogAfterCallback,
210210
): Promise<string[]> {
@@ -221,7 +221,7 @@ export async function untilBrowserLogAfter(
221221
}
222222

223223
async function untilBrowserLog(
224-
target?: string | RegExp | Array<string | RegExp>,
224+
target?: string | RegExp | (string | RegExp)[],
225225
expectOrder = true,
226226
): Promise<string[]> {
227227
let resolve: () => void

0 commit comments

Comments
 (0)