Skip to content

Commit de4ed25

Browse files
ota-meshiota-meshi
authored
Merge pull request #4 from ota-meshi/dev
Update
2 parents 54f8603 + e76e3ae commit de4ed25

29 files changed

+869
-656
lines changed

‎.eslintrc.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
"use strict"
22

33
module.exports = {
4-
extends: ["plugin:@mysticatea/es2015", "plugin:@mysticatea/+node"],
4+
extends: [
5+
"plugin:@ota-meshi/recommended",
6+
"plugin:@ota-meshi/+node",
7+
"plugin:@ota-meshi/+prettier",
8+
],
59

610
rules: {
711
"no-loop-func": "off",
12+
"require-jsdoc": "off",
813
},
914

1015
overrides: [

‎.github/workflows/NodeCI.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
9+
jobs:
10+
lint:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: actions/setup-node@v1
15+
with:
16+
node-version: 14
17+
- name: Install Packages
18+
run: npm install
19+
- name: Lint
20+
run: npm run lint
21+
test:
22+
runs-on: ubuntu-latest
23+
strategy:
24+
matrix:
25+
node-version: [10.13.x, 12.x, 14.x, 15.x]
26+
steps:
27+
- uses: actions/checkout@v2
28+
- name: Use Node.js ${{ matrix.node-version }}
29+
uses: actions/setup-node@v1
30+
with:
31+
node-version: ${{ matrix.node-version }}
32+
- name: Install Packages
33+
run: npm install
34+
- name: Test
35+
run: npm test
36+
test-and-coverage:
37+
runs-on: ubuntu-latest
38+
steps:
39+
- uses: actions/checkout@v2
40+
- uses: actions/setup-node@v1
41+
with:
42+
node-version: 14.x
43+
- name: Install Packages
44+
run: npm install
45+
- name: Test
46+
run: npm run test
47+
- name: Coveralls GitHub Action
48+
uses: coverallsapp/github-action@v1.1.1
49+
with:
50+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/NpmPublish.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: publish
2+
on:
3+
push:
4+
tags:
5+
- "*"
6+
jobs:
7+
release:
8+
name: check version, and release
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: checkout
12+
uses: actions/checkout@v2
13+
- name: setup Node
14+
uses: actions/setup-node@v1
15+
with:
16+
registry-url: 'https://registry.npmjs.org'
17+
- name: Install Packages
18+
run: npm install
19+
- name: lint
20+
run: npm run lint
21+
- name: Test
22+
run: npm test
23+
- name: check can npm-publish
24+
run: npx can-npm-publish
25+
- name: release
26+
run: npm publish
27+
env:
28+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.travis.yml

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

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ The ruleset of [`"google"`](https://github.com/google/eslint-config-google) for
113113
}
114114
```
115115

116-
### `vue-preset/eslint:recommended`
116+
### `vue-preset/eslint/recommended`
117117

118118
The ruleset of [`"eslint:recommended"`](https://eslint.org/docs/user-guide/configuring#using-eslintrecommended) for Vue template.
119119

@@ -123,7 +123,7 @@ The ruleset of [`"eslint:recommended"`](https://eslint.org/docs/user-guide/confi
123123
// eslint recommended ruleset
124124
"eslint:recommended",
125125
// Apply the same rules to expressions in templates.
126-
+ "vue-preset/eslint:recommended"
126+
+ "vue-preset/eslint/recommended"
127127
]
128128
}
129129
```

‎airbnb/fallback.js

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
module.exports = {
44
rules: {
5+
"vue/dot-notation": [
6+
"error",
7+
{
8+
allowKeywords: true,
9+
},
10+
],
511
"vue/dot-location": ["error", "property"],
612
"vue/eqeqeq": [
713
"error",
@@ -12,7 +18,9 @@ module.exports = {
1218
],
1319
"vue/no-empty-pattern": "error",
1420
"vue/no-multi-spaces": "error",
21+
"vue/no-useless-concat": "error",
1522
"vue/no-irregular-whitespace": "error",
23+
"vue/no-sparse-arrays": "error",
1624
"vue/array-bracket-spacing": ["error", "never"],
1725
"vue/block-spacing": ["error", "always"],
1826
"vue/brace-style": [
@@ -39,6 +47,33 @@ module.exports = {
3947
functions: "always-multiline",
4048
},
4149
],
50+
"vue/comma-spacing": [
51+
"error",
52+
{
53+
before: false,
54+
after: true,
55+
},
56+
],
57+
"vue/comma-style": [
58+
"error",
59+
"last",
60+
{
61+
exceptions: {
62+
ArrayExpression: false,
63+
ArrayPattern: false,
64+
ArrowFunctionExpression: false,
65+
CallExpression: false,
66+
FunctionDeclaration: false,
67+
FunctionExpression: false,
68+
ImportDeclaration: false,
69+
ObjectExpression: false,
70+
ObjectPattern: false,
71+
VariableDeclaration: false,
72+
NewExpression: false,
73+
},
74+
},
75+
],
76+
"vue/func-call-spacing": ["error", "never"],
4277
"vue/key-spacing": [
4378
"error",
4479
{
@@ -100,14 +135,47 @@ module.exports = {
100135
},
101136
],
102137
"vue/object-curly-spacing": ["error", "always"],
103-
"vue/sort-keys": [
104-
"off",
105-
"asc",
138+
"vue/object-curly-newline": [
139+
"error",
106140
{
107-
caseSensitive: false,
108-
natural: true,
141+
ObjectExpression: {
142+
minProperties: 4,
143+
multiline: true,
144+
consistent: true,
145+
},
146+
ObjectPattern: {
147+
minProperties: 4,
148+
multiline: true,
149+
consistent: true,
150+
},
151+
ImportDeclaration: {
152+
minProperties: 4,
153+
multiline: true,
154+
consistent: true,
155+
},
156+
ExportDeclaration: {
157+
minProperties: 4,
158+
multiline: true,
159+
consistent: true,
160+
},
161+
},
162+
],
163+
"vue/object-property-newline": [
164+
"error",
165+
{
166+
allowAllPropertiesOnSameLine: true,
167+
},
168+
],
169+
"vue/operator-linebreak": [
170+
"error",
171+
"before",
172+
{
173+
overrides: {
174+
"=": "none",
175+
},
109176
},
110177
],
178+
"vue/space-in-parens": ["error", "never"],
111179
"vue/space-infix-ops": "error",
112180
"vue/space-unary-ops": [
113181
"error",
@@ -125,5 +193,7 @@ module.exports = {
125193
after: true,
126194
},
127195
],
196+
"vue/prefer-template": "error",
197+
"vue/template-curly-spacing": "error",
128198
},
129199
}

‎airbnb/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const buildVueRules = require("../lib/build-vue-rules")
55

66
module.exports = loadModule(
77
"eslint-config-airbnb",
8-
config => ({
8+
(config) => ({
99
rules: buildVueRules(config).vueRules,
1010
}),
11-
() => require("./fallback")
11+
() => require("./fallback"),
1212
)

‎eslint:all/fallback.js renamed to ‎eslint/all/fallback.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,39 @@
22

33
module.exports = {
44
rules: {
5+
"vue/array-bracket-newline": "error",
56
"vue/array-bracket-spacing": "error",
67
"vue/arrow-spacing": "error",
78
"vue/block-spacing": "error",
89
"vue/brace-style": "error",
910
"vue/camelcase": "error",
1011
"vue/comma-dangle": "error",
12+
"vue/comma-spacing": "error",
13+
"vue/comma-style": "error",
1114
"vue/dot-location": "error",
15+
"vue/dot-notation": "error",
1216
"vue/eqeqeq": "error",
17+
"vue/func-call-spacing": "error",
1318
"vue/key-spacing": "error",
1419
"vue/keyword-spacing": "error",
1520
"vue/max-len": "error",
1621
"vue/no-empty-pattern": "error",
22+
"vue/no-extra-parens": "error",
1723
"vue/no-irregular-whitespace": "error",
1824
"vue/no-multi-spaces": "error",
1925
"vue/no-restricted-syntax": "error",
26+
"vue/no-sparse-arrays": "error",
2027
"vue/no-unused-vars": "error",
28+
"vue/no-useless-concat": "error",
29+
"vue/object-curly-newline": "error",
2130
"vue/object-curly-spacing": "error",
31+
"vue/object-property-newline": "error",
32+
"vue/operator-linebreak": "error",
33+
"vue/prefer-template": "error",
2234
"vue/sort-keys": "error",
35+
"vue/space-in-parens": "error",
2336
"vue/space-infix-ops": "error",
2437
"vue/space-unary-ops": "error",
38+
"vue/template-curly-spacing": "error",
2539
},
2640
}

‎eslint/all/index.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
"use strict"
2+
3+
const loadModule = require("../../lib/load-module")
4+
const buildVueRules = require("../../lib/build-vue-rules")
5+
6+
module.exports = loadModule(
7+
"eslint/conf/eslint-all",
8+
(config) => ({
9+
rules: buildVueRules(config).vueRules,
10+
}),
11+
() => require("./fallback"),
12+
)

‎eslint:recommended/fallback.js renamed to ‎eslint/recommended/fallback.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = {
44
rules: {
55
"vue/no-empty-pattern": "error",
66
"vue/no-irregular-whitespace": "error",
7+
"vue/no-sparse-arrays": "error",
78
"vue/no-unused-vars": "error",
89
},
910
}

0 commit comments

Comments
 (0)