Merge branch 'traPtitech:master' into fix/sw-inlinereply-icon

traPtitech · Jan 26, 2024 · 110c1c4 · 110c1c4
2 parents bbb0314 + 24d955b
commit 110c1c4
Show file tree

Hide file tree

Showing 11 changed files with 404 additions and 171 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -47,7 +47,11 @@ module.exports = {
     'vue/v-on-event-hyphenation': ['error', 'always', { autofix: true }],
     'vue/v-on-function-call': 'error',
     'vue/no-template-target-blank': 'error',
-    'vue/prefer-true-attribute-shorthand': 'error'
+    'vue/prefer-true-attribute-shorthand': 'error',
+    '@typescript-eslint/no-non-null-assertion': 'warn',
+    'no-empty-function': 'off',
+    '@typescript-eslint/no-empty-function': 'error',
+    '@typescript-eslint/no-empty-interface': 'error'
   },
   overrides: [
     {

diff --git a/eslint-vue-ts-recommended.cjs b/eslint-vue-ts-recommended.cjs
@@ -6,7 +6,7 @@
  * 適用されるようにするためにoverridesに'*.vue'を追加する
  */
 
-const typescriptEslintEslintRecommended = require('@typescript-eslint/eslint-plugin/dist/configs/eslint-recommended')
+const typescriptEslintEslintRecommended = require('./node_modules/@typescript-eslint/eslint-plugin/dist/configs/eslint-recommended')
 
 module.exports = {
   ...typescriptEslintEslintRecommended,