Skip to content

Commit ebc8f2c

Browse files
antfuantfu
committedJul 27, 2024
feat: upgrade @types/eslint
·
v1.3.0v0.4.0
1 parent 417063e commit ebc8f2c

File tree

25 files changed

+6711
-5053
lines changed

25 files changed

+6711
-5053
lines changed
 

‎docs/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nuxt-eslint-docs",
3-
"packageManager": "pnpm@9.1.1",
3+
"packageManager": "pnpm@9.6.0",
44
"private": true,
55
"scripts": {
66
"dev": "nuxi dev",
@@ -10,18 +10,18 @@
1010
},
1111
"dependencies": {
1212
"@iconify-json/ph": "^1.1.13",
13-
"@iconify-json/simple-icons": "^1.1.102",
14-
"@nuxt/content": "^2.12.1",
13+
"@iconify-json/simple-icons": "^1.1.110",
14+
"@nuxt/content": "^2.13.2",
1515
"@nuxt/devtools": "1.3.1",
16-
"@nuxt/fonts": "^0.7.0",
16+
"@nuxt/fonts": "^0.7.1",
1717
"@nuxt/image": "1.7.0",
18-
"@nuxt/ui-pro": "^1.2.0",
19-
"@nuxthq/studio": "^1.1.0",
18+
"@nuxt/ui-pro": "^1.3.1",
19+
"@nuxthq/studio": "^2.0.3",
2020
"@nuxtjs/plausible": "^1.0.0",
21-
"@vueuse/core": "^10.9.0",
22-
"@vueuse/nuxt": "^10.9.0",
23-
"nuxt": "^3.11.2",
24-
"nuxt-og-image": "^3.0.0-rc.53"
21+
"@vueuse/core": "^10.11.0",
22+
"@vueuse/nuxt": "^10.11.0",
23+
"nuxt": "^3.12.4",
24+
"nuxt-og-image": "^3.0.0-rc.64"
2525
},
2626
"resolutions": {
2727
"@nuxt/ui": "2.15.2"

‎docs/pnpm-lock.yaml

+3,437-1,722
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"type": "module",
4-
"packageManager": "pnpm@9.1.1",
4+
"packageManager": "pnpm@9.6.0",
55
"version": "0.3.13",
66
"scripts": {
77
"build": "pnpm run -r build",
@@ -19,16 +19,16 @@
1919
},
2020
"devDependencies": {
2121
"@iconify-json/ph": "^1.1.13",
22-
"@iconify-json/simple-icons": "^1.1.101",
22+
"@iconify-json/simple-icons": "^1.1.110",
2323
"@nuxt/eslint-config": "workspace:*",
2424
"@nuxt/eslint-plugin": "workspace:*",
25-
"@nuxt/test-utils": "^3.13.0",
26-
"@types/eslint": "^8.56.10",
27-
"@types/node": "^20.12.12",
25+
"@nuxt/test-utils": "^3.14.0",
26+
"@types/eslint": "^9.6.0",
27+
"@types/node": "^20.14.12",
2828
"bumpp": "^9.4.1",
29-
"eslint": "^9.2.0",
30-
"typescript": "^5.4.5",
31-
"vitest": "^1.6.0",
32-
"vue": "^3.4.27"
29+
"eslint": "^9.8.0",
30+
"typescript": "^5.5.4",
31+
"vitest": "^2.0.4",
32+
"vue": "^3.4.34"
3333
}
3434
}

‎packages-legacy/nuxt2-eslint-config-typescript/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
],
1010
"dependencies": {
1111
"@nuxtjs/eslint-config": "^12.0.0",
12-
"@typescript-eslint/eslint-plugin": "^7.9.0",
13-
"@typescript-eslint/parser": "^7.9.0",
12+
"@typescript-eslint/eslint-plugin": "^7.17.0",
13+
"@typescript-eslint/parser": "^7.17.0",
1414
"eslint-import-resolver-typescript": "^3.6.1",
1515
"eslint-plugin-import": "^2.29.1",
16-
"eslint-plugin-vue": "^9.26.0"
16+
"eslint-plugin-vue": "^9.27.0"
1717
},
1818
"peerDependencies": {
1919
"eslint": "^8.57.0"
2020
},
2121
"devDependencies": {
22-
"typescript": "^5.4.5"
22+
"typescript": "^5.5.4"
2323
}
2424
}

‎packages-legacy/nuxt2-eslint-config/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"dependencies": {
1111
"eslint-config-standard": "^17.1.0",
1212
"eslint-plugin-import": "^2.29.1",
13-
"eslint-plugin-n": "^17.7.0",
14-
"eslint-plugin-promise": "^6.1.1",
15-
"eslint-plugin-unicorn": "^53.0.0",
16-
"eslint-plugin-vue": "^9.26.0",
13+
"eslint-plugin-n": "^17.10.1",
14+
"eslint-plugin-promise": "^7.0.0",
15+
"eslint-plugin-unicorn": "^55.0.0",
16+
"eslint-plugin-vue": "^9.27.0",
1717
"local-pkg": "^0.5.0"
1818
},
1919
"peerDependencies": {

‎packages/eslint-config/package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,27 @@
5151
"eslint": "^8.57.0 || ^9.0.0"
5252
},
5353
"dependencies": {
54-
"@eslint/js": "^9.2.0",
54+
"@eslint/js": "^9.8.0",
5555
"@nuxt/eslint-plugin": "workspace:*",
56-
"@rushstack/eslint-patch": "^1.10.3",
57-
"@stylistic/eslint-plugin": "^2.1.0",
58-
"@typescript-eslint/eslint-plugin": "^7.9.0",
59-
"@typescript-eslint/parser": "^7.9.0",
60-
"eslint-config-flat-gitignore": "^0.1.5",
61-
"eslint-flat-config-utils": "^0.2.5",
62-
"eslint-plugin-import-x": "^0.5.0",
63-
"eslint-plugin-jsdoc": "^48.2.5",
64-
"eslint-plugin-regexp": "^2.5.0",
65-
"eslint-plugin-unicorn": "^53.0.0",
66-
"eslint-plugin-vue": "^9.26.0",
67-
"globals": "^15.2.0",
56+
"@rushstack/eslint-patch": "^1.10.4",
57+
"@stylistic/eslint-plugin": "^2.4.0",
58+
"@typescript-eslint/eslint-plugin": "^7.17.0",
59+
"@typescript-eslint/parser": "^7.17.0",
60+
"eslint-config-flat-gitignore": "^0.1.8",
61+
"eslint-flat-config-utils": "^0.3.0",
62+
"eslint-plugin-import-x": "^3.1.0",
63+
"eslint-plugin-jsdoc": "^48.8.3",
64+
"eslint-plugin-regexp": "^2.6.0",
65+
"eslint-plugin-unicorn": "^55.0.0",
66+
"eslint-plugin-vue": "^9.27.0",
67+
"globals": "^15.8.0",
6868
"pathe": "^1.1.2",
69-
"tslib": "^2.6.2",
70-
"vue-eslint-parser": "^9.4.2"
69+
"tslib": "^2.6.3",
70+
"vue-eslint-parser": "^9.4.3"
7171
},
7272
"devDependencies": {
73-
"@types/eslint": "^8.56.10",
74-
"eslint": "^9.2.0",
75-
"typescript": "^5.4.5"
73+
"@types/eslint": "^9.6.0",
74+
"eslint": "^9.8.0",
75+
"typescript": "^5.5.4"
7676
}
7777
}

‎packages/eslint-config/src/flat/configs-tooling/jsdoc.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import jsdocPlugin from 'eslint-plugin-jsdoc'
33
import { resolveOptions } from '../utils'
44
import type { NuxtESLintConfigOptions } from '../types'
55

6-
export default function jsdoc(options: NuxtESLintConfigOptions = {}): Linter.FlatConfig[] {
6+
export default function jsdoc(options: NuxtESLintConfigOptions = {}): Linter.Config[] {
77
const resolved = resolveOptions(options)
88

99
return [

‎packages/eslint-config/src/flat/configs-tooling/regexp.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { Linter } from 'eslint'
22
import { configs } from 'eslint-plugin-regexp'
33

4-
export default function regexp(): Linter.FlatConfig[] {
4+
export default function regexp(): Linter.Config[] {
55
return [
66
{
7-
...configs['flat/recommended'] as Linter.FlatConfig,
7+
...configs['flat/recommended'] as Linter.Config,
88
name: 'nuxt/tooling/regexp',
99
},
1010
]

‎packages/eslint-config/src/flat/configs-tooling/unicorn.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
// @ts-expect-error missing types
21
import pluginUnicorn from 'eslint-plugin-unicorn'
32
import type { Linter } from 'eslint'
43

5-
export default function unicorn(): Linter.FlatConfig[] {
4+
export default function unicorn(): Linter.Config[] {
65
return [
76
{
87
name: 'nuxt/tooling/unicorn',

‎packages/eslint-config/src/flat/configs/disables.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { GLOB_EXTS } from '../constants'
44
import type { NuxtESLintConfigOptions } from '../types'
55
import { resolveOptions } from '../utils'
66

7-
export default function disables(options: NuxtESLintConfigOptions): Linter.FlatConfig[] {
7+
export default function disables(options: NuxtESLintConfigOptions): Linter.Config[] {
88
const resolved = resolveOptions(options)
99
const dirs = resolved.dirs
1010
const nestedGlobPattern = `**/*.${GLOB_EXTS}`
@@ -26,7 +26,7 @@ export default function disables(options: NuxtESLintConfigOptions): Linter.FlatC
2626
...(dirs.componentsPrefixed.map(componentsDir => join(componentsDir, nestedGlobPattern)) || []),
2727
])]
2828

29-
const configs: Linter.FlatConfig[] = []
29+
const configs: Linter.Config[] = []
3030

3131
if (fileRoutes.length) {
3232
configs.push({

‎packages/eslint-config/src/flat/configs/ignores.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Linter } from 'eslint'
22

3-
export default function ignores(): Linter.FlatConfig[] {
3+
export default function ignores(): Linter.Config[] {
44
return [
55
{
66
ignores: [

‎packages/eslint-config/src/flat/configs/import.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { Linter } from 'eslint'
33
import type { NuxtESLintConfigOptions } from '../types'
44
import { resolveOptions } from '../utils'
55

6-
export default function imports(options: NuxtESLintConfigOptions): Linter.FlatConfig[] {
6+
export default function imports(options: NuxtESLintConfigOptions): Linter.Config[] {
77
const resolved = resolveOptions(options)
88

99
return [

‎packages/eslint-config/src/flat/configs/javascript.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import pluginESLint from '@eslint/js'
33
import type { Linter } from 'eslint'
44
import globals from 'globals'
55

6-
export default function javascript(): Linter.FlatConfig[] {
6+
export default function javascript(): Linter.Config[] {
77
return [
88
{
99
...pluginESLint.configs.recommended,

‎packages/eslint-config/src/flat/configs/nuxt.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { NuxtESLintConfigOptions } from '../types'
55
import { GLOB_EXTS } from '../constants'
66
import { resolveOptions } from '../utils'
77

8-
export default function nuxt(options: NuxtESLintConfigOptions): Linter.FlatConfig[] {
8+
export default function nuxt(options: NuxtESLintConfigOptions): Linter.Config[] {
99
const resolved = resolveOptions(options)
1010
const dirs = resolved.dirs
1111

@@ -14,7 +14,7 @@ export default function nuxt(options: NuxtESLintConfigOptions): Linter.FlatConfi
1414
...(dirs.pages?.map(pagesDir => join(pagesDir, `**/*.${GLOB_EXTS}`)) || []),
1515
]
1616

17-
const configs: Linter.FlatConfig[] = []
17+
const configs: Linter.Config[] = []
1818

1919
configs.push({
2020
name: 'nuxt/configs',

‎packages/eslint-config/src/flat/configs/stylistic.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import stylistic from '@stylistic/eslint-plugin'
22
import type { StylisticCustomizeOptions } from '@stylistic/eslint-plugin'
3+
import type { Linter } from 'eslint'
34

4-
export default (options?: StylisticCustomizeOptions<true>) => {
5+
export default (options?: StylisticCustomizeOptions<true>): Linter.Config => {
56
return {
67
name: 'nuxt/stylistic',
7-
...stylistic.configs.customize(options),
8+
...stylistic.configs.customize(options) as Linter.Config,
89
}
910
}

‎packages/eslint-config/src/flat/configs/typescript.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Linter } from 'eslint'
44
import type { NuxtESLintConfigOptions } from '@nuxt/eslint-config/flat'
55
import { resolveOptions } from '../utils'
66

7-
export default function typescript(options: NuxtESLintConfigOptions): Linter.FlatConfig[] {
7+
export default function typescript(options: NuxtESLintConfigOptions): Linter.Config[] {
88
const resolved = resolveOptions(options)
99

1010
if (resolved.features.typescript === false) {

‎packages/eslint-config/src/flat/configs/vue.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { removeUndefined, resolveOptions } from '../utils'
1010
// imported from 'eslint-plugin-vue/lib/utils/inline-non-void-elements.json'
1111
const INLINE_ELEMENTS = ['a', 'abbr', 'audio', 'b', 'bdi', 'bdo', 'canvas', 'cite', 'code', 'data', 'del', 'dfn', 'em', 'i', 'iframe', 'ins', 'kbd', 'label', 'map', 'mark', 'noscript', 'object', 'output', 'picture', 'q', 'ruby', 's', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'svg', 'time', 'u', 'var', 'video']
1212

13-
export default function vue(options: NuxtESLintConfigOptions): Linter.FlatConfig[] {
13+
export default function vue(options: NuxtESLintConfigOptions): Linter.Config[] {
1414
const resolved = resolveOptions(options)
1515
const hasTs = resolved.features.typescript !== false
1616

‎packages/eslint-config/src/flat/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export { resolveOptions }
2121
*/
2222
export function defineFlatConfigs(
2323
...configs: ResolvableFlatConfig[]
24-
): FlatConfigComposer<Linter.FlatConfig> {
24+
): FlatConfigComposer<Linter.Config> {
2525
return composer(...configs)
2626
}
2727

@@ -35,7 +35,7 @@ export function defineFlatConfigs(
3535
export function createConfigForNuxt(
3636
options: NuxtESLintConfigOptions = {},
3737
...userConfigs: ResolvableFlatConfig[]
38-
): FlatConfigComposer<Linter.FlatConfig> {
38+
): FlatConfigComposer<Linter.Config> {
3939
const c = composer()
4040

4141
const resolved = resolveOptions(options)

‎packages/eslint-config/test/flat-compose.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { createConfigForNuxt } from '../src/flat'
44

55
const cwd = process.cwd()
66

7-
function getFlatConfigDigest(configs: Linter.FlatConfig[]) {
7+
function getFlatConfigDigest(configs: Linter.Config[]) {
88
return configs.map((config) => {
99
return JSON.parse(JSON.stringify({
1010
name: config.name,

‎packages/eslint-config/test/legacy.test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { fileURLToPath } from 'node:url'
22
import { it, expect, describe } from 'vitest'
3-
// @ts-expect-error missing types
43
import { loadESLint } from 'eslint'
54

65
describe('eslint-config', () => {

‎packages/eslint-plugin/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"eslint": "^8.57.0 || ^9.0.0"
3232
},
3333
"dependencies": {
34-
"@typescript-eslint/types": "^7.9.0",
35-
"@typescript-eslint/utils": "^7.9.0"
34+
"@typescript-eslint/types": "^7.17.0",
35+
"@typescript-eslint/utils": "^7.17.0"
3636
}
3737
}

‎packages/module/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,26 @@
4848
}
4949
},
5050
"dependencies": {
51-
"@eslint/config-inspector": "^0.4.8",
52-
"@nuxt/devtools-kit": "^1.3.1",
51+
"@eslint/config-inspector": "^0.5.2",
52+
"@nuxt/devtools-kit": "^1.3.9",
5353
"@nuxt/eslint-config": "workspace:*",
5454
"@nuxt/eslint-plugin": "workspace:*",
55-
"@nuxt/kit": "^3.11.2",
55+
"@nuxt/kit": "^3.12.4",
5656
"chokidar": "^3.6.0",
57-
"eslint-flat-config-utils": "^0.2.4",
58-
"eslint-typegen": "^0.2.4",
57+
"eslint-flat-config-utils": "^0.3.0",
58+
"eslint-typegen": "^0.3.0",
5959
"find-up": "^7.0.0",
6060
"get-port-please": "^3.1.2",
61-
"mlly": "^1.7.0",
61+
"mlly": "^1.7.1",
6262
"pathe": "^1.1.2",
63-
"unimport": "^3.7.1"
63+
"unimport": "^3.9.1"
6464
},
6565
"devDependencies": {
66-
"@nuxt/module-builder": "^0.6.0",
67-
"@nuxt/schema": "^3.11.2",
68-
"@typescript-eslint/scope-manager": "^7.9.0",
69-
"eslint-webpack-plugin": "^4.1.0",
70-
"nuxt": "^3.11.2",
66+
"@nuxt/module-builder": "^0.8.1",
67+
"@nuxt/schema": "^3.12.4",
68+
"@typescript-eslint/scope-manager": "^7.17.0",
69+
"eslint-webpack-plugin": "^4.2.0",
70+
"nuxt": "^3.12.4",
7171
"vite-plugin-eslint2": "^4.4.0"
7272
}
7373
}

‎packages/module/src/modules/config/addons/globals.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function createAddonGlobals(nuxt: Nuxt): ESLintConfigGenAddon {
1616
return {
1717
configs: [
1818
'// Set globals from imports registry\n'
19-
+ JSON.stringify(<Linter.FlatConfig>{
19+
+ JSON.stringify(<Linter.Config>{
2020
name: 'nuxt/import-globals',
2121
languageOptions: {
2222
globals: Object.fromEntries((await unimport.getImports()).map(i => [i.as || i.name, 'readonly'])),

‎playground/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"lint": "nuxi prepare && eslint ."
99
},
1010
"devDependencies": {
11-
"nuxt": "^3.11.2"
11+
"nuxt": "^3.12.4"
1212
}
1313
}

‎pnpm-lock.yaml

+3,194-3,250
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.