Skip to content

Commit b2f255d

Browse files
authored
Merge branch 'master' into update-resources
2 parents 5f2fcc7 + e936a15 commit b2f255d

File tree

676 files changed

+21114
-6985
lines changed

Some content is hidden

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

676 files changed

+21114
-6985
lines changed

Diff for: .circleci/config.yml

+27-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,13 @@ jobs:
4141
name: Versions
4242
command: npm version
4343
- checkout
44+
- run:
45+
name: Uninstall @stylistic/eslint-plugin
46+
command: npm uninstall -D @stylistic/eslint-plugin
4447
- run:
4548
name: Install eslint@6
4649
command: |
47-
npm install --save-exact [email protected]
50+
npm install --save-exact [email protected] @typescript-eslint/parser@5
4851
- run:
4952
name: Install dependencies
5053
command: npm install
@@ -59,10 +62,13 @@ jobs:
5962
name: Versions
6063
command: npm version
6164
- checkout
65+
- run:
66+
name: Uninstall @stylistic/eslint-plugin
67+
command: npm uninstall -D @stylistic/eslint-plugin
6268
- run:
6369
name: Install eslint@7
6470
command: |
65-
npm install eslint@7
71+
npm install eslint@7 @typescript-eslint/parser@5
6672
- run:
6773
name: Install dependencies
6874
command: npm install
@@ -77,6 +83,9 @@ jobs:
7783
name: Versions
7884
command: npm version
7985
- checkout
86+
- run:
87+
name: Uninstall @stylistic/eslint-plugin
88+
command: npm uninstall -D @stylistic/eslint-plugin
8089
- run:
8190
name: Install @typescript-eslint/parser@4 eslint@7 [email protected]
8291
command: |
@@ -88,17 +97,31 @@ jobs:
8897
name: Test
8998
command: npm test
9099
node-v14:
91-
<<: *node-base
92100
docker:
93101
- image: node:14
102+
steps:
103+
- run:
104+
name: Versions
105+
command: npm version
106+
- checkout
107+
- run:
108+
name: Install @typescript-eslint/parser@5
109+
command: |
110+
npm install @typescript-eslint/parser@5 --save-exact
111+
- run:
112+
name: Install dependencies
113+
command: npm install
114+
- run:
115+
name: Test
116+
command: npm test
94117
node-v16:
95118
<<: *node-base
96119
docker:
97120
- image: node:16
98121

99122
lint:
100123
docker:
101-
- image: node:14
124+
- image: node:16
102125
steps:
103126
- run:
104127
name: Versions

Diff for: .eslintignore

-12
This file was deleted.

Diff for: .eslintrc.js

-181
This file was deleted.

Diff for: .github/ISSUE_TEMPLATE/bug_report.md

+1
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

Diff for: .github/ISSUE_TEMPLATE/change.md

+1
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.**

Diff for: .github/workflows/CI.yml

+47-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
uses: actions/checkout@v3
1818
- name: Install Node.js
1919
uses: actions/setup-node@v3
20-
with:
21-
node-version: 16
2220
- name: Install Packages
2321
run: npm install --legacy-peer-deps
2422
- name: Lint
@@ -28,8 +26,18 @@ jobs:
2826
name: Test
2927
strategy:
3028
matrix:
31-
node: [17, 18]
29+
node: [18, 20]
3230
os: [ubuntu-latest]
31+
eslint: [8]
32+
include:
33+
# On next ESLint version
34+
- eslint: ^9.0.0-0
35+
node: 20
36+
os: ubuntu-latest
37+
# On old Node version
38+
- eslint: 8
39+
node: 17
40+
os: ubuntu-latest
3341

3442
runs-on: ${{ matrix.os }}
3543
steps:
@@ -41,5 +49,41 @@ jobs:
4149
node-version: ${{ matrix.node }}
4250
- name: Install Packages
4351
run: npm install --legacy-peer-deps
52+
- name: Install ESLint v${{ matrix.eslint }}
53+
run: npm install --save-dev eslint@${{ matrix.eslint }} --legacy-peer-deps
54+
- name: Test
55+
run: npm test
56+
57+
test-for-ts-eslint-v5:
58+
name: Test
59+
runs-on: ubuntu-latest
60+
steps:
61+
- name: Checkout
62+
uses: actions/checkout@v3
63+
- name: Install Node.js
64+
uses: actions/setup-node@v3
65+
with:
66+
node-version: 18
67+
- name: Install Packages
68+
run: npm install --legacy-peer-deps
69+
- name: Install typescript-eslint v5
70+
run: npm install -D @typescript-eslint/parser
71+
- name: Test
72+
run: npm test
73+
74+
test-for-eslint-v8-without-eslint-stylistic:
75+
name: Test
76+
runs-on: ubuntu-latest
77+
steps:
78+
- name: Checkout
79+
uses: actions/checkout@v3
80+
- name: Install Node.js
81+
uses: actions/setup-node@v3
82+
- name: Install Packages
83+
run: npm install --legacy-peer-deps
84+
- name: Uninstall @stylistic/eslint-plugin
85+
run: npm uninstall -D @stylistic/eslint-plugin
86+
- name: Install eslint v8
87+
run: npm install -D eslint@8
4488
- name: Test
4589
run: npm test

Diff for: .markdownlint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
line-length: false
2+
link-fragments: false
23
single-title: false
34
no-inline-html:
45
allowed_elements:

Diff for: .vscode/settings.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"editor.tabSize": 2,
3-
"eslint.options": {
4-
"rulePaths": ["eslint-internal-rules"]
5-
},
3+
"eslint.experimental.useFlatConfig": true,
64
"eslint.validate": [
75
"javascript",
86
"javascriptreact",
@@ -16,4 +14,8 @@
1614
"editor.formatOnSave": true,
1715
"editor.defaultFormatter": "esbenp.prettier-vscode"
1816
},
17+
"[javascript]": {
18+
"editor.formatOnSave": true,
19+
"editor.defaultFormatter": "esbenp.prettier-vscode"
20+
},
1921
}

Diff for: docs/.vitepress/build-system/build.ts renamed to docs/.vitepress/build-system/build.mts

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ import path from 'path'
66
import fs from 'fs'
77
import { fileURLToPath } from 'url'
88

9-
const dirname = path.dirname(
10-
fileURLToPath(
11-
// @ts-expect-error -- Cannot change `module` option
12-
import.meta.url
13-
)
14-
)
9+
const dirname = path.dirname(fileURLToPath(import.meta.url))
1510

1611
build(
1712
path.join(dirname, './src/eslint.mjs'),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default {
2+
/* empty */
3+
}

0 commit comments

Comments
 (0)