Skip to content

Commit 0a5a091

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents cceac79 + a5127b0 commit 0a5a091

File tree

238 files changed

+10862
-2350
lines changed

Some content is hidden

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

238 files changed

+10862
-2350
lines changed

.changeset/five-roses-peel.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+
Changed `vue/define-macros-order` to ignore enum declarations and `declare` statements

.changeset/fresh-taxis-glow.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'eslint-plugin-vue': minor
3+
---
4+
5+
Changed `vue/valid-define-options` to allow local literal constant references

.changeset/great-ravens-happen.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"eslint-plugin-vue": minor
3+
---
4+
5+
Added [`@stylistic/eslint-plugin`](https://eslint.style/) as optional peer dependency

.changeset/purple-lights-invite.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'eslint-plugin-vue': minor
3+
---
4+
5+
Added `ignorePattern` option to [`vue/no-v-html`](https://eslint.vuejs.org/rules/no-v-html.html)

.changeset/smooth-jokes-eat.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/true-oranges-heal.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/CI.yml

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ jobs:
3131
strategy:
3232
matrix:
3333
node: [18, 20, 21, 'lts/*']
34-
eslint: [9]
35-
include:
36-
# On old ESLint version
37-
- node: 18
38-
eslint: 8
39-
4034
runs-on: ubuntu-latest
4135
steps:
4236
- name: Checkout
@@ -46,9 +40,24 @@ jobs:
4640
with:
4741
node-version: ${{ matrix.node }}
4842
- name: Install Packages
49-
run: npm install -f
50-
- name: Install ESLint v${{ matrix.eslint }}
51-
run: npm install --save-dev eslint@${{ matrix.eslint }} -f
43+
run: npm install
44+
- name: Test
45+
run: npm test
46+
47+
test-with-eslint-v8:
48+
name: Test with ESLint v8
49+
runs-on: ubuntu-latest
50+
steps:
51+
- name: Checkout
52+
uses: actions/checkout@v4
53+
- name: Install Node.js v18
54+
uses: actions/setup-node@v4
55+
with:
56+
node-version: 18
57+
- name: Install Packages
58+
run: npm install
59+
- name: Install ESLint v8
60+
run: npm install --save-dev eslint@8 --force
5261
- name: Test
5362
run: npm test
5463

@@ -61,8 +70,41 @@ jobs:
6170
- name: Install Node.js
6271
uses: actions/setup-node@v4
6372
- name: Install Packages
64-
run: npm install -f
73+
run: npm install
6574
- name: Uninstall @stylistic/eslint-plugin
66-
run: npm uninstall -D @stylistic/eslint-plugin
75+
run: npm uninstall @stylistic/eslint-plugin
76+
- name: Test
77+
run: npm test
78+
79+
test-with-old-eslint-stylistic:
80+
name: Test with old ESLint Stylistic
81+
strategy:
82+
matrix:
83+
stylistic: [2, 3, 4]
84+
runs-on: ubuntu-latest
85+
steps:
86+
- name: Checkout
87+
uses: actions/checkout@v4
88+
- name: Install Node.js
89+
uses: actions/setup-node@v4
90+
- name: Install Packages
91+
run: npm install
92+
- name: Install @stylistic/eslint-plugin v${{ matrix.stylistic }}
93+
run: npm install -D @stylistic/eslint-plugin@${{ matrix.stylistic }} --force
94+
- name: Test
95+
run: npm test
96+
97+
test-with-typescript-eslint-v7:
98+
name: Test with typescript-eslint v7
99+
runs-on: ubuntu-latest
100+
steps:
101+
- name: Checkout
102+
uses: actions/checkout@v4
103+
- name: Install Node.js
104+
uses: actions/setup-node@v4
105+
- name: Install Packages
106+
run: npm install
107+
- name: Install @typescript-eslint/parser v7
108+
run: npm install -D @typescript-eslint/parser@7 --force
67109
- name: Test
68110
run: npm test

.github/workflows/Release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Node.js
2323
uses: actions/setup-node@v4
2424
- name: Install Dependencies
25-
run: npm install -f
25+
run: npm install
2626

2727
- name: Create Release Pull Request or Publish to npm
2828
id: changesets

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
yarn.lock
99
yarn-error.log
1010
/docs/.vitepress/dist
11-
/docs/.vitepress/build-system/shim/eslint.mjs
12-
/docs/.vitepress/build-system/shim/assert.mjs
11+
/docs/.vitepress/build-system/shim/vue-eslint-parser.mjs
12+
/docs/.vitepress/build-system/shim/@typescript-eslint/parser.mjs
1313
/docs/.vitepress/.temp
1414
/docs/.vitepress/cache
1515
typings/eslint/lib/rules
16+
eslint-typegen.d.ts

.vscode/launch.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,17 @@
55
"type": "node",
66
"request": "launch",
77
"name": "Start testing",
8-
"program": "${workspaceFolder}/node_modules/.bin/mocha",
9-
"args": ["${file}", "--watch"],
8+
"program": "${workspaceFolder}/node_modules/.bin/vitest",
9+
"args": ["run", "${file}", "--reporter=verbose"],
10+
"console": "integratedTerminal"
11+
},
12+
{
13+
"type": "node",
14+
"request": "launch",
15+
"name": "Start testing (watch)",
16+
"program": "${workspaceFolder}/node_modules/.bin/vitest",
17+
"args": ["${file}", "--reporter=verbose"],
1018
"console": "integratedTerminal"
1119
}
1220
]
13-
}
21+
}

0 commit comments

Comments
 (0)