Merge branch 'master' into cleanup

Author: FloEdelmann

.changeset/rich-bags-turn.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-vue": patch
+---
+
+Fixed false positives for `TSImportType` in `vue/script-indent` rule

CHANGELOG.md

@@ -1,5 +1,11 @@
 # eslint-plugin-vue
 
+## 10.6.1
+
+### Patch Changes
+
+- Fixed false positives for comments outside `<template>` in [`vue/no-multiple-template-root`](https://eslint.vuejs.org/rules/no-multiple-template-root.html) rule ([#2964](https://github.com/vuejs/eslint-plugin-vue/pull/2964))
+
 ## 10.6.0
 
 ### Minor Changes

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

@@ -23,6 +23,7 @@ build(
     'node:fs',
     'semver',
     'fast-glob',
+    'tinyglobby',
     'debug'
   ]
 )

docs/.vitepress/config.mts

@@ -162,6 +162,7 @@ export default async () => {
           tslib: path.join(dirname, '../../node_modules/tslib/tslib.es6.js'),
           globby: path.join(dirname, './build-system/shim/empty.mjs'),
           'fast-glob': path.join(dirname, './build-system/shim/empty.mjs'),
+          tinyglobby: path.join(dirname, './build-system/shim/empty.mjs'),
           module: path.join(dirname, './build-system/shim/empty.mjs')
         }
       },

lib/rules/no-multiple-template-root.js

@@ -6,21 +6,6 @@
 
 const utils = require('../utils')
 
-/**
- * Get all comments that need to be reported
- * @param {(HTMLComment | HTMLBogusComment | Comment)[]} comments
- * @param {Range[]} elementRanges
- * @returns {(HTMLComment | HTMLBogusComment | Comment)[]}
- */
-function getReportComments(comments, elementRanges) {
-  return comments.filter(
-    (comment) =>
-      !elementRanges.some(
-        (range) => range[0] <= comment.range[0] && comment.range[1] <= range[1]
-      )
-  )
-}
-
 module.exports = {
   meta: {
     type: 'problem',
@@ -65,10 +50,13 @@ module.exports = {
           return
         }
 
-        const comments = element.comments
-        const elementRanges = element.children.map((child) => child.range)
-        if (disallowComments && comments.length > 0) {
-          for (const comment of getReportComments(comments, elementRanges)) {
+        const reportComments = element.comments.filter(
+          (comment) =>
+            utils.inRange(element, comment) &&
+            !element.children.some((child) => utils.inRange(child, comment))
+        )
+        if (disallowComments) {
+          for (const comment of reportComments) {
             context.report({
               node: comment,
               loc: comment.loc,

lib/utils/indent-ts.js

@@ -1199,14 +1199,25 @@ function defineVisitor({
         isOpeningParenToken
       )
       setOffset(leftParenToken, 1, firstToken)
-      const argument =
-        node.argument ||
-        /** @type {any} typescript-eslint v5 */ (node).parameter
+
+      const args = []
+      if (node.source) {
+        args.push(node.source)
+      } else {
+        // For old typescript-eslint parser
+        args.push(
+          node.argument ||
+            /** @type {any} typescript-eslint v5 */ (node).parameter
+        )
+      }
+      if (node.options) {
+        args.push(node.options)
+      }
       const rightParenToken = tokenStore.getTokenAfter(
-        argument,
+        args[args.length - 1],
         isClosingParenToken
       )
-      processNodeList([argument], leftParenToken, rightParenToken, 1)
+      processNodeList(args, leftParenToken, rightParenToken, 1)
       if (node.qualifier) {
         const dotToken = tokenStore.getTokenBefore(node.qualifier)
         const propertyToken = tokenStore.getTokenAfter(dotToken)

lib/utils/index.js

@@ -1965,10 +1965,11 @@ module.exports = {
   },
   /**
    * Checks whether the target node is within the given range.
-   * @param { [number, number] } range
+   * @param { [number, number] | ASTNode | Token } rangeOrNode
    * @param {ASTNode | Token} target
    */
-  inRange(range, target) {
+  inRange(rangeOrNode, target) {
+    const range = Array.isArray(rangeOrNode) ? rangeOrNode : rangeOrNode.range
     return range[0] <= target.range[0] && target.range[1] <= range[1]
   },
   /**

package.json

@@ -1,12 +1,12 @@
 {
   "name": "eslint-plugin-vue",
-  "version": "10.6.0",
+  "version": "10.6.1",
   "description": "Official ESLint plugin for Vue.js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "new": "node tools/new-rule.js",
-    "start": "npm run test:base -- --watch --growl",
+    "start": "npm run test:base -- --watch",
     "test:base": "vitest run --reporter=dot tests/lib",
     "test": "vitest run",
     "test:integrations": "vitest run tests/integrations",

tests/lib/rules/no-multiple-template-root.js

@@ -122,6 +122,17 @@ ruleTester.run('no-multiple-template-root', rule, {
       </template>
       `,
       options: [{ disallowComments: true }]
+    },
+
+    // https://github.com/vuejs/eslint-plugin-vue/issues/2948
+    {
+      code: `
+        <!-- comment -->
+        <template>
+          <div>abc</div>
+        </template>
+      `,
+      options: [{ disallowComments: true }]
     }
   ],
   invalid: [
@@ -371,7 +382,7 @@ ruleTester.run('no-multiple-template-root', rule, {
     {
       code: `
       <template>
-        <!-- When you have a comment in the root of your template in vue 3, 
+        <!-- When you have a comment in the root of your template in vue 3,
         using $el will point to the first text comment instead of the actual DOM element.   -->
         <div>
           12333