Merge branch 'master' into update-props-no-destructure-rule

Author: FloEdelmann

.circleci/config.yml

@@ -98,7 +98,7 @@ jobs:
 
   lint:
     docker:
-      - image: node:14
+      - image: node:16
     steps:
       - run:
           name: Versions

.markdownlint.yml

@@ -1,4 +1,5 @@
 line-length: false
+link-fragments: false
 single-title: false
 no-inline-html:
   allowed_elements:

docs/rules/experimental-script-setup-vars.md

@@ -9,7 +9,7 @@ since: v7.0.0
 
 > prevent variables defined in `<script setup>` to be marked as undefined
 
-- :no_entry_sign: This rule was **removed** in eslint-plugin-vue v9.0.0.
+- :no_entry: This rule was **removed** in eslint-plugin-vue v9.0.0.
 
 This rule will find variables defined in `<script setup="args">` and mark them as defined variables.
 

docs/rules/index.md

@@ -226,6 +226,7 @@ For example:
 | [vue/next-tick-style](./next-tick-style.md) | enforce Promise or callback style in `nextTick` | :wrench: | :hammer: |
 | [vue/no-bare-strings-in-template](./no-bare-strings-in-template.md) | disallow the use of bare strings in `<template>` |  | :hammer: |
 | [vue/no-boolean-default](./no-boolean-default.md) | disallow boolean defaults | :wrench: | :hammer: |
+| [vue/no-deprecated-model-definition](./no-deprecated-model-definition.md) | disallow deprecated `model` definition (in Vue.js 3.0.0+) | :bulb: | :warning: |
 | [vue/no-duplicate-attr-inheritance](./no-duplicate-attr-inheritance.md) | enforce `inheritAttrs` to be set to `false` when using `v-bind="$attrs"` |  | :hammer: |
 | [vue/no-empty-component-block](./no-empty-component-block.md) | disallow the `<template>` `<script>` `<style>` block to be empty |  | :hammer: |
 | [vue/no-multiple-objects-in-class](./no-multiple-objects-in-class.md) | disallow to pass multiple objects into array to class |  | :hammer: |
@@ -330,7 +331,7 @@ The following rules extend the rules provided by ESLint itself and apply them to
 
 ## Deprecated
 
-- :warning: We're going to remove deprecated rules in the next major release. Please migrate to successor/new rules.
+- :no_entry_sign: We're going to remove deprecated rules in the next major release. Please migrate to successor/new rules.
 - :innocent: We don't fix bugs which are in deprecated rules since we don't have enough resources.
 
 | Rule ID | Replaced by |
@@ -341,7 +342,7 @@ The following rules extend the rules provided by ESLint itself and apply them to
 
 ## Removed
 
-- :no_entry_sign: These rules have been removed in a previous major release, after they have been deprecated for a while.
+- :no_entry: These rules have been removed in a previous major release, after they have been deprecated for a while.
 
 | Rule ID | Replaced by | Deprecated in version  | Removed in version |
 |:--------|:------------|:-----------------------|:-------------------|

docs/rules/name-property-casing.md

@@ -9,7 +9,7 @@ since: v3.8.0
 
 > enforce specific casing for the name property in Vue components
 
-- :no_entry_sign: This rule was **removed** in eslint-plugin-vue v9.0.0 and replaced by [vue/component-definition-name-casing](component-definition-name-casing.md) rule.
+- :no_entry: This rule was **removed** in eslint-plugin-vue v9.0.0 and replaced by [vue/component-definition-name-casing](component-definition-name-casing.md) rule.
 
 ## :book: Rule Details
 

docs/rules/no-confusing-v-for-v-if.md

@@ -9,7 +9,7 @@ since: v3.0.0
 
 > disallow confusing `v-for` and `v-if` on the same element
 
-- :no_entry_sign: This rule was **removed** in eslint-plugin-vue v9.0.0 and replaced by [vue/no-use-v-if-with-v-for](no-use-v-if-with-v-for.md) rule.
+- :no_entry: This rule was **removed** in eslint-plugin-vue v9.0.0 and replaced by [vue/no-use-v-if-with-v-for](no-use-v-if-with-v-for.md) rule.
 
 ## :book: Rule Details
 

docs/rules/no-deprecated-model-definition.md

@@ -0,0 +1,76 @@
+---
+pageClass: rule-details
+sidebarDepth: 0
+title: vue/no-deprecated-model-definition
+description: disallow deprecated `model` definition (in Vue.js 3.0.0+)
+---
+# vue/no-deprecated-model-definition
+
+> disallow deprecated `model` definition (in Vue.js 3.0.0+)
+
+- :exclamation: <badge text="This rule has not been released yet." vertical="middle" type="error"> ***This rule has not been released yet.*** </badge>
+- :bulb: Some problems reported by this rule are manually fixable by editor [suggestions](https://eslint.org/docs/developer-guide/working-with-rules#providing-suggestions).
+
+## :book: Rule Details
+
+This rule reports use of the component `model` option, which has been deprecated in Vue.js 3.0.0+.
+
+See [Migration Guide – `v-model`](https://v3-migration.vuejs.org/breaking-changes/v-model.html) for more details.
+
+<eslint-code-block :rules="{'vue/no-deprecated-model-definition': ['error']}">
+
+```vue
+<script>
+export default defineComponent({
+  model: {
+    prop: 'my-value',
+    event: 'input'
+  }
+})
+</script>
+```
+
+</eslint-code-block>
+
+## :wrench: Options
+
+```json
+{
+  "vue/no-deprecated-model-definition": ["error", {
+    "allowVue3Compat": true
+  }]
+}
+```
+
+### `"allowVue3Compat": true`
+
+Allow `model` definitions with prop/event names that match the Vue.js 3.0.0+ `v-model` syntax, e.g. `fooBar`/`update:fooBar`.
+
+<eslint-code-block :rules="{'vue/no-deprecated-model-definition': ['error', { allowVue3Compat: true }]}">
+
+```vue
+<script>
+export default defineComponent({
+  model: {
+    prop: 'fooBar',
+    event: 'update:fooBar'
+  }
+})
+</script>
+```
+
+</eslint-code-block>
+
+## :couple: Related Rules
+
+- [vue/valid-model-definition](./valid-model-definition.md) (for Vue.js 2.x)
+- [vue/no-v-model-argument](./no-v-model-argument.md) (for Vue.js 2.x)
+
+## :books: Further Reading
+
+- [Migration Guide – `v-model`](https://v3-migration.vuejs.org/breaking-changes/v-model.html)
+
+## :mag: Implementation
+
+- [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/no-deprecated-model-definition.js)
+- [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/no-deprecated-model-definition.js)

docs/rules/no-invalid-model-keys.md

@@ -9,7 +9,7 @@ since: v7.9.0
 
 > require valid keys in model option
 
-- :warning: This rule was **deprecated** and replaced by [vue/valid-model-definition](valid-model-definition.md) rule.
+- :no_entry_sign: This rule was **deprecated** and replaced by [vue/valid-model-definition](valid-model-definition.md) rule.
 
 ## :book: Rule Details
 

docs/rules/no-unregistered-components.md

@@ -9,7 +9,7 @@ since: v7.0.0
 
 > disallow using components that are not registered inside templates
 
-- :no_entry_sign: This rule was **removed** in eslint-plugin-vue v9.0.0 and replaced by [vue/no-undef-components](no-undef-components.md) rule.
+- :no_entry: This rule was **removed** in eslint-plugin-vue v9.0.0 and replaced by [vue/no-undef-components](no-undef-components.md) rule.
 
 ## :book: Rule Details
 

docs/rules/script-setup-uses-vars.md

@@ -9,7 +9,7 @@ since: v7.13.0
 
 > prevent `<script setup>` variables used in `<template>` to be marked as unused
 
-- :warning: This rule was **deprecated**.
+- :no_entry_sign: This rule was **deprecated**.
 
 ::: tip
 

docs/rules/v-on-function-call.md

@@ -9,7 +9,7 @@ since: v5.2.0
 
 > enforce or forbid parentheses after method calls without arguments in `v-on` directives
 
-- :warning: This rule was **deprecated** and replaced by [vue/v-on-handler-style](v-on-handler-style.md) rule.
+- :no_entry_sign: This rule was **deprecated** and replaced by [vue/v-on-handler-style](v-on-handler-style.md) rule.
 - :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule.
 
 ## :book: Rule Details

eslint-internal-rules/no-invalid-meta-docs-categories.js

@@ -56,7 +56,7 @@ function checkMetaValidity(context, exportsNode) {
   if (!categories) {
     context.report({
       node: metaDocs,
-      message: 'Rule is missing a meta.docs.categories property.',
+      messageId: 'missingCategories',
       fix(fixer) {
         const category = getPropertyFromObject('category', metaDocs.value)
         if (!category) {
@@ -70,16 +70,16 @@ function checkMetaValidity(context, exportsNode) {
         ) {
           // fixes.push(fixer.insertTextBefore(category.value, '['), fixer.insertTextAfter(category.value, ']'))
 
-          // for vue3 migration
-          if (category.value.value !== 'base') {
+          if (category.value.value === 'base') {
+            fixes.push(fixer.insertTextBefore(category.value, '['))
+          } else {
+            // for vue3 migration
             fixes.push(
               fixer.insertTextBefore(
                 category.value,
                 `['vue3-${category.value.value}', `
               )
             )
-          } else {
-            fixes.push(fixer.insertTextBefore(category.value, '['))
           }
           fixes.push(fixer.insertTextAfter(category.value, ']'))
         }
@@ -98,18 +98,27 @@ function checkMetaValidity(context, exportsNode) {
       categories.value.name === 'undefined'
     )
   ) {
-    context.report(categories.value, 'meta.docs.categories must be an array.')
+    context.report({
+      node: categories.value,
+      messageId: 'categoriesMustBeArray'
+    })
   }
 }
 
 module.exports = {
   meta: {
+    type: 'problem',
     docs: {
       description: 'enforce correct use of `meta` property in core rules',
       categories: ['Internal']
     },
     fixable: 'code',
-    schema: []
+    schema: [],
+    messages: {
+      missingCategories: 'Rule is missing a meta.docs.categories property.',
+      // eslint-disable-next-line eslint-plugin/report-message-format
+      categoriesMustBeArray: 'meta.docs.categories must be an array.'
+    }
   },
 
   create(context) {

eslint-internal-rules/no-invalid-meta.js

@@ -67,32 +67,44 @@ function checkMetaValidity(context, exportsNode) {
   const metaProperty = getMetaPropertyFromExportsNode(exportsNode)
 
   if (!metaProperty) {
-    context.report(exportsNode, 'Rule is missing a meta property.')
+    context.report({
+      node: exportsNode,
+      messageId: 'missingMeta'
+    })
     return
   }
 
   if (!hasMetaDocs(metaProperty)) {
-    context.report(metaProperty, 'Rule is missing a meta.docs property.')
+    context.report({
+      node: 'metaDocs',
+      messageId: 'missingMetaDocs'
+    })
     return
   }
 
   if (!hasMetaDocsCategories(metaProperty)) {
-    context.report(
-      metaProperty,
-      'Rule is missing a meta.docs.categories property.'
-    )
+    context.report({
+      node: metaProperty,
+      messageId: 'missingMetaDocsCategories'
+    })
     return
   }
 }
 
 module.exports = {
   meta: {
+    type: 'problem',
     docs: {
       description: 'enforce correct use of `meta` property in core rules',
       categories: ['Internal']
     },
-
-    schema: []
+    schema: [],
+    messages: {
+      missingMeta: 'Rule is missing a meta property.',
+      missingMetaDocs: 'Rule is missing a meta.docs property.',
+      missingMetaDocsCategories:
+        'Rule is missing a meta.docs.categories property.'
+    }
   },
 
   create(context) {

eslint-internal-rules/require-eslint-community.js

@@ -2,16 +2,17 @@
 
 module.exports = {
   meta: {
+    type: 'problem',
     docs: {
       description: 'enforce use of the `@eslint-community/*` package',
       categories: ['Internal']
     },
     fixable: 'code',
+    schema: [],
     messages: {
       useCommunityPackageInstead:
         'Please use `@eslint-community/{{name}}` instead.'
-    },
-    schema: []
+    }
   },
 
   /** @param {import('eslint').Rule.RuleContext} context */

eslint.config.js

@@ -27,7 +27,7 @@ module.exports = [
   },
   ...eslintrc.plugins('eslint-plugin', 'prettier', 'unicorn'),
   ...eslintrc.extends(
-    'plugin:eslint-plugin/recommended',
+    'plugin:eslint-plugin/all',
     'prettier',
     'plugin:node-dependencies/recommended',
     'plugin:jsonc/recommended-with-jsonc',
@@ -143,8 +143,6 @@ module.exports = [
 
       'prettier/prettier': 'error',
       'eslint-plugin/report-message-format': ['error', "^[A-Z`'{].*\\.$"],
-      'eslint-plugin/prefer-placeholders': 'error',
-      'eslint-plugin/consistent-output': 'error',
 
       'no-debugger': 'error',
       'no-console': 'error',
@@ -169,17 +167,14 @@ module.exports = [
       'unicorn/filename-case': 'off',
       'unicorn/no-null': 'off',
       'unicorn/no-array-callback-reference': 'off', // doesn't work well with TypeScript's custom type guards
-      'unicorn/no-negated-condition': 'off', // remove when there are few pull requests (ref: #2146)
       'unicorn/no-useless-undefined': 'off',
       'unicorn/prefer-optional-catch-binding': 'off', // not supported by current ESLint parser version
       'unicorn/prefer-module': 'off',
       'unicorn/prevent-abbreviations': 'off',
       'unicorn/prefer-at': 'off', //                 turn off to prevent make breaking changes (ref: #2146)
       'unicorn/prefer-node-protocol': 'off', //      turn off to prevent make breaking changes (ref: #2146)
       'unicorn/prefer-string-replace-all': 'off', // turn off to prevent make breaking changes (ref: #2146)
-      'unicorn/prefer-ternary': 'off', //            remove when there are few pull requests (ref: #2146)
       'unicorn/prefer-top-level-await': 'off', //    turn off to prevent make breaking changes (ref: #2146)
-      'unicorn/switch-case-braces': 'off', //        remove when there are few pull requests (ref: #2146)
 
       'internal/require-eslint-community': ['error']
     }
@@ -199,23 +194,20 @@ module.exports = [
   {
     files: ['lib/rules/*.js'],
     rules: {
-      'eslint-plugin/no-deprecated-context-methods': 'error',
-      'eslint-plugin/no-only-tests': 'error',
-      'eslint-plugin/prefer-object-rule': 'error',
-      'eslint-plugin/require-meta-docs-description': 'error',
       'eslint-plugin/require-meta-docs-url': [
         'error',
-        {
-          pattern: `https://eslint.vuejs.org/rules/{{name}}.html`
-        }
+        { pattern: 'https://eslint.vuejs.org/rules/{{name}}.html' }
       ],
-      'eslint-plugin/require-meta-has-suggestions': 'error',
-      'eslint-plugin/require-meta-schema': 'error',
-      'eslint-plugin/require-meta-type': 'error',
       'internal/no-invalid-meta': 'error',
       'internal/no-invalid-meta-docs-categories': 'error'
     }
   },
+  {
+    files: ['eslint-internal-rules/*.js'],
+    rules: {
+      'eslint-plugin/require-meta-docs-url': 'off'
+    }
+  },
   {
     files: ['**/*.json'],
     rules: {

lib/index.js

@@ -79,6 +79,7 @@ module.exports = {
     'no-deprecated-functional-template': require('./rules/no-deprecated-functional-template'),
     'no-deprecated-html-element-is': require('./rules/no-deprecated-html-element-is'),
     'no-deprecated-inline-template': require('./rules/no-deprecated-inline-template'),
+    'no-deprecated-model-definition': require('./rules/no-deprecated-model-definition'),
     'no-deprecated-props-default-this': require('./rules/no-deprecated-props-default-this'),
     'no-deprecated-router-link-tag-prop': require('./rules/no-deprecated-router-link-tag-prop'),
     'no-deprecated-scope-attribute': require('./rules/no-deprecated-scope-attribute'),