Merge branch 'master' into feature/#2465_autofix_in_define-props-declaration

Author: mpiniarski

docs/.vitepress/build-system/build.mts

@@ -2,7 +2,7 @@
  * Pre-build cjs packages that cannot be bundled well.
  */
 import esbuild from 'esbuild'
-import path from 'path'
+import path from 'pathe'
 import fs from 'fs'
 import { fileURLToPath } from 'url'
 

docs/.vitepress/config.mts

@@ -1,6 +1,6 @@
 import type { DefaultTheme } from 'vitepress'
 import { defineConfig } from 'vitepress'
-import path from 'path'
+import path from 'pathe'
 import { fileURLToPath } from 'url'
 import { viteCommonjs, vitePluginRequireResolve } from './vite-plugin.mjs'
 
@@ -214,6 +214,10 @@ export default async () => {
         ]
       },
 
+      outline: {
+        level: 'deep'
+      },
+
       algolia: {
         appId: '2L4MGZSULB',
         apiKey: 'fdf57932b27a6c230d01a890492ab76d',

docs/.vitepress/vite-plugin.mts

@@ -1,5 +1,5 @@
 import type { UserConfig } from 'vitepress'
-import path from 'path'
+import path from 'pathe'
 import { fileURLToPath } from 'url'
 import esbuild from 'esbuild'
 type Plugin = Extract<

docs/rules/object-curly-newline.md

@@ -36,4 +36,4 @@ This rule was introduced in eslint-plugin-vue v7.0.0
 - [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/object-curly-newline.js)
 - [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/object-curly-newline.js)
 
-<sup>Taken with ❤️ [from ESLint Stylistic](https://eslint.style/rules/js/object-curly-newline)</sup>
+<sup>Taken with ❤️ [from ESLint Stylistic](https://eslint.style/rules/ts/object-curly-newline)</sup>

docs/rules/object-property-newline.md

@@ -36,4 +36,4 @@ This rule was introduced in eslint-plugin-vue v7.0.0
 - [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/object-property-newline.js)
 - [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/object-property-newline.js)
 
-<sup>Taken with ❤️ [from ESLint Stylistic](https://eslint.style/rules/js/object-property-newline)</sup>
+<sup>Taken with ❤️ [from ESLint Stylistic](https://eslint.style/rules/ts/object-property-newline)</sup>

docs/user-guide/index.md

@@ -146,6 +146,48 @@ If you want to use custom parsers such as [@babel/eslint-parser](https://www.npm
   }
 ```
 
+Full example:
+
+::: code-group
+
+```json [.eslintrc]
+{
+  "root": true,
+  "plugins": ["@typescript-eslint"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:vue/vue3-recommended"
+  ],
+  "parser": "vue-eslint-parser",
+  "parserOptions": {
+    "parser": "@typescript-eslint/parser"
+  }
+}
+```
+
+```js [eslint.config.js]
+import js from '@eslint/js'
+import eslintPluginVue from 'eslint-plugin-vue'
+import ts from 'typescript-eslint'
+
+export default ts.config(
+  js.configs.recommended,
+  ...ts.configs.recommended,
+  ...eslintPluginVue.configs['flat/recommended'],
+  {
+    files: ['*.vue', '**/*.vue'],
+    languageOptions: {
+      parserOptions: {
+        parser: '@typescript-eslint/parser'
+      }
+    }
+  }
+)
+```
+
+:::
+
 The `parserOptions.parser` option can also specify an object to specify multiple parsers. See [vue-eslint-parser README](https://github.com/vuejs/vue-eslint-parser#readme) for more details.
 
 ### How does ESLint detect components?
@@ -441,8 +483,7 @@ In [Nuxt 3](https://nuxt.com/) or with [`unplugin-auto-import`](https://github.c
 
 ::: code-group
 
-```json [Legacy Config]
-// .eslintrc
+```json [.eslintrc]
 {
   "globals": {
     "ref": "readonly",
@@ -454,8 +495,7 @@ In [Nuxt 3](https://nuxt.com/) or with [`unplugin-auto-import`](https://github.c
 }
 ```
 
-```js [Flat Config]
-// eslint.config.js
+```js [eslint.config.js]
 export default [
   {
     languageOptions: {

eslint.config.js

@@ -1,15 +1,12 @@
 'use strict'
 
 const globals = require('globals')
-const { FlatCompat } = require('@eslint/eslintrc')
 const eslintPluginEslintPlugin = require('eslint-plugin-eslint-plugin/configs/all')
+const eslintPluginJsonc = require('eslint-plugin-jsonc')
+const eslintPluginNodeDependencies = require('eslint-plugin-node-dependencies')
 const eslintPluginPrettierRecommended = require('eslint-plugin-prettier/recommended')
 const eslintPluginUnicorn = require('eslint-plugin-unicorn')
 
-const eslintrc = new FlatCompat({
-  baseDirectory: __dirname
-})
-
 module.exports = [
   {
     ignores: [
@@ -30,10 +27,8 @@ module.exports = [
   },
   eslintPluginEslintPlugin,
   eslintPluginUnicorn.configs['flat/recommended'],
-  ...eslintrc.extends(
-    'plugin:node-dependencies/recommended',
-    'plugin:jsonc/recommended-with-jsonc'
-  ),
+  ...eslintPluginNodeDependencies.configs['flat/recommended'],
+  ...eslintPluginJsonc.configs['flat/recommended-with-jsonc'],
   eslintPluginPrettierRecommended,
   {
     plugins: {
@@ -144,6 +139,7 @@ module.exports = [
       'prefer-const': 2,
 
       'prettier/prettier': 'error',
+      'eslint-plugin/require-meta-docs-recommended': 'off', // use `categories` instead
       'eslint-plugin/require-meta-fixable': [
         'error',
         { catchNoFixerButFixableProperty: true }

lib/configs/flat/base.js

@@ -6,6 +6,7 @@
 const globals = require('globals')
 module.exports = [
   {
+    name: 'vue:base:setup',
     plugins: {
       get vue() {
         return require('../../index')
@@ -17,6 +18,7 @@ module.exports = [
     }
   },
   {
+    name: 'vue:base:setup-for-vue',
     files: ['*.vue', '**/*.vue'],
     plugins: {
       get vue() {

lib/configs/flat/vue2-essential.js

@@ -9,6 +9,7 @@ const config = require('./base.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:vue2-essential:rules',
     rules: {
       'vue/multi-word-component-names': 'error',
       'vue/no-arrow-functions-in-watch': 'error',

lib/configs/flat/vue2-recommended.js

@@ -9,6 +9,7 @@ const config = require('./vue2-strongly-recommended.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:vue2-recommended:rules',
     rules: {
       'vue/attributes-order': 'warn',
       'vue/component-tags-order': 'warn',

lib/configs/flat/vue2-strongly-recommended.js

@@ -9,6 +9,7 @@ const config = require('./vue2-essential.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:vue2-strongly-recommended:rules',
     rules: {
       'vue/attribute-hyphenation': 'warn',
       'vue/component-definition-name-casing': 'warn',

lib/configs/flat/vue3-essential.js

@@ -9,6 +9,7 @@ const config = require('./base.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:essential:rules',
     rules: {
       'vue/multi-word-component-names': 'error',
       'vue/no-arrow-functions-in-watch': 'error',

lib/configs/flat/vue3-recommended.js

@@ -9,6 +9,7 @@ const config = require('./vue3-strongly-recommended.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:recommended:rules',
     rules: {
       'vue/attributes-order': 'warn',
       'vue/component-tags-order': 'warn',

lib/configs/flat/vue3-strongly-recommended.js

@@ -9,6 +9,7 @@ const config = require('./vue3-essential.js')
 module.exports = [
   ...config,
   {
+    name: 'vue:strongly-recommended:rules',
     rules: {
       'vue/attribute-hyphenation': 'warn',
       'vue/component-definition-name-casing': 'warn',

lib/rules/attribute-hyphenation.js

@@ -51,7 +51,7 @@ module.exports = {
               allOf: [
                 { type: 'string' },
                 { not: { type: 'string', pattern: ':exit$' } },
-                { not: { type: 'string', pattern: '^\\s*$' } }
+                { not: { type: 'string', pattern: String.raw`^\s*$` } }
               ]
             },
             uniqueItems: true,

lib/rules/html-indent.js

@@ -62,7 +62,7 @@ module.exports = {
               allOf: [
                 { type: 'string' },
                 { not: { type: 'string', pattern: ':exit$' } },
-                { not: { type: 'string', pattern: '^\\s*$' } }
+                { not: { type: 'string', pattern: String.raw`^\s*$` } }
               ]
             },
             uniqueItems: true,

lib/rules/no-invalid-model-keys.js

@@ -13,9 +13,9 @@ module.exports = {
       categories: undefined,
       url: 'https://eslint.vuejs.org/rules/no-invalid-model-keys.html'
     },
-    schema: [],
     deprecated: true,
-    replacedBy: ['valid-model-definition']
+    replacedBy: ['valid-model-definition'],
+    schema: []
   },
   /** @param {RuleContext} context */
   create(context) {

lib/rules/no-restricted-custom-event.js

@@ -155,7 +155,7 @@ module.exports = {
                           sourceCode.text[nameWithLoc.range[0]]
                         }${JSON.stringify(option.suggest)
                           .slice(1, -1)
-                          .replace(/'/gu, "\\'")}${
+                          .replace(/'/gu, String.raw`\'`)}${
                           sourceCode.text[nameWithLoc.range[1] - 1]
                         }`
                       )

lib/rules/no-setup-props-reactivity-loss.js

@@ -79,18 +79,35 @@ module.exports = {
         left.type !== 'ArrayPattern' &&
         left.type !== 'ObjectPattern' &&
         rightNode.type !== 'MemberExpression' &&
-        rightNode.type !== 'ConditionalExpression'
+        rightNode.type !== 'ConditionalExpression' &&
+        rightNode.type !== 'TemplateLiteral'
       ) {
         return
       }
 
-      /** @type {Expression | Super} */
-      let rightId = rightNode
+      if (rightNode.type === 'TemplateLiteral') {
+        rightNode.expressions.some((expression) =>
+          checkMemberAccess(expression, propsReferences, left, right)
+        )
+      } else {
+        checkMemberAccess(rightNode, propsReferences, left, right)
+      }
+    }
+
+    /**
+     * @param {Expression | Super} rightId
+     * @param {ScopePropsReferences} propsReferences
+     * @param {Pattern} left
+     * @param {Expression} right
+     * @return {boolean}
+     */
+    function checkMemberAccess(rightId, propsReferences, left, right) {
       while (rightId.type === 'MemberExpression') {
         rightId = utils.skipChainExpression(rightId.object)
       }
       if (rightId.type === 'Identifier' && propsReferences.refs.has(rightId)) {
         report(left, 'getProperty', propsReferences.scopeName)
+        return true
       }
       if (
         rightId.type === 'ConditionalExpression' &&
@@ -99,7 +116,9 @@ module.exports = {
           isPropsMemberAccessed(rightId.alternate, propsReferences))
       ) {
         report(right, 'getProperty', propsReferences.scopeName)
+        return true
       }
+      return false
     }
 
     /**

lib/rules/no-undef-properties.js

@@ -106,9 +106,9 @@ module.exports = {
   /** @param {RuleContext} context */
   create(context) {
     const options = context.options[0] || {}
-    const ignores = /** @type {string[]} */ (options.ignores || ['/^\\$/']).map(
-      toRegExp
-    )
+    const ignores = /** @type {string[]} */ (
+      options.ignores || [String.raw`/^\$/`]
+    ).map(toRegExp)
     const propertyReferenceExtractor = definePropertyReferenceExtractor(context)
     const programNode = context.getSourceCode().ast
 

lib/rules/order-in-components.js

@@ -259,6 +259,7 @@ module.exports = {
     }
 
     /**
+     * @param {RuleFixer} fixer
      * @param {Property} propertyNode
      * @param {Property} unorderedPropertyNode
      */

lib/rules/require-toggle-inside-transition.js

@@ -6,6 +6,20 @@
 
 const utils = require('../utils')
 
+/**
+ * @param {VDirective} vBindAppear
+ */
+function isValidBindAppear(vBindAppear) {
+  if (
+    vBindAppear.value?.expression &&
+    vBindAppear.value.expression.type === 'Literal'
+  ) {
+    return vBindAppear.value.expression?.value !== false
+  }
+
+  return true
+}
+
 module.exports = {
   meta: {
     type: 'problem',
@@ -35,7 +49,11 @@ module.exports = {
 
       /** @type VElement */ // @ts-expect-error
       const parent = element.parent
-      if (utils.hasAttribute(parent, 'appear')) {
+      const vBindAppear = utils.getDirective(parent, 'bind', 'appear')
+      if (
+        utils.hasAttribute(parent, 'appear') ||
+        (vBindAppear && isValidBindAppear(vBindAppear))
+      ) {
         return
       }
 

lib/rules/script-indent.js

@@ -32,7 +32,7 @@ module.exports = {
               allOf: [
                 { type: 'string' },
                 { not: { type: 'string', pattern: ':exit$' } },
-                { not: { type: 'string', pattern: '^\\s*$' } }
+                { not: { type: 'string', pattern: String.raw`^\s*$` } }
               ]
             },
             uniqueItems: true,

lib/rules/script-setup-uses-vars.js

@@ -28,8 +28,8 @@ module.exports = {
       categories: undefined,
       url: 'https://eslint.vuejs.org/rules/script-setup-uses-vars.html'
     },
-    schema: [],
-    deprecated: true
+    deprecated: true,
+    schema: []
   },
   /**
    * @param {RuleContext} context - The rule context.

lib/rules/v-on-event-hyphenation.js

@@ -30,7 +30,7 @@ module.exports = {
               allOf: [
                 { type: 'string' },
                 { not: { type: 'string', pattern: ':exit$' } },
-                { not: { type: 'string', pattern: '^\\s*$' } }
+                { not: { type: 'string', pattern: String.raw`^\s*$` } }
               ]
             },
             uniqueItems: true,