Skip to content

Commit 04f250f

Browse files
chore(deps): update eslint packages (#6958)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vladimir Sheremet <[email protected]>
1 parent 2521fa2 commit 04f250f

File tree

32 files changed

+406
-385
lines changed

32 files changed

+406
-385
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"test:browser:playwright": "pnpm -C test/browser run test:playwright"
3737
},
3838
"devDependencies": {
39-
"@antfu/eslint-config": "^3.8.0",
39+
"@antfu/eslint-config": "^3.11.2",
4040
"@antfu/ni": "^0.23.1",
4141
"@playwright/test": "^1.49.0",
4242
"@rollup/plugin-commonjs": "^28.0.1",
@@ -51,7 +51,7 @@
5151
"bumpp": "^9.8.1",
5252
"changelogithub": "^0.13.11",
5353
"esbuild": "^0.24.0",
54-
"eslint": "^9.14.0",
54+
"eslint": "^9.16.0",
5555
"magic-string": "^0.30.14",
5656
"pathe": "^1.1.2",
5757
"rimraf": "^6.0.1",

packages/coverage-istanbul/src/provider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import type { CoverageProvider, ReportContext, ResolvedCoverageOptions, Vitest } from 'vitest/node'
22
import { promises as fs } from 'node:fs'
3+
// @ts-expect-error missing types
4+
import { defaults as istanbulDefaults } from '@istanbuljs/schema'
35
import createDebug from 'debug'
46
import libCoverage, { type CoverageMap } from 'istanbul-lib-coverage'
57
import { createInstrumenter, type Instrumenter } from 'istanbul-lib-instrument'
@@ -11,8 +13,6 @@ import { resolve } from 'pathe'
1113
import TestExclude from 'test-exclude'
1214
import c from 'tinyrainbow'
1315
import { BaseCoverageProvider } from 'vitest/coverage'
14-
// @ts-expect-error missing types
15-
import { defaults as istanbulDefaults } from '@istanbuljs/schema'
1616

1717
import { version } from '../package.json' with { type: 'json' }
1818
import { COVERAGE_STORE_KEY } from './constants'

packages/mocker/src/node/esmWalker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export function esmWalker(
195195
if (
196196
(parent?.type === 'TemplateLiteral'
197197
&& parent?.expressions.includes(child))
198-
|| (parent?.type === 'CallExpression' && parent?.callee === child)
198+
|| (parent?.type === 'CallExpression' && parent?.callee === child)
199199
) {
200200
return
201201
}
@@ -253,7 +253,7 @@ export function esmWalker(
253253
const classDeclaration
254254
= (parent.type === 'PropertyDefinition'
255255
&& grandparent?.type === 'ClassBody')
256-
|| (parent.type === 'ClassDeclaration' && node === parent.superClass)
256+
|| (parent.type === 'ClassDeclaration' && node === parent.superClass)
257257

258258
const classExpression
259259
= parent.type === 'ClassExpression' && node === parent.id
@@ -277,7 +277,7 @@ function isRefIdentifier(id: Identifier, parent: _Node, parentStack: _Node[]) {
277277
parent.type === 'CatchClause'
278278
|| ((parent.type === 'VariableDeclarator'
279279
|| parent.type === 'ClassDeclaration')
280-
&& parent.id === id)
280+
&& parent.id === id)
281281
) {
282282
return false
283283
}

packages/pretty-format/src/plugins/DOMElement.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ function testNode(val: any) {
4141
return (
4242
(nodeType === ELEMENT_NODE
4343
&& (ELEMENT_REGEXP.test(constructorName) || isCustomElement))
44-
|| (nodeType === TEXT_NODE && constructorName === 'Text')
45-
|| (nodeType === COMMENT_NODE && constructorName === 'Comment')
46-
|| (nodeType === FRAGMENT_NODE && constructorName === 'DocumentFragment')
44+
|| (nodeType === TEXT_NODE && constructorName === 'Text')
45+
|| (nodeType === COMMENT_NODE && constructorName === 'Comment')
46+
|| (nodeType === FRAGMENT_NODE && constructorName === 'DocumentFragment')
4747
)
4848
}
4949

packages/ui/client/components/BrowserIframe.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
2-
import { viewport } from '~/composables/browser'
32
import type { ViewportSize } from '~/composables/browser'
3+
import { viewport } from '~/composables/browser'
44
import {
55
hideRightPanel,
66
panels,

packages/ui/client/components/FileDetails.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<script setup lang="ts">
2+
import type { ModuleGraph } from '~/composables/module-graph'
3+
import type { Params } from '~/composables/params'
24
import { hasFailedSnapshot } from '@vitest/ws-client'
35
import {
46
browserState,
@@ -7,9 +9,7 @@ import {
79
currentLogs,
810
isReport,
911
} from '~/composables/client'
10-
import type { ModuleGraph } from '~/composables/module-graph'
1112
import { getModuleGraph } from '~/composables/module-graph'
12-
import type { Params } from '~/composables/params'
1313
import { viewMode } from '~/composables/params'
1414
import { getProjectNameColor } from '~/utils/task'
1515

packages/ui/client/components/explorer/ExplorerItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<script setup lang="ts">
22
import type { Task, TaskState } from '@vitest/runner'
3+
import type { TaskTreeNodeType } from '~/composables/explorer/types'
34
import { hasFailedSnapshot } from '@vitest/ws-client'
45
import { Tooltip as VueTooltip } from 'floating-vue'
56
import { nextTick } from 'vue'
67
import { client, isReport, runFiles, runTask } from '~/composables/client'
78
import { showSource } from '~/composables/codemirror'
89
import { explorerTree } from '~/composables/explorer'
910
import { escapeHtml, highlightRegex } from '~/composables/explorer/state'
10-
import type { TaskTreeNodeType } from '~/composables/explorer/types'
1111
import { coverageEnabled } from '~/composables/navigation'
1212
1313
// TODO: better handling of "opened" - it means to forcefully open the tree item and set in TasksList right now

packages/ui/client/components/views/ViewModuleGraph.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<script setup lang="ts">
22
import type { ResizeContext } from 'd3-graph-controller'
33
import type { Selection } from 'd3-selection'
4-
import {
5-
defineGraphConfig,
6-
GraphController,
7-
Markers,
8-
PositionInitializers,
9-
} from 'd3-graph-controller'
10-
import { isReport } from '~/composables/client'
114
import type {
125
ModuleGraph,
136
ModuleGraphController,
147
ModuleLink,
158
ModuleNode,
169
ModuleType,
1710
} from '~/composables/module-graph'
11+
import {
12+
defineGraphConfig,
13+
GraphController,
14+
Markers,
15+
PositionInitializers,
16+
} from 'd3-graph-controller'
17+
import { isReport } from '~/composables/client'
1818
1919
const props = defineProps<{
2020
graph: ModuleGraph

packages/ui/client/composables/explorer/collapse.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type { UITaskTreeNode } from '~/composables/explorer/types'
12
import { explorerTree } from '~/composables/explorer/index'
23
import { openedTreeItems, treeFilter, uiEntries } from '~/composables/explorer/state'
3-
import type { UITaskTreeNode } from '~/composables/explorer/types'
44
import { isFileNode, isParentNode } from '~/composables/explorer/utils'
55

66
/**

packages/ui/client/composables/explorer/collector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { Custom, File, Task, TaskResultPack, Test } from '@vitest/runner'
22
import type { Arrayable } from '@vitest/utils'
3+
import type { CollectFilteredTests, CollectorInfo, Filter, FilteredTests } from '~/composables/explorer/types'
34
import { isAtomTest } from '@vitest/runner/utils'
45
import { toArray } from '@vitest/utils'
56
import { hasFailedSnapshot } from '@vitest/ws-client'
@@ -14,7 +15,6 @@ import {
1415
uiEntries,
1516
uiFiles,
1617
} from '~/composables/explorer/state'
17-
import type { CollectFilteredTests, CollectorInfo, Filter, FilteredTests } from '~/composables/explorer/types'
1818
import {
1919
createOrUpdateFileNode,
2020
createOrUpdateNodeTask,

packages/ui/client/composables/explorer/expand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import type { Filter, UITaskTreeNode } from '~/composables/explorer/types'
12
import { findById } from '~/composables/client'
23
import { filterAll, filterNode } from '~/composables/explorer/filter'
34
import { explorerTree } from '~/composables/explorer/index'
45
import { filteredFiles, openedTreeItems, treeFilter, uiEntries } from '~/composables/explorer/state'
5-
import type { Filter, UITaskTreeNode } from '~/composables/explorer/types'
66
import { createOrUpdateNode, createOrUpdateSuiteTask, isFileNode, isParentNode } from '~/composables/explorer/utils'
77

88
/**

packages/ui/client/composables/explorer/filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { Task } from '@vitest/runner'
2+
import type { FileTreeNode, Filter, FilterResult, ParentTreeNode, UITaskTreeNode } from '~/composables/explorer/types'
23
import { client, findById } from '~/composables/client'
34
import { explorerTree } from '~/composables/explorer/index'
45
import { filteredFiles, uiEntries } from '~/composables/explorer/state'
5-
import type { FileTreeNode, Filter, FilterResult, ParentTreeNode, UITaskTreeNode } from '~/composables/explorer/types'
66
import {
77
isFileNode,
88
isParentNode,

packages/ui/client/composables/explorer/tree.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
import type { File, TaskResultPack } from '@vitest/runner'
2+
import type {
3+
CollectorInfo,
4+
FilteredTests,
5+
RootTreeNode,
6+
UITaskTreeNode,
7+
} from '~/composables/explorer/types'
28
import { runCollapseAllTask, runCollapseNode } from '~/composables/explorer/collapse'
39
import { collectTestsTotalData, preparePendingTasks, runCollect, runLoadFiles } from '~/composables/explorer/collector'
410
import { runExpandAll, runExpandNode } from '~/composables/explorer/expand'
@@ -7,12 +13,6 @@ import {
713
filter,
814
search,
915
} from '~/composables/explorer/state'
10-
import type {
11-
CollectorInfo,
12-
FilteredTests,
13-
RootTreeNode,
14-
UITaskTreeNode,
15-
} from '~/composables/explorer/types'
1616

1717
export class ExplorerTree {
1818
private rafCollector: ReturnType<typeof useRafFn>

packages/ui/client/composables/explorer/utils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
import type { File, Task } from '@vitest/runner'
2-
import { isAtomTest } from '@vitest/runner/utils'
3-
import { client } from '~/composables/client'
4-
import { explorerTree } from '~/composables/explorer/index'
5-
import { openedTreeItemsSet } from '~/composables/explorer/state'
62
import type {
73
CustomTestTreeNode,
84
FileTreeNode,
@@ -11,6 +7,10 @@ import type {
117
TestTreeNode,
128
UITaskTreeNode,
139
} from '~/composables/explorer/types'
10+
import { isAtomTest } from '@vitest/runner/utils'
11+
import { client } from '~/composables/client'
12+
import { explorerTree } from '~/composables/explorer/index'
13+
import { openedTreeItemsSet } from '~/composables/explorer/state'
1414
import { getProjectNameColor, isSuite as isTaskSuite } from '~/utils/task'
1515

1616
export function isTestNode(node: UITaskTreeNode): node is TestTreeNode | CustomTestTreeNode {

packages/utils/src/diff/cleanupSemantic.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,8 @@ function diff_cleanupSemanticScore_(one: string, two: string): number {
610610
}
611611

612612
export {
613-
Diff,
614613
diff_cleanupSemantic as cleanupSemantic,
614+
Diff,
615615
DIFF_DELETE,
616616
DIFF_EQUAL,
617617
DIFF_INSERT,

packages/utils/src/diff/diffLines.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ export function printDiffLines(
9595
+ (options.expand
9696
? joinAlignedDiffsExpand(diffs, options)
9797
: joinAlignedDiffsNoExpand(diffs, options))
98-
+ (truncated
99-
? options.truncateAnnotationColor(`\n${options.truncateAnnotation}`)
100-
: '')
98+
+ (truncated
99+
? options.truncateAnnotationColor(`\n${options.truncateAnnotation}`)
100+
: '')
101101
)
102102
}
103103

packages/vitest/src/node/plugins/cssEnabler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export function CSSEnablerPlugin(ctx: {
8181
const scopeStrategy
8282
= (typeof ctx.config.css !== 'boolean'
8383
&& ctx.config.css.modules?.classNameStrategy)
84-
|| 'stable'
84+
|| 'stable'
8585
const proxyReturn = getCSSModuleProxyReturn(
8686
scopeStrategy,
8787
relative(ctx.config.root, id),

packages/vitest/src/node/plugins/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export async function VitestPlugin(
203203
const classNameStrategy
204204
= (typeof testConfig.css !== 'boolean'
205205
&& testConfig.css?.modules?.classNameStrategy)
206-
|| 'stable'
206+
|| 'stable'
207207

208208
if (classNameStrategy !== 'scoped') {
209209
config.css ??= {}

packages/vitest/src/node/plugins/workspace.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export function WorkspaceVitestPlugin(
118118
const classNameStrategy
119119
= (typeof testConfig.css !== 'boolean'
120120
&& testConfig.css?.modules?.classNameStrategy)
121-
|| 'stable'
121+
|| 'stable'
122122

123123
if (classNameStrategy !== 'scoped') {
124124
config.css ??= {}

packages/vitest/src/public/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,27 +277,27 @@ export {
277277
test,
278278
} from '@vitest/runner'
279279
export type {
280-
Custom as RunnerCustomCase,
281280
ExtendedContext,
282-
File as RunnerTestFile,
283281
HookCleanupCallback,
284282
HookListener,
285283
OnTestFailedHandler,
286284
OnTestFinishedHandler,
287285
RunMode,
286+
Custom as RunnerCustomCase,
287+
Task as RunnerTask,
288+
TaskBase as RunnerTaskBase,
289+
TaskResult as RunnerTaskResult,
290+
TaskResultPack as RunnerTaskResultPack,
291+
Test as RunnerTestCase,
292+
File as RunnerTestFile,
288293
Suite as RunnerTestSuite,
289294
SuiteAPI,
290295
SuiteCollector,
291296
SuiteFactory,
292-
Task as RunnerTask,
293-
TaskBase as RunnerTaskBase,
294297
TaskContext,
295298
TaskCustomOptions,
296299
TaskMeta,
297-
TaskResult as RunnerTaskResult,
298-
TaskResultPack as RunnerTaskResultPack,
299300
TaskState,
300-
Test as RunnerTestCase,
301301
TestAPI,
302302
TestContext,
303303
TestFunction,

packages/vitest/src/public/node.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export { startVitest } from '../node/cli/cli-api'
77
export { resolveApiServerConfig, resolveConfig } from '../node/config/resolveConfig'
88
export type { Vitest } from '../node/core'
99
export { createVitest } from '../node/create'
10-
export { FilesNotFoundError as TestsNotFoundError, GitNotFoundError } from '../node/errors'
10+
export { GitNotFoundError, FilesNotFoundError as TestsNotFoundError } from '../node/errors'
1111
export type { GlobalSetupContext } from '../node/globalSetup'
1212
export { VitestPackageInstaller } from '../node/packageInstaller'
1313
export { VitestPlugin } from '../node/plugins'
@@ -122,9 +122,9 @@ export type {
122122
CollectLineNumbers as TypeCheckCollectLineNumbers,
123123
CollectLines as TypeCheckCollectLines,
124124
Context as TypeCheckContext,
125+
TscErrorInfo as TypeCheckErrorInfo,
125126
RawErrsMap as TypeCheckRawErrorsMap,
126127
RootAndTarget as TypeCheckRootAndTarget,
127-
TscErrorInfo as TypeCheckErrorInfo,
128128
} from '../typecheck/types'
129129

130130
export type {

packages/ws-client/src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { BirpcOptions, BirpcReturn } from 'birpc'
2-
import { createBirpc } from 'birpc'
3-
import { parse, stringify } from 'flatted'
4-
52
// eslint-disable-next-line no-restricted-imports
63
import type { WebSocketEvents, WebSocketHandlers } from 'vitest'
4+
import { createBirpc } from 'birpc'
5+
6+
import { parse, stringify } from 'flatted'
77
import { StateManager } from './state'
88

99
export * from '../../vitest/src/utils/tasks'

0 commit comments

Comments
 (0)