diff --git a/lib/rules/html-button-has-type.js b/lib/rules/html-button-has-type.js
index 31192ec99..b61a008c6 100644
--- a/lib/rules/html-button-has-type.js
+++ b/lib/rules/html-button-has-type.js
@@ -35,18 +35,9 @@ module.exports = {
{
type: 'object',
properties: {
- button: {
- default: optionDefaults.button,
- type: 'boolean'
- },
- submit: {
- default: optionDefaults.submit,
- type: 'boolean'
- },
- reset: {
- default: optionDefaults.reset,
- type: 'boolean'
- }
+ button: { type: 'boolean' },
+ submit: { type: 'boolean' },
+ reset: { type: 'boolean' }
},
additionalProperties: false
}
diff --git a/lib/rules/no-irregular-whitespace.js b/lib/rules/no-irregular-whitespace.js
index 8d3f59c9e..a1705f459 100644
--- a/lib/rules/no-irregular-whitespace.js
+++ b/lib/rules/no-irregular-whitespace.js
@@ -31,30 +31,12 @@ module.exports = {
{
type: 'object',
properties: {
- skipComments: {
- type: 'boolean',
- default: false
- },
- skipStrings: {
- type: 'boolean',
- default: true
- },
- skipTemplates: {
- type: 'boolean',
- default: false
- },
- skipRegExps: {
- type: 'boolean',
- default: false
- },
- skipHTMLAttributeValues: {
- type: 'boolean',
- default: false
- },
- skipHTMLTextContents: {
- type: 'boolean',
- default: false
- }
+ skipComments: { type: 'boolean' },
+ skipStrings: { type: 'boolean' },
+ skipTemplates: { type: 'boolean' },
+ skipRegExps: { type: 'boolean' },
+ skipHTMLAttributeValues: { type: 'boolean' },
+ skipHTMLTextContents: { type: 'boolean' }
},
additionalProperties: false
}
diff --git a/lib/rules/require-macro-variable-name.js b/lib/rules/require-macro-variable-name.js
index f48df6bba..02cb2f5af 100644
--- a/lib/rules/require-macro-variable-name.js
+++ b/lib/rules/require-macro-variable-name.js
@@ -28,26 +28,11 @@ module.exports = {
{
type: 'object',
properties: {
- defineProps: {
- type: 'string',
- default: DEFAULT_OPTIONS.defineProps
- },
- defineEmits: {
- type: 'string',
- default: DEFAULT_OPTIONS.defineEmits
- },
- defineSlots: {
- type: 'string',
- default: DEFAULT_OPTIONS.defineSlots
- },
- useSlots: {
- type: 'string',
- default: DEFAULT_OPTIONS.useSlots
- },
- useAttrs: {
- type: 'string',
- default: DEFAULT_OPTIONS.useAttrs
- }
+ defineProps: { type: 'string' },
+ defineEmits: { type: 'string' },
+ defineSlots: { type: 'string' },
+ useSlots: { type: 'string' },
+ useAttrs: { type: 'string' }
},
additionalProperties: false
}
@@ -60,7 +45,7 @@ module.exports = {
},
/** @param {RuleContext} context */
create(context) {
- const options = context.options[0] || DEFAULT_OPTIONS
+ const options = Object.assign({}, DEFAULT_OPTIONS, context.options[0])
const relevantMacros = new Set([
...Object.keys(DEFAULT_OPTIONS),
'withDefaults'
diff --git a/lib/rules/sort-keys.js b/lib/rules/sort-keys.js
index 9598adf0b..edfa1360b 100644
--- a/lib/rules/sort-keys.js
+++ b/lib/rules/sort-keys.js
@@ -82,8 +82,7 @@ module.exports = {
type: 'object',
properties: {
caseSensitive: {
- type: 'boolean',
- default: true
+ type: 'boolean'
},
ignoreChildrenOf: {
type: 'array'
@@ -93,16 +92,13 @@ module.exports = {
},
minKeys: {
type: 'integer',
- minimum: 2,
- default: 2
+ minimum: 2
},
natural: {
- type: 'boolean',
- default: false
+ type: 'boolean'
},
runOutsideVue: {
- type: 'boolean',
- default: true
+ type: 'boolean'
}
},
additionalProperties: false
@@ -137,7 +133,7 @@ module.exports = {
(options && options.ignoreChildrenOf) || ['model']
)
const insensitive = options && options.caseSensitive === false
- const minKeys = options && options.minKeys
+ const minKeys = options?.minKeys ?? 2
const natural = options && options.natural
const isValidOrder =
isValidOrders[order + (insensitive ? 'I' : '') + (natural ? 'N' : '')]