Merge pull request #222 from shimataro/develop

version 2.4.0

.editorconfig

@@ -25,6 +25,13 @@ spaces_around_brackets = none
 indent_brace_style = allman
 
 
+# JavaScript/TypeScript
+[*.{js,ts}]
+indent_style = space
+curly_bracket_next_line = false
+indent_brace_style = K&R
+
+
 # JSON/YAML
 [*.{json,babelrc,code-workspace,yml,yaml}]
 indent_style = space

.eslintrc.yml

@@ -14,7 +14,9 @@ parserOptions:
   project: ./tsconfig.json
 rules: # https://eslint.org/docs/rules/
   accessor-pairs: error
-  array-bracket-newline: error
+  array-bracket-newline:
+  - error
+  - consistent
   array-bracket-spacing:
   - error
   - never
@@ -29,9 +31,7 @@ rules: # https://eslint.org/docs/rules/
     before: true
   block-scoped-var: error
   block-spacing: error
-  brace-style:
-  - error
-  - allman
+  brace-style: 'off' # see "@typescript-eslint/brace-style"
   callback-return: error
   capitalized-comments: 'off'
   class-methods-use-this: error
@@ -87,26 +87,14 @@ rules: # https://eslint.org/docs/rules/
   - below
   indent:
   - error
-  - tab
+  - 4
+  - SwitchCase: 1
   indent-legacy: 'off'
   init-declarations: error
   jsx-quotes: error
   key-spacing: error
   keyword-spacing:
   - error
-  - overrides:
-      catch:
-        after: false
-      for:
-        after: false
-      if:
-        after: false
-      switch:
-        after: false
-      while:
-        after: false
-      with:
-        after: false
   line-comment-position: 'off'
   linebreak-style:
   - error
@@ -256,7 +244,7 @@ rules: # https://eslint.org/docs/rules/
   rest-spread-spacing:
   - error
   - never
-  semi: error
+  semi: 'off' # see "@typescript-eslint/semi"
   semi-spacing: error
   semi-style:
   - error
@@ -308,8 +296,25 @@ rules: # https://eslint.org/docs/rules/
 
   # @typescript-eslint plugin
   "@typescript-eslint/ban-ts-ignore": 'off'
+  "@typescript-eslint/brace-style":
+  - error
+  - 1tbs
+  "@typescript-eslint/member-delimiter-style":
+  - error
+  - multiline:
+      delimiter: semi
+      requireLast: true
+    singleline:
+      delimiter: semi
+      requireLast: true
   "@typescript-eslint/no-empty-interface": 'off'
+  "@typescript-eslint/no-floating-promises": error
   "@typescript-eslint/no-use-before-define":
   - error
   - functions: false
-  "@typescript-eslint/strict-boolean-expressions": error
+  "@typescript-eslint/semi": error
+  "@typescript-eslint/strict-boolean-expressions":
+  - error
+  - allowString: false
+    allowNumber: false
+    allowNullableObject: false

.github/workflows/build.yml

@@ -13,12 +13,15 @@ jobs:
       matrix:
         os:
         - Windows-2019
+        - Windows-2022
         - macOS-10.15
-        - Ubuntu-16.04
+        - macOS-11
+        - macOS-12
         - Ubuntu-18.04
         - Ubuntu-20.04
+        - Ubuntu-22.04
         nodejs:
-        - 12
+        - 16
       fail-fast: false
     steps:
     - name: Turn off auto-crlf