Skip to content

Commit 86a65fd

Browse files
authored
Merge pull request #222 from shimataro/develop
version 2.4.0
2 parents 3c9b0fc + 193316a commit 86a65fd

20 files changed

+10718
-2884
lines changed

.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ spaces_around_brackets = none
2525
indent_brace_style = allman
2626

2727

28+
# JavaScript/TypeScript
29+
[*.{js,ts}]
30+
indent_style = space
31+
curly_bracket_next_line = false
32+
indent_brace_style = K&R
33+
34+
2835
# JSON/YAML
2936
[*.{json,babelrc,code-workspace,yml,yaml}]
3037
indent_style = space

.eslintrc.yml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ parserOptions:
1414
project: ./tsconfig.json
1515
rules: # https://eslint.org/docs/rules/
1616
accessor-pairs: error
17-
array-bracket-newline: error
17+
array-bracket-newline:
18+
- error
19+
- consistent
1820
array-bracket-spacing:
1921
- error
2022
- never
@@ -29,9 +31,7 @@ rules: # https://eslint.org/docs/rules/
2931
before: true
3032
block-scoped-var: error
3133
block-spacing: error
32-
brace-style:
33-
- error
34-
- allman
34+
brace-style: 'off' # see "@typescript-eslint/brace-style"
3535
callback-return: error
3636
capitalized-comments: 'off'
3737
class-methods-use-this: error
@@ -87,26 +87,14 @@ rules: # https://eslint.org/docs/rules/
8787
- below
8888
indent:
8989
- error
90-
- tab
90+
- 4
91+
- SwitchCase: 1
9192
indent-legacy: 'off'
9293
init-declarations: error
9394
jsx-quotes: error
9495
key-spacing: error
9596
keyword-spacing:
9697
- error
97-
- overrides:
98-
catch:
99-
after: false
100-
for:
101-
after: false
102-
if:
103-
after: false
104-
switch:
105-
after: false
106-
while:
107-
after: false
108-
with:
109-
after: false
11098
line-comment-position: 'off'
11199
linebreak-style:
112100
- error
@@ -256,7 +244,7 @@ rules: # https://eslint.org/docs/rules/
256244
rest-spread-spacing:
257245
- error
258246
- never
259-
semi: error
247+
semi: 'off' # see "@typescript-eslint/semi"
260248
semi-spacing: error
261249
semi-style:
262250
- error
@@ -308,8 +296,25 @@ rules: # https://eslint.org/docs/rules/
308296

309297
# @typescript-eslint plugin
310298
"@typescript-eslint/ban-ts-ignore": 'off'
299+
"@typescript-eslint/brace-style":
300+
- error
301+
- 1tbs
302+
"@typescript-eslint/member-delimiter-style":
303+
- error
304+
- multiline:
305+
delimiter: semi
306+
requireLast: true
307+
singleline:
308+
delimiter: semi
309+
requireLast: true
311310
"@typescript-eslint/no-empty-interface": 'off'
311+
"@typescript-eslint/no-floating-promises": error
312312
"@typescript-eslint/no-use-before-define":
313313
- error
314314
- functions: false
315-
"@typescript-eslint/strict-boolean-expressions": error
315+
"@typescript-eslint/semi": error
316+
"@typescript-eslint/strict-boolean-expressions":
317+
- error
318+
- allowString: false
319+
allowNumber: false
320+
allowNullableObject: false

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ jobs:
1313
matrix:
1414
os:
1515
- Windows-2019
16+
- Windows-2022
1617
- macOS-10.15
17-
- Ubuntu-16.04
18+
- macOS-11
19+
- macOS-12
1820
- Ubuntu-18.04
1921
- Ubuntu-20.04
22+
- Ubuntu-22.04
2023
nodejs:
21-
- 12
24+
- 16
2225
fail-fast: false
2326
steps:
2427
- name: Turn off auto-crlf

0 commit comments

Comments
 (0)