Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into update-resources
Browse files Browse the repository at this point in the history
  • Loading branch information
ota-meshi committed Feb 23, 2024
2 parents b2f255d + 8a781f0 commit 67cb32e
Show file tree
Hide file tree
Showing 303 changed files with 2,308 additions and 1,039 deletions.
4 changes: 2 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github:
- ota-meshi
- FloEdelmann
- ota-meshi
- FloEdelmann
88 changes: 44 additions & 44 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:
name: Lint
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: Lint
run: npm run lint
- 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: Lint
run: npm run lint

test:
name: Test
Expand All @@ -41,49 +41,49 @@ jobs:

runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Node.js v${{ matrix.node }}
uses: actions/setup-node@v3
with:
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
- name: Checkout
uses: actions/checkout@v3
- name: Install Node.js v${{ matrix.node }}
uses: actions/setup-node@v3
with:
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
- 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
- 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
2 changes: 1 addition & 1 deletion .markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ code-block-style:
code-fence-style:
style: backtick
emphasis-style:
style: asterisk
style: underscore
heading-style:
style: atx
hr-style:
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tests/fixtures/
.github/ISSUE_TEMPLATE/*.md
5 changes: 1 addition & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
"request": "launch",
"name": "Start testing",
"program": "${workspaceFolder}/node_modules/.bin/mocha",
"args": [
"${file}",
"--watch"
],
"args": ["${file}", "--watch"],
"console": "integratedTerminal"
}
]
Expand Down
32 changes: 13 additions & 19 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
{
"editor.tabSize": 2,
"eslint.experimental.useFlatConfig": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"vue",
"json",
"jsonc"
],
"typescript.tsdk": "./node_modules/typescript/lib",
"vetur.validation.script": false,
"[typescript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.tabSize": 2,
"eslint.experimental.useFlatConfig": true,
"eslint.validate": ["javascript", "javascriptreact", "vue", "json", "jsonc"],
"typescript.tsdk": "./node_modules/typescript/lib",
"vetur.validation.script": false,
"[typescript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
1 change: 1 addition & 0 deletions docs/rules/array-bracket-newline.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/array-bracket-newline
description: Enforce linebreaks after opening and before closing array brackets in `<template>`
since: v7.1.0
---

# vue/array-bracket-newline

> Enforce linebreaks after opening and before closing array brackets in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/array-bracket-spacing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/array-bracket-spacing
description: Enforce consistent spacing inside array brackets in `<template>`
since: v5.2.0
---

# vue/array-bracket-spacing

> Enforce consistent spacing inside array brackets in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/array-element-newline.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/array-element-newline
description: Enforce line breaks after each array element in `<template>`
since: v9.9.0
---

# vue/array-element-newline

> Enforce line breaks after each array element in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/arrow-spacing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/arrow-spacing
description: Enforce consistent spacing before and after the arrow in arrow functions in `<template>`
since: v5.2.0
---

# vue/arrow-spacing

> Enforce consistent spacing before and after the arrow in arrow functions in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/attribute-hyphenation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/attribute-hyphenation
description: enforce attribute naming style on custom components in template
since: v3.9.0
---

# vue/attribute-hyphenation

> enforce attribute naming style on custom components in template
Expand Down
1 change: 1 addition & 0 deletions docs/rules/attributes-order.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/attributes-order
description: enforce order of attributes
since: v4.3.0
---

# vue/attributes-order

> enforce order of attributes
Expand Down
1 change: 1 addition & 0 deletions docs/rules/block-lang.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/block-lang
description: disallow use other than available `lang`
since: v7.15.0
---

# vue/block-lang

> disallow use other than available `lang`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/block-order.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/block-order
description: enforce order of component top-level elements
since: v9.16.0
---

# vue/block-order

> enforce order of component top-level elements
Expand Down
1 change: 1 addition & 0 deletions docs/rules/block-spacing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/block-spacing
description: Disallow or enforce spaces inside of blocks after opening block and before closing block in `<template>`
since: v5.2.0
---

# vue/block-spacing

> Disallow or enforce spaces inside of blocks after opening block and before closing block in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/block-tag-newline.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/block-tag-newline
description: enforce line breaks after opening and before closing block-level tags
since: v7.1.0
---

# vue/block-tag-newline

> enforce line breaks after opening and before closing block-level tags
Expand Down
1 change: 1 addition & 0 deletions docs/rules/brace-style.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/brace-style
description: Enforce consistent brace style for blocks in `<template>`
since: v5.2.0
---

# vue/brace-style

> Enforce consistent brace style for blocks in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/camelcase.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/camelcase
description: Enforce camelcase naming convention in `<template>`
since: v5.2.0
---

# vue/camelcase

> Enforce camelcase naming convention in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/comma-dangle.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/comma-dangle
description: Require or disallow trailing commas in `<template>`
since: v5.2.0
---

# vue/comma-dangle

> Require or disallow trailing commas in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/comma-spacing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/comma-spacing
description: Enforce consistent spacing before and after commas in `<template>`
since: v7.0.0
---

# vue/comma-spacing

> Enforce consistent spacing before and after commas in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/comma-style.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/comma-style
description: Enforce consistent comma style in `<template>`
since: v7.0.0
---

# vue/comma-style

> Enforce consistent comma style in `<template>`
Expand Down
1 change: 1 addition & 0 deletions docs/rules/comment-directive.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/comment-directive
description: support comment-directives in `<template>`
since: v4.1.0
---

# vue/comment-directive

> support comment-directives in `<template>`
Expand Down
5 changes: 3 additions & 2 deletions docs/rules/component-api-style.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/component-api-style
description: enforce component API style
since: v7.18.0
---

# vue/component-api-style

> enforce component API style
Expand Down Expand Up @@ -55,7 +56,7 @@ export default {
<script>
export default {
/* ✗ BAD */
data () {
data() {
return {
msg: 'Hello World!',
// ...
Expand Down Expand Up @@ -92,7 +93,7 @@ export default {
<script>
export default {
/* ✓ GOOD */
data () {
data() {
return {
msg: 'Hello World!',
// ...
Expand Down
17 changes: 5 additions & 12 deletions docs/rules/component-definition-name-casing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ title: vue/component-definition-name-casing
description: enforce specific casing for component definition name
since: v7.0.0
---

# vue/component-definition-name-casing

> enforce specific casing for component definition name
Expand Down Expand Up @@ -63,14 +64,10 @@ export default {

```js
/* ✓ GOOD */
Vue.component('MyComponent', {

})
Vue.component('MyComponent', {})

/* ✗ BAD */
Vue.component('my-component', {

})
Vue.component('my-component', {})
```

</eslint-code-block>
Expand Down Expand Up @@ -107,14 +104,10 @@ export default {

```js
/* ✓ GOOD */
Vue.component('my-component', {

})
Vue.component('my-component', {})

/* ✗ BAD */
Vue.component('MyComponent', {

})
Vue.component('MyComponent', {})
```

</eslint-code-block>
Expand Down
Loading

0 comments on commit 67cb32e

Please sign in to comment.