Skip to content

Commit

Permalink
Merge branch 'master' into update-resources
Browse files Browse the repository at this point in the history
  • Loading branch information
FloEdelmann authored Feb 12, 2024
2 parents 5f2fcc7 + e936a15 commit b2f255d
Show file tree
Hide file tree
Showing 676 changed files with 21,114 additions and 6,985 deletions.
31 changes: 27 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,13 @@ jobs:
name: Versions
command: npm version
- checkout
- run:
name: Uninstall @stylistic/eslint-plugin
command: npm uninstall -D @stylistic/eslint-plugin
- run:
name: Install eslint@6
command: |
npm install --save-exact [email protected]
npm install --save-exact [email protected] @typescript-eslint/parser@5
- run:
name: Install dependencies
command: npm install
Expand All @@ -59,10 +62,13 @@ jobs:
name: Versions
command: npm version
- checkout
- run:
name: Uninstall @stylistic/eslint-plugin
command: npm uninstall -D @stylistic/eslint-plugin
- run:
name: Install eslint@7
command: |
npm install eslint@7
npm install eslint@7 @typescript-eslint/parser@5
- run:
name: Install dependencies
command: npm install
Expand All @@ -77,6 +83,9 @@ jobs:
name: Versions
command: npm version
- checkout
- run:
name: Uninstall @stylistic/eslint-plugin
command: npm uninstall -D @stylistic/eslint-plugin
- run:
name: Install @typescript-eslint/parser@4 eslint@7 [email protected]
command: |
Expand All @@ -88,17 +97,31 @@ jobs:
name: Test
command: npm test
node-v14:
<<: *node-base
docker:
- image: node:14
steps:
- run:
name: Versions
command: npm version
- checkout
- run:
name: Install @typescript-eslint/parser@5
command: |
npm install @typescript-eslint/parser@5 --save-exact
- run:
name: Install dependencies
command: npm install
- run:
name: Test
command: npm test
node-v16:
<<: *node-base
docker:
- image: node:16

lint:
docker:
- image: node:14
- image: node:16
steps:
- run:
name: Versions
Expand Down
12 changes: 0 additions & 12 deletions .eslintignore

This file was deleted.

181 changes: 0 additions & 181 deletions .eslintrc.js

This file was deleted.

1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ about: Create a report to help us improve

- **ESLint version:**
- **eslint-plugin-vue version:**
- **Vue version:**
- **Node version:**
- **Operating System:**

Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/change.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ about: Request a change that is not a bug fix, rule change, or new rule

- **ESLint version:**
- **eslint-plugin-vue version:**
- **Vue version:**
- **Node version:**

**The problem you want to solve.**
Expand Down
50 changes: 47 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
uses: actions/checkout@v3
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 16
- name: Install Packages
run: npm install --legacy-peer-deps
- name: Lint
Expand All @@ -28,8 +26,18 @@ jobs:
name: Test
strategy:
matrix:
node: [17, 18]
node: [18, 20]
os: [ubuntu-latest]
eslint: [8]
include:
# On next ESLint version
- eslint: ^9.0.0-0
node: 20
os: ubuntu-latest
# On old Node version
- eslint: 8
node: 17
os: ubuntu-latest

runs-on: ${{ matrix.os }}
steps:
Expand All @@ -41,5 +49,41 @@ jobs:
node-version: ${{ matrix.node }}
- name: Install Packages
run: npm install --legacy-peer-deps
- name: Install ESLint v${{ matrix.eslint }}
run: npm install --save-dev eslint@${{ matrix.eslint }} --legacy-peer-deps
- name: Test
run: npm test

test-for-ts-eslint-v5:
name: Test
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 18
- name: Install Packages
run: npm install --legacy-peer-deps
- name: Install typescript-eslint v5
run: npm install -D @typescript-eslint/parser
- name: Test
run: npm test

test-for-eslint-v8-without-eslint-stylistic:
name: Test
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Node.js
uses: actions/setup-node@v3
- name: Install Packages
run: npm install --legacy-peer-deps
- name: Uninstall @stylistic/eslint-plugin
run: npm uninstall -D @stylistic/eslint-plugin
- name: Install eslint v8
run: npm install -D eslint@8
- name: Test
run: npm test
1 change: 1 addition & 0 deletions .markdownlint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
line-length: false
link-fragments: false
single-title: false
no-inline-html:
allowed_elements:
Expand Down
8 changes: 5 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"editor.tabSize": 2,
"eslint.options": {
"rulePaths": ["eslint-internal-rules"]
},
"eslint.experimental.useFlatConfig": true,
"eslint.validate": [
"javascript",
"javascriptreact",
Expand All @@ -16,4 +14,8 @@
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ import path from 'path'
import fs from 'fs'
import { fileURLToPath } from 'url'

const dirname = path.dirname(
fileURLToPath(
// @ts-expect-error -- Cannot change `module` option
import.meta.url
)
)
const dirname = path.dirname(fileURLToPath(import.meta.url))

build(
path.join(dirname, './src/eslint.mjs'),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
/* empty */
}
Loading

0 comments on commit b2f255d

Please sign in to comment.