Skip to content

Commit 7633074

Browse files
committed
Merge remote-tracking branch 'upstream/master' into rewrite-ts
2 parents 4438e9f + c36cae5 commit 7633074

18 files changed

+117
-90
lines changed

.changeset/add-callexpression-support.md

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

.changeset/improve-define-macros-order-messages.md

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

.changeset/lemon-socks-follow.md

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

.changeset/neat-coats-allow.md

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

.changeset/ten-lines-fail.md

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

.github/workflows/CI.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222
- name: Install Node.js
23-
uses: actions/setup-node@v4
23+
uses: actions/setup-node@v6
2424
- name: Install Packages
2525
run: npm install --legacy-peer-deps
2626
- name: Lint
@@ -57,9 +57,9 @@ jobs:
5757
- build
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v5
6161
- name: Install Node.js v${{ matrix.node }}
62-
uses: actions/setup-node@v4
62+
uses: actions/setup-node@v6
6363
with:
6464
node-version: ${{ matrix.node }}
6565
- name: Install Packages
@@ -78,9 +78,9 @@ jobs:
7878
- build
7979
steps:
8080
- name: Checkout
81-
uses: actions/checkout@v4
81+
uses: actions/checkout@v5
8282
- name: Install Node.js v18
83-
uses: actions/setup-node@v4
83+
uses: actions/setup-node@v6
8484
with:
8585
node-version: 18
8686
- name: Install Packages
@@ -101,9 +101,9 @@ jobs:
101101
- build
102102
steps:
103103
- name: Checkout
104-
uses: actions/checkout@v4
104+
uses: actions/checkout@v5
105105
- name: Install Node.js
106-
uses: actions/setup-node@v4
106+
uses: actions/setup-node@v6
107107
- name: Install Packages
108108
run: npm install
109109
- name: Uninstall @stylistic/eslint-plugin
@@ -125,9 +125,9 @@ jobs:
125125
- build
126126
steps:
127127
- name: Checkout
128-
uses: actions/checkout@v4
128+
uses: actions/checkout@v5
129129
- name: Install Node.js
130-
uses: actions/setup-node@v4
130+
uses: actions/setup-node@v6
131131
- name: Install Packages
132132
run: npm install
133133
- name: Install @stylistic/eslint-plugin v${{ matrix.stylistic }}
@@ -146,9 +146,9 @@ jobs:
146146
- build
147147
steps:
148148
- name: Checkout
149-
uses: actions/checkout@v4
149+
uses: actions/checkout@v5
150150
- name: Install Node.js
151-
uses: actions/setup-node@v4
151+
uses: actions/setup-node@v6
152152
- name: Install Packages
153153
run: npm install
154154
- name: Install @typescript-eslint/parser v7

.github/workflows/Release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout Repo
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323
- name: Setup Node.js
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v6
2525
with:
2626
node-version: 24
2727
- name: Install Dependencies

.github/workflows/check-for-resources-update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
if: ${{ github.repository == 'vuejs/eslint-plugin-vue' }}
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
- name: Install Node.js
19-
uses: actions/setup-node@v4
19+
uses: actions/setup-node@v6
2020
with:
2121
node-version: 18
2222
- name: Install Packages

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# eslint-plugin-vue
22

3+
## 10.6.0
4+
5+
### Minor Changes
6+
7+
- Updated [`vue/no-import-compiler-macros`](https://eslint.vuejs.org/rules/no-import-compiler-macros.html) to clarify that macros are not allowed outside `<script setup>` ([#2938](https://github.com/vuejs/eslint-plugin-vue/pull/2938))
8+
9+
- Added new [`vue/no-duplicate-class-names`](https://eslint.vuejs.org/rules/no-duplicate-class-names.html) rule ([#2934](https://github.com/vuejs/eslint-plugin-vue/pull/2934))
10+
11+
### Patch Changes
12+
13+
- Fixed [`vue/no-v-html`](https://eslint.vuejs.org/rules/no-v-html.html) rule to allow ignoring call expressions ([#2950](https://github.com/vuejs/eslint-plugin-vue/pull/2950))
14+
15+
- Improved [`vue/define-macros-order`](https://eslint.vuejs.org/rules/define-macros-order.html) error messages to distinguish between macro placement and ordering issues ([#2953](https://github.com/vuejs/eslint-plugin-vue/pull/2953))
16+
17+
- Updated dependency [postcss-selector-parser](https://github.com/postcss/postcss-selector-parser) to v7.1.0 ([#2947](https://github.com/vuejs/eslint-plugin-vue/pull/2947))
18+
319
## 10.5.1
420

521
### Patch Changes

docs/.eslintrc.js

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

0 commit comments

Comments
 (0)