Merge branch 'main' into chore/add_mockServiceWorker_to_eslint_ignores

traPtitech · Nov 8, 2024 · 1d44756 · 1d44756
2 parents e472801 + 5989388
commit 1d44756
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/components/shared/InputSelectSingle.vue b/src/components/shared/InputSelectSingle.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
-import { ChevronDownIcon } from '@heroicons/vue/24/solid'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { ChevronDownIcon } from '@heroicons/vue/24/solid';
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 
-type ValueValue = Record<string, unknown> | string | null
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type ValueValue = Record<string, any> | string | null
 
 interface Value {
   key: string

diff --git a/src/components/shared/MarkdownTextarea.vue b/src/components/shared/MarkdownTextarea.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue'
-import InputTextarea from './InputTextarea.vue'
-import MarkdownIt from './MarkdownIt.vue'
-import InputSelectSingle from '/@/components/shared/InputSelectSingle.vue'
+import { computed, ref } from 'vue';
+import InputTextarea from './InputTextarea.vue';
+import MarkdownIt from './MarkdownIt.vue';
+import InputSelectSingle from '/@/components/shared/InputSelectSingle.vue';
 
 type TabType = 'input' | 'preview'
 interface Props {
@@ -31,7 +31,8 @@ const templateOptions = computed(
     }) ?? []
 )
 
-function setTemplate(template: Record<string, unknown> | string | null) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- FIXME: InputSelectSingleを直す
+function setTemplate(template: Record<string, any> | string | null) {
   if (typeof template !== 'string') {
     return
   }

diff --git a/src/env.d.ts b/src/env.d.ts
@@ -2,11 +2,8 @@
 
 declare module '*.vue' {
   import type { DefineComponent } from 'vue'
-  const component: DefineComponent<
-    Record<string, unknown>,
-    Record<string, unknown>,
-    unknown
-  >
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-empty-object-type
+  const component: DefineComponent<{}, {}, any>
   export default component
 }