Skip to content

Commit ca16ff5

Browse files
felipemelendezfelipemelendez
authored
Merge branch 'master' into fix/v-else-if-key-siblings-and-interleaved
2 parents b4a6953 + f5cb93d commit ca16ff5

File tree

825 files changed

+13986
-4906
lines changed

Some content is hidden

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

825 files changed

+13986
-4906
lines changed

‎.github/FUNDING.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github:
2-
- ota-meshi
3-
- FloEdelmann
2+
- ota-meshi
3+
- FloEdelmann

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ about: Create a report to help us improve
2626

2727
- **ESLint version:**
2828
- **eslint-plugin-vue version:**
29+
- **Vue version:**
2930
- **Node version:**
3031
- **Operating System:**
3132

‎.github/ISSUE_TEMPLATE/change.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ about: Request a change that is not a bug fix, rule change, or new rule
1313

1414
- **ESLint version:**
1515
- **eslint-plugin-vue version:**
16+
- **Vue version:**
1617
- **Node version:**
1718

1819
**The problem you want to solve.**

‎.github/workflows/CI.yml

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,65 +13,73 @@ jobs:
1313
name: Lint
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v3
18-
- name: Install Node.js
19-
uses: actions/setup-node@v3
20-
- name: Install Packages
21-
run: npm install --legacy-peer-deps
22-
- name: Lint
23-
run: npm run lint
16+
- name: Checkout
17+
uses: actions/checkout@v3
18+
- name: Install Node.js
19+
uses: actions/setup-node@v3
20+
- name: Install Packages
21+
run: npm install --legacy-peer-deps
22+
- name: Lint
23+
run: npm run lint
2424

2525
test:
2626
name: Test
2727
strategy:
2828
matrix:
29-
node: [17, 18, 20]
29+
node: [18, 20]
3030
os: [ubuntu-latest]
31+
eslint: [8, 9]
32+
include:
33+
# On old Node version
34+
- eslint: 8
35+
node: 17
36+
os: ubuntu-latest
3137

3238
runs-on: ${{ matrix.os }}
3339
steps:
34-
- name: Checkout
35-
uses: actions/checkout@v3
36-
- name: Install Node.js v${{ matrix.node }}
37-
uses: actions/setup-node@v3
38-
with:
39-
node-version: ${{ matrix.node }}
40-
- name: Install Packages
41-
run: npm install --legacy-peer-deps
42-
- name: Test
43-
run: npm test
40+
- name: Checkout
41+
uses: actions/checkout@v3
42+
- name: Install Node.js v${{ matrix.node }}
43+
uses: actions/setup-node@v3
44+
with:
45+
node-version: ${{ matrix.node }}
46+
- name: Install Packages
47+
run: npm install --legacy-peer-deps
48+
- name: Install ESLint v${{ matrix.eslint }}
49+
run: npm install --save-dev eslint@${{ matrix.eslint }} --legacy-peer-deps
50+
- name: Test
51+
run: npm test
4452

4553
test-for-ts-eslint-v5:
4654
name: Test
4755
runs-on: ubuntu-latest
4856
steps:
49-
- name: Checkout
50-
uses: actions/checkout@v3
51-
- name: Install Node.js
52-
uses: actions/setup-node@v3
53-
with:
54-
node-version: 18
55-
- name: Install Packages
56-
run: npm install --legacy-peer-deps
57-
- name: Install typescript-eslint v5
58-
run: npm install -D @typescript-eslint/parser
59-
- name: Test
60-
run: npm test
57+
- name: Checkout
58+
uses: actions/checkout@v3
59+
- name: Install Node.js
60+
uses: actions/setup-node@v3
61+
with:
62+
node-version: 18
63+
- name: Install Packages
64+
run: npm install --legacy-peer-deps
65+
- name: Install typescript-eslint v5
66+
run: npm install -D @typescript-eslint/parser
67+
- name: Test
68+
run: npm test
6169

6270
test-for-eslint-v8-without-eslint-stylistic:
6371
name: Test
6472
runs-on: ubuntu-latest
6573
steps:
66-
- name: Checkout
67-
uses: actions/checkout@v3
68-
- name: Install Node.js
69-
uses: actions/setup-node@v3
70-
- name: Install Packages
71-
run: npm install --legacy-peer-deps
72-
- name: Uninstall @stylistic/eslint-plugin
73-
run: npm uninstall -D @stylistic/eslint-plugin
74-
- name: Install eslint v8
75-
run: npm install -D eslint@8
76-
- name: Test
77-
run: npm test
74+
- name: Checkout
75+
uses: actions/checkout@v3
76+
- name: Install Node.js
77+
uses: actions/setup-node@v3
78+
- name: Install Packages
79+
run: npm install --legacy-peer-deps
80+
- name: Uninstall @stylistic/eslint-plugin
81+
run: npm uninstall -D @stylistic/eslint-plugin
82+
- name: Install eslint v8
83+
run: npm install -D eslint@8
84+
- name: Test
85+
run: npm test

‎.markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ code-block-style:
1515
code-fence-style:
1616
style: backtick
1717
emphasis-style:
18-
style: asterisk
18+
style: underscore
1919
heading-style:
2020
style: atx
2121
hr-style:

‎.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
tests/fixtures/
2+
.github/ISSUE_TEMPLATE/*.md

‎.vscode/launch.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
"request": "launch",
77
"name": "Start testing",
88
"program": "${workspaceFolder}/node_modules/.bin/mocha",
9-
"args": [
10-
"${file}",
11-
"--watch"
12-
],
9+
"args": ["${file}", "--watch"],
1310
"console": "integratedTerminal"
1411
}
1512
]

‎.vscode/settings.json

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
{
2-
"editor.tabSize": 2,
3-
"eslint.experimental.useFlatConfig": true,
4-
"eslint.validate": [
5-
"javascript",
6-
"javascriptreact",
7-
"vue",
8-
"json",
9-
"jsonc"
10-
],
11-
"typescript.tsdk": "./node_modules/typescript/lib",
12-
"vetur.validation.script": false,
13-
"[typescript]": {
14-
"editor.formatOnSave": true,
15-
"editor.defaultFormatter": "esbenp.prettier-vscode"
16-
},
17-
"[javascript]": {
18-
"editor.formatOnSave": true,
19-
"editor.defaultFormatter": "esbenp.prettier-vscode"
20-
},
2+
"editor.tabSize": 2,
3+
"eslint.experimental.useFlatConfig": true,
4+
"eslint.validate": ["javascript", "javascriptreact", "vue", "json", "jsonc"],
5+
"typescript.tsdk": "./node_modules/typescript/lib",
6+
"vetur.validation.script": false,
7+
"[typescript]": {
8+
"editor.formatOnSave": true,
9+
"editor.defaultFormatter": "esbenp.prettier-vscode"
10+
},
11+
"[javascript]": {
12+
"editor.formatOnSave": true,
13+
"editor.defaultFormatter": "esbenp.prettier-vscode"
14+
}
2115
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Pre-build cjs packages that cannot be bundled well.
33
*/
44
import esbuild from 'esbuild'
5-
import path from 'path'
5+
import path from 'pathe'
66
import fs from 'fs'
77
import { fileURLToPath } from 'url'
88

‎docs/.vitepress/build-system/src/eslint.mjs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// @ts-nocheck
2-
import * as all from '../../../../node_modules/eslint/lib/linter/linter.js'
3-
const Linter = all.Linter
4-
export { Linter }
5-
export default { Linter }
2+
/* eslint-disable unicorn/prefer-export-from -- exporting as named and default is less duplication without `export…from` */
3+
4+
import { Linter } from '../../../../node_modules/eslint/lib/linter/linter.js'
5+
import SourceCode from '../../../../node_modules/eslint/lib/source-code/source-code.js'
6+
7+
export { Linter, SourceCode }
8+
export default { Linter, SourceCode }

0 commit comments

Comments
 (0)