Skip to content

Commit c8bb2e0

Browse files
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # docs/rules/index.md # tests/lib/rules/prefer-use-template-ref.js
2 parents 7db1382 + 2a4336b commit c8bb2e0

File tree

318 files changed

+4694
-4366
lines changed

Some content is hidden

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

318 files changed

+4694
-4366
lines changed

.changeset/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Changesets
2+
3+
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
4+
with multi-package repos, or single-package repos to help you version and publish your code. You can
5+
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
6+
7+
We have a quick list of common questions to get you started engaging with this project in
8+
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/config/schema.json",
3+
"changelog": [
4+
"@svitejs/changesets-changelog-github-compact",
5+
{
6+
"repo": "vuejs/eslint-plugin-vue"
7+
}
8+
],
9+
"commit": false,
10+
"linked": [],
11+
"access": "public",
12+
"baseBranch": "master",
13+
"bumpVersionsWithWorkspaceProtocolOnly": true,
14+
"ignore": []
15+
}

.circleci/config.yml

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

.github/workflows/CI.yml

Lines changed: 23 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
name: CI
22
on:
33
push:
4-
branches: [master]
4+
branches:
5+
- 'master'
56
pull_request:
6-
branches: [master]
7+
types:
8+
- 'opened'
9+
- 'synchronize'
10+
- 'reopened'
711

812
permissions:
913
contents: read
@@ -14,9 +18,9 @@ jobs:
1418
runs-on: ubuntu-latest
1519
steps:
1620
- name: Checkout
17-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
1822
- name: Install Node.js
19-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2024
- name: Install Packages
2125
run: npm install --legacy-peer-deps
2226
- name: Lint
@@ -26,60 +30,39 @@ jobs:
2630
name: Test
2731
strategy:
2832
matrix:
29-
node: [18, 20]
30-
os: [ubuntu-latest]
31-
eslint: [8, 9]
33+
node: [18, 20, 21, 'lts/*']
34+
eslint: [9]
3235
include:
33-
# On old Node version
34-
- eslint: 8
35-
node: 17
36-
os: ubuntu-latest
36+
# On old ESLint version
37+
- node: 18
38+
eslint: 8
3739

38-
runs-on: ${{ matrix.os }}
40+
runs-on: ubuntu-latest
3941
steps:
4042
- name: Checkout
41-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4244
- name: Install Node.js v${{ matrix.node }}
43-
uses: actions/setup-node@v3
45+
uses: actions/setup-node@v4
4446
with:
4547
node-version: ${{ matrix.node }}
4648
- name: Install Packages
47-
run: npm install --legacy-peer-deps
49+
run: npm install -f
4850
- name: Install ESLint v${{ matrix.eslint }}
49-
run: npm install --save-dev eslint@${{ matrix.eslint }} --legacy-peer-deps
51+
run: npm install --save-dev eslint@${{ matrix.eslint }} -f
5052
- name: Test
5153
run: npm test
5254

53-
test-for-ts-eslint-v5:
54-
name: Test
55+
test-without-eslint-stylistic:
56+
name: Test without ESLint Stylistic
5557
runs-on: ubuntu-latest
5658
steps:
5759
- name: Checkout
58-
uses: actions/checkout@v3
60+
uses: actions/checkout@v4
5961
- name: Install Node.js
60-
uses: actions/setup-node@v3
61-
with:
62-
node-version: 18
62+
uses: actions/setup-node@v4
6363
- 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
69-
70-
test-for-eslint-v8-without-eslint-stylistic:
71-
name: Test
72-
runs-on: ubuntu-latest
73-
steps:
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
64+
run: npm install -f
8065
- name: Uninstall @stylistic/eslint-plugin
8166
run: npm uninstall -D @stylistic/eslint-plugin
82-
- name: Install eslint v8
83-
run: npm install -D eslint@8
8467
- name: Test
8568
run: npm test

.github/workflows/Release.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
permissions: {}
9+
10+
jobs:
11+
release:
12+
# prevents this action from running on forks
13+
if: github.repository == 'vuejs/eslint-plugin-vue'
14+
permissions:
15+
contents: write # to create release (changesets/action)
16+
pull-requests: write # to create pull request (changesets/action)
17+
name: Release
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout Repo
21+
uses: actions/checkout@v4
22+
- name: Setup Node.js
23+
uses: actions/setup-node@v4
24+
- name: Install Dependencies
25+
run: npm install -f
26+
27+
- name: Create Release Pull Request or Publish to npm
28+
id: changesets
29+
uses: changesets/action@v1
30+
with:
31+
version: npm run changeset:version
32+
publish: npm run changeset:publish
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Check for utils resources update
2+
on:
3+
workflow_dispatch: null
4+
schedule:
5+
- cron: 0 0 * * 0 # At 00:00 on Sunday, see https://crontab.guru/#0_0_*_*_0
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
check-for-resources-update:
13+
runs-on: ubuntu-latest
14+
if: ${{ github.repository == 'vuejs/eslint-plugin-vue' }}
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
- name: Install Node.js
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: 18
22+
- name: Install Packages
23+
run: npm install
24+
- name: Update
25+
run: npm run update-resources
26+
- uses: peter-evans/create-pull-request@v7
27+
with:
28+
commit-message: Updates resources
29+
branch: update-resources
30+
branch-suffix: timestamp
31+
title: Updates resources

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# eslint-plugin-vue
2+
3+
## 10.2.0
4+
5+
### Minor Changes
6+
7+
- [vue/no-restricted-html-elements](https://eslint.vuejs.org/rules/no-restricted-html-elements.html) now accepts multiple elements in each entry. ([#2750](https://github.com/vuejs/eslint-plugin-vue/pull/2750))
8+
9+
### Patch Changes
10+
11+
- Updates resources ([#2747](https://github.com/vuejs/eslint-plugin-vue/pull/2747))

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![NPM version](https://img.shields.io/npm/v/eslint-plugin-vue.svg?style=flat)](https://npmjs.org/package/eslint-plugin-vue)
44
[![NPM downloads](https://img.shields.io/npm/dm/eslint-plugin-vue.svg?style=flat)](https://npmjs.org/package/eslint-plugin-vue)
5-
[![CircleCI](https://img.shields.io/circleci/project/github/vuejs/eslint-plugin-vue/master.svg?style=flat)](https://circleci.com/gh/vuejs/eslint-plugin-vue)
5+
[![CI](https://img.shields.io/github/actions/workflow/status/vuejs/eslint-plugin-vue/CI.yml?style=flat&label=CI)](https://github.com/vuejs/eslint-plugin-vue/actions/workflows/CI.yml)
66
[![License](https://img.shields.io/github/license/vuejs/eslint-plugin-vue.svg?style=flat)](https://github.com/vuejs/eslint-plugin-vue/blob/master/LICENSE)
77

88
> Official ESLint plugin for Vue.js
@@ -13,7 +13,14 @@ Please refer to the [official website](https://eslint.vuejs.org).
1313

1414
## :anchor: Versioning Policy
1515

16-
This plugin follows [Semantic Versioning](https://semver.org) and [ESLint's Semantic Versioning Policy](https://github.com/eslint/eslint#semantic-versioning-policy).
16+
This plugin follows [Semantic Versioning].
17+
However, please note that we do not follow [ESLint's Semantic Versioning Policy].
18+
In minor version releases, this plugin may change the sharable configs provided by the plugin or the default behavior of the plugin's rules in order to add features to the plugin. Because we want to add many features to the plugin soon, so that users can easily take advantage of new features in Vue and Nuxt.
19+
20+
According to our policy, any minor update may report more linting errors than the previous release. As such, we recommend using the [tilde (`~`)](https://semver.npmjs.com/#syntax-examples) in `package.json` to guarantee the results of your builds.
21+
22+
[Semantic Versioning]: https://semver.org/
23+
[ESLint's Semantic Versioning Policy]: https://github.com/eslint/eslint#semantic-versioning-policy
1724

1825
## :newspaper: Releases
1926

0 commit comments

Comments
 (0)