Skip to content

Commit 3e8120f

Browse files
authored
Update development dependencies (#2656)
1 parent 926d6e8 commit 3e8120f

6 files changed

+24
-69
lines changed

Diff for: eslint.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ module.exports = [
4545
// turn off some rules from shared configs in all files
4646
{
4747
rules: {
48+
'eslint-plugin/require-meta-default-options': 'off', // TODO: enable when all rules have defaultOptions
4849
'eslint-plugin/require-meta-docs-recommended': 'off', // use `categories` instead
4950
'eslint-plugin/require-meta-schema-description': 'off',
5051

Diff for: lib/rules/html-button-has-type.js

+3-12
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,9 @@ module.exports = {
3535
{
3636
type: 'object',
3737
properties: {
38-
button: {
39-
default: optionDefaults.button,
40-
type: 'boolean'
41-
},
42-
submit: {
43-
default: optionDefaults.submit,
44-
type: 'boolean'
45-
},
46-
reset: {
47-
default: optionDefaults.reset,
48-
type: 'boolean'
49-
}
38+
button: { type: 'boolean' },
39+
submit: { type: 'boolean' },
40+
reset: { type: 'boolean' }
5041
},
5142
additionalProperties: false
5243
}

Diff for: lib/rules/no-irregular-whitespace.js

+6-24
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,12 @@ module.exports = {
3131
{
3232
type: 'object',
3333
properties: {
34-
skipComments: {
35-
type: 'boolean',
36-
default: false
37-
},
38-
skipStrings: {
39-
type: 'boolean',
40-
default: true
41-
},
42-
skipTemplates: {
43-
type: 'boolean',
44-
default: false
45-
},
46-
skipRegExps: {
47-
type: 'boolean',
48-
default: false
49-
},
50-
skipHTMLAttributeValues: {
51-
type: 'boolean',
52-
default: false
53-
},
54-
skipHTMLTextContents: {
55-
type: 'boolean',
56-
default: false
57-
}
34+
skipComments: { type: 'boolean' },
35+
skipStrings: { type: 'boolean' },
36+
skipTemplates: { type: 'boolean' },
37+
skipRegExps: { type: 'boolean' },
38+
skipHTMLAttributeValues: { type: 'boolean' },
39+
skipHTMLTextContents: { type: 'boolean' }
5840
},
5941
additionalProperties: false
6042
}

Diff for: lib/rules/require-macro-variable-name.js

+6-21
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,11 @@ module.exports = {
2828
{
2929
type: 'object',
3030
properties: {
31-
defineProps: {
32-
type: 'string',
33-
default: DEFAULT_OPTIONS.defineProps
34-
},
35-
defineEmits: {
36-
type: 'string',
37-
default: DEFAULT_OPTIONS.defineEmits
38-
},
39-
defineSlots: {
40-
type: 'string',
41-
default: DEFAULT_OPTIONS.defineSlots
42-
},
43-
useSlots: {
44-
type: 'string',
45-
default: DEFAULT_OPTIONS.useSlots
46-
},
47-
useAttrs: {
48-
type: 'string',
49-
default: DEFAULT_OPTIONS.useAttrs
50-
}
31+
defineProps: { type: 'string' },
32+
defineEmits: { type: 'string' },
33+
defineSlots: { type: 'string' },
34+
useSlots: { type: 'string' },
35+
useAttrs: { type: 'string' }
5136
},
5237
additionalProperties: false
5338
}
@@ -60,7 +45,7 @@ module.exports = {
6045
},
6146
/** @param {RuleContext} context */
6247
create(context) {
63-
const options = context.options[0] || DEFAULT_OPTIONS
48+
const options = Object.assign({}, DEFAULT_OPTIONS, context.options[0])
6449
const relevantMacros = new Set([
6550
...Object.keys(DEFAULT_OPTIONS),
6651
'withDefaults'

Diff for: lib/rules/sort-keys.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ module.exports = {
8282
type: 'object',
8383
properties: {
8484
caseSensitive: {
85-
type: 'boolean',
86-
default: true
85+
type: 'boolean'
8786
},
8887
ignoreChildrenOf: {
8988
type: 'array'
@@ -93,16 +92,13 @@ module.exports = {
9392
},
9493
minKeys: {
9594
type: 'integer',
96-
minimum: 2,
97-
default: 2
95+
minimum: 2
9896
},
9997
natural: {
100-
type: 'boolean',
101-
default: false
98+
type: 'boolean'
10299
},
103100
runOutsideVue: {
104-
type: 'boolean',
105-
default: true
101+
type: 'boolean'
106102
}
107103
},
108104
additionalProperties: false
@@ -137,7 +133,7 @@ module.exports = {
137133
(options && options.ignoreChildrenOf) || ['model']
138134
)
139135
const insensitive = options && options.caseSensitive === false
140-
const minKeys = options && options.minKeys
136+
const minKeys = options?.minKeys ?? 2
141137
const natural = options && options.natural
142138
const isValidOrder =
143139
isValidOrders[order + (insensitive ? 'I' : '') + (natural ? 'N' : '')]

Diff for: package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
},
6868
"devDependencies": {
6969
"@ota-meshi/site-kit-eslint-editor-vue": "^0.2.4",
70-
"@stylistic/eslint-plugin": "^2.12.0",
70+
"@stylistic/eslint-plugin": "^2.12.1",
7171
"@types/eslint": "^8.56.2",
7272
"@types/eslint-visitor-keys": "^3.3.2",
7373
"@types/natural-compare": "^1.4.3",
@@ -81,7 +81,7 @@
8181
"esbuild": "^0.24.0",
8282
"eslint": "^8.57.0",
8383
"eslint-config-prettier": "^9.1.0",
84-
"eslint-plugin-eslint-plugin": "~6.3.1",
84+
"eslint-plugin-eslint-plugin": "~6.4.0",
8585
"eslint-plugin-import": "^2.31.0",
8686
"eslint-plugin-jsonc": "^2.16.0",
8787
"eslint-plugin-node-dependencies": "^0.12.0",
@@ -95,7 +95,7 @@
9595
"nyc": "^17.1.0",
9696
"pathe": "^1.1.2",
9797
"prettier": "^3.3.3",
98-
"typescript": "^5.6.3",
98+
"typescript": "^5.7.2",
9999
"vitepress": "^1.4.1"
100100
}
101101
}

0 commit comments

Comments
 (0)