Skip to content

Commit 46ac044

Browse files
committed
Merge branch 'master' into rewrite-ts
# Conflicts: # eslint.config.mjs # package.json
2 parents b92bc9c + 7523350 commit 46ac044

File tree

138 files changed

+647
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+647
-618
lines changed

.changeset/rich-bags-turn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"eslint-plugin-vue": patch
3+
---
4+
5+
Fixed false positives for `TSImportType` in `vue/script-indent` rule

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
"console": "integratedTerminal"
1919
}
2020
]
21-
}
21+
}

.vscode/settings.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
22
"editor.tabSize": 2,
3-
"eslint.validate": ["javascript", "javascriptreact", "vue", "json", "jsonc", "markdown"],
3+
"eslint.validate": [
4+
"javascript",
5+
"javascriptreact",
6+
"vue",
7+
"json",
8+
"jsonc",
9+
"markdown"
10+
],
411
"typescript.tsdk": "./node_modules/typescript/lib",
512
"vetur.validation.script": false,
613
"[typescript]": {

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# eslint-plugin-vue
22

3+
## 10.6.1
4+
5+
### Patch Changes
6+
7+
- 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))
8+
39
## 10.6.0
410

511
### Minor Changes

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ build(
2323
'node:fs',
2424
'semver',
2525
'fast-glob',
26+
'tinyglobby',
2627
'debug'
2728
]
2829
)

docs/.vitepress/config.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ export default async () => {
162162
tslib: path.join(dirname, '../../node_modules/tslib/tslib.es6.js'),
163163
globby: path.join(dirname, './build-system/shim/empty.mjs'),
164164
'fast-glob': path.join(dirname, './build-system/shim/empty.mjs'),
165+
tinyglobby: path.join(dirname, './build-system/shim/empty.mjs'),
165166
module: path.join(dirname, './build-system/shim/empty.mjs')
166167
}
167168
},

docs/rules/no-async-in-computed-properties.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ since: v3.8.0
1212
1313
- :gear: This rule is included in all of `"plugin:vue/essential"`, `*.configs["flat/essential"]`, `"plugin:vue/vue2-essential"`, `*.configs["flat/vue2-essential"]`, `"plugin:vue/strongly-recommended"`, `*.configs["flat/strongly-recommended"]`, `"plugin:vue/vue2-strongly-recommended"`, `*.configs["flat/vue2-strongly-recommended"]`, `"plugin:vue/recommended"`, `*.configs["flat/recommended"]`, `"plugin:vue/vue2-recommended"` and `*.configs["flat/vue2-recommended"]`.
1414

15-
Computed properties and functions should be synchronous. Asynchronous actions inside them may not work as expected and can lead to an unexpected behaviour, that's why you should avoid them.
16-
If you need async computed properties you might want to consider using additional plugin [vue-async-computed]
15+
Computed properties and functions should be synchronous. Asynchronous actions inside them may not work as expected and can lead to unexpected behaviour; that's why you should avoid them.
16+
If you need async computed properties, consider using the [`computedAsync`] composable from VueUse.
1717

1818
## :book: Rule Details
1919

@@ -147,9 +147,9 @@ const fetchData = computed(() => {
147147

148148
## :books: Further Reading
149149

150-
- [vue-async-computed]
150+
- [`computedAsync`]
151151

152-
[vue-async-computed]: https://github.com/foxbenjaminfox/vue-async-computed
152+
[`computedAsync`]: https://vueuse.org/core/computedAsync
153153

154154
## :rocket: Version
155155

eslint.config.mjs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { defineConfig } from 'eslint/config'
22
import globals from 'globals'
3+
import eslintConfigFlatGitIgnore from 'eslint-config-flat-gitignore'
34
import eslintPluginEslintPlugin from 'eslint-plugin-eslint-plugin/configs/all'
45
import eslintPluginJsonc from 'eslint-plugin-jsonc'
56
import eslintPluginNodeDependencies from 'eslint-plugin-node-dependencies'
@@ -49,23 +50,12 @@ const MD_LINKS_FOR_DOCS = {
4950
}
5051

5152
export default typegen([
53+
eslintConfigFlatGitIgnore(),
5254
{
5355
ignores: [
54-
'dist',
55-
'.nyc_output',
56-
'eslint-typegen.d.ts',
57-
'coverage',
58-
'node_modules',
5956
'.changeset/**/*.md',
6057
'tests/fixtures',
61-
'tests/integrations/eslint-plugin-import',
62-
63-
'!.vitepress',
64-
'docs/.vitepress/dist',
65-
'docs/.vitepress/build-system/shim/vue-eslint-parser.mjs',
66-
'docs/.vitepress/build-system/shim/@typescript-eslint/parser.mjs',
67-
'docs/.vitepress/.temp',
68-
'docs/.vitepress/cache'
58+
'tests/integrations/eslint-plugin-import'
6959
]
7060
},
7161
eslintPluginPrettierRecommended,

lib/rules/attribute-hyphenation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module.exports = {
7575
},
7676
/** @param {RuleContext} context */
7777
create(context) {
78-
const sourceCode = context.getSourceCode()
78+
const sourceCode = context.sourceCode
7979
const option = context.options[0]
8080
const optionsPayload = context.options[1]
8181
const useHyphenated = option !== 'never'

lib/rules/attributes-order.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ function isAlphabetical(prevNode, currNode, sourceCode) {
222222
* @returns {RuleListener} AST event handlers.
223223
*/
224224
function create(context) {
225-
const sourceCode = context.getSourceCode()
225+
const sourceCode = context.sourceCode
226226
const otherAttrs = [
227227
ATTRS.ATTR_DYNAMIC,
228228
ATTRS.ATTR_STATIC,

0 commit comments

Comments
 (0)