Skip to content

Commit 67cb32e

Browse files
committed
Merge remote-tracking branch 'origin/master' into update-resources
2 parents b2f255d + 8a781f0 commit 67cb32e

File tree

303 files changed

+2308
-1039
lines changed

Some content is hidden

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

303 files changed

+2308
-1039
lines changed

Diff for: .github/FUNDING.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github:
2-
- ota-meshi
3-
- FloEdelmann
2+
- ota-meshi
3+
- FloEdelmann

Diff for: .github/workflows/CI.yml

+44-44
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ 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
@@ -41,49 +41,49 @@ jobs:
4141

4242
runs-on: ${{ matrix.os }}
4343
steps:
44-
- name: Checkout
45-
uses: actions/checkout@v3
46-
- name: Install Node.js v${{ matrix.node }}
47-
uses: actions/setup-node@v3
48-
with:
49-
node-version: ${{ matrix.node }}
50-
- name: Install Packages
51-
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
44+
- name: Checkout
45+
uses: actions/checkout@v3
46+
- name: Install Node.js v${{ matrix.node }}
47+
uses: actions/setup-node@v3
48+
with:
49+
node-version: ${{ matrix.node }}
50+
- name: Install Packages
51+
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
5656

5757
test-for-ts-eslint-v5:
5858
name: Test
5959
runs-on: ubuntu-latest
6060
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
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
7373

7474
test-for-eslint-v8-without-eslint-stylistic:
7575
name: Test
7676
runs-on: ubuntu-latest
7777
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
88-
- name: Test
89-
run: npm test
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
88+
- name: Test
89+
run: npm test

Diff for: .markdownlint.yml

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

Diff for: .prettierignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
tests/fixtures/
2+
.github/ISSUE_TEMPLATE/*.md

Diff for: .vscode/launch.json

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

Diff for: .vscode/settings.json

+13-19
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
}

Diff for: docs/rules/array-bracket-newline.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/array-bracket-newline
55
description: Enforce linebreaks after opening and before closing array brackets in `<template>`
66
since: v7.1.0
77
---
8+
89
# vue/array-bracket-newline
910

1011
> Enforce linebreaks after opening and before closing array brackets in `<template>`

Diff for: docs/rules/array-bracket-spacing.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/array-bracket-spacing
55
description: Enforce consistent spacing inside array brackets in `<template>`
66
since: v5.2.0
77
---
8+
89
# vue/array-bracket-spacing
910

1011
> Enforce consistent spacing inside array brackets in `<template>`

Diff for: docs/rules/array-element-newline.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/array-element-newline
55
description: Enforce line breaks after each array element in `<template>`
66
since: v9.9.0
77
---
8+
89
# vue/array-element-newline
910

1011
> Enforce line breaks after each array element in `<template>`

Diff for: docs/rules/arrow-spacing.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/arrow-spacing
55
description: Enforce consistent spacing before and after the arrow in arrow functions in `<template>`
66
since: v5.2.0
77
---
8+
89
# vue/arrow-spacing
910

1011
> Enforce consistent spacing before and after the arrow in arrow functions in `<template>`

Diff for: docs/rules/attribute-hyphenation.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/attribute-hyphenation
55
description: enforce attribute naming style on custom components in template
66
since: v3.9.0
77
---
8+
89
# vue/attribute-hyphenation
910

1011
> enforce attribute naming style on custom components in template

Diff for: docs/rules/attributes-order.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/attributes-order
55
description: enforce order of attributes
66
since: v4.3.0
77
---
8+
89
# vue/attributes-order
910

1011
> enforce order of attributes

Diff for: docs/rules/block-lang.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/block-lang
55
description: disallow use other than available `lang`
66
since: v7.15.0
77
---
8+
89
# vue/block-lang
910

1011
> disallow use other than available `lang`

Diff for: docs/rules/block-order.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/block-order
55
description: enforce order of component top-level elements
66
since: v9.16.0
77
---
8+
89
# vue/block-order
910

1011
> enforce order of component top-level elements

Diff for: docs/rules/block-spacing.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/block-spacing
55
description: Disallow or enforce spaces inside of blocks after opening block and before closing block in `<template>`
66
since: v5.2.0
77
---
8+
89
# vue/block-spacing
910

1011
> Disallow or enforce spaces inside of blocks after opening block and before closing block in `<template>`

Diff for: docs/rules/block-tag-newline.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/block-tag-newline
55
description: enforce line breaks after opening and before closing block-level tags
66
since: v7.1.0
77
---
8+
89
# vue/block-tag-newline
910

1011
> enforce line breaks after opening and before closing block-level tags

Diff for: docs/rules/brace-style.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/brace-style
55
description: Enforce consistent brace style for blocks in `<template>`
66
since: v5.2.0
77
---
8+
89
# vue/brace-style
910

1011
> Enforce consistent brace style for blocks in `<template>`

Diff for: docs/rules/camelcase.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/camelcase
55
description: Enforce camelcase naming convention in `<template>`
66
since: v5.2.0
77
---
8+
89
# vue/camelcase
910

1011
> Enforce camelcase naming convention in `<template>`

Diff for: docs/rules/comma-dangle.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/comma-dangle
55
description: Require or disallow trailing commas in `<template>`
66
since: v5.2.0
77
---
8+
89
# vue/comma-dangle
910

1011
> Require or disallow trailing commas in `<template>`

Diff for: docs/rules/comma-spacing.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/comma-spacing
55
description: Enforce consistent spacing before and after commas in `<template>`
66
since: v7.0.0
77
---
8+
89
# vue/comma-spacing
910

1011
> Enforce consistent spacing before and after commas in `<template>`

Diff for: docs/rules/comma-style.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/comma-style
55
description: Enforce consistent comma style in `<template>`
66
since: v7.0.0
77
---
8+
89
# vue/comma-style
910

1011
> Enforce consistent comma style in `<template>`

Diff for: docs/rules/comment-directive.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/comment-directive
55
description: support comment-directives in `<template>`
66
since: v4.1.0
77
---
8+
89
# vue/comment-directive
910

1011
> support comment-directives in `<template>`

Diff for: docs/rules/component-api-style.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/component-api-style
55
description: enforce component API style
66
since: v7.18.0
77
---
8+
89
# vue/component-api-style
910

1011
> enforce component API style
@@ -55,7 +56,7 @@ export default {
5556
<script>
5657
export default {
5758
/* ✗ BAD */
58-
data () {
59+
data() {
5960
return {
6061
msg: 'Hello World!',
6162
// ...
@@ -92,7 +93,7 @@ export default {
9293
<script>
9394
export default {
9495
/* ✓ GOOD */
95-
data () {
96+
data() {
9697
return {
9798
msg: 'Hello World!',
9899
// ...

Diff for: docs/rules/component-definition-name-casing.md

+5-12
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: vue/component-definition-name-casing
55
description: enforce specific casing for component definition name
66
since: v7.0.0
77
---
8+
89
# vue/component-definition-name-casing
910

1011
> enforce specific casing for component definition name
@@ -63,14 +64,10 @@ export default {
6364

6465
```js
6566
/* ✓ GOOD */
66-
Vue.component('MyComponent', {
67-
68-
})
67+
Vue.component('MyComponent', {})
6968

7069
/* ✗ BAD */
71-
Vue.component('my-component', {
72-
73-
})
70+
Vue.component('my-component', {})
7471
```
7572

7673
</eslint-code-block>
@@ -107,14 +104,10 @@ export default {
107104

108105
```js
109106
/* ✓ GOOD */
110-
Vue.component('my-component', {
111-
112-
})
107+
Vue.component('my-component', {})
113108

114109
/* ✗ BAD */
115-
Vue.component('MyComponent', {
116-
117-
})
110+
Vue.component('MyComponent', {})
118111
```
119112

120113
</eslint-code-block>

0 commit comments

Comments
 (0)