From 2a3c1b75565e54ae98e053dd974cc2030cdb8e4e Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Tue, 27 Feb 2024 14:31:32 +0100
Subject: [PATCH] fix: add vue/tsconfig, drop ts implementations for .vue files

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/VolumeIndicator/VolumeIndicator.vue | 6 +++---
 src/types/vendor/@nextcloud/vue.d.ts               | 2 ++
 tsconfig.json                                      | 9 ++-------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/components/VolumeIndicator/VolumeIndicator.vue b/src/components/VolumeIndicator/VolumeIndicator.vue
index e999e832a4..09a831bdfc 100644
--- a/src/components/VolumeIndicator/VolumeIndicator.vue
+++ b/src/components/VolumeIndicator/VolumeIndicator.vue
@@ -39,7 +39,7 @@
 	</span>
 </template>
 
-<script lang="ts">
+<script>
 import Microphone from 'vue-material-design-icons/Microphone.vue'
 import MicrophoneOff from 'vue-material-design-icons/MicrophoneOff.vue'
 
@@ -103,13 +103,13 @@ export default {
 			return this.size / 8
 		},
 
-		iconPrimaryHeight(): number {
+		iconPrimaryHeight() {
 			return this.audioPreviewAvailable
 				? this.size - this.iconOffsetBottom - this.currentVolumeIndicatorHeight
 				: this.size
 		},
 
-		iconOverlayHeight(): number {
+		iconOverlayHeight() {
 			return this.iconOffsetBottom / 2 + this.currentVolumeIndicatorHeight
 		},
 
diff --git a/src/types/vendor/@nextcloud/vue.d.ts b/src/types/vendor/@nextcloud/vue.d.ts
index 773741850e..4f65a03a73 100644
--- a/src/types/vendor/@nextcloud/vue.d.ts
+++ b/src/types/vendor/@nextcloud/vue.d.ts
@@ -1,2 +1,4 @@
 declare module '@nextcloud/vue/dist/*.js'
+declare module '@nextcloud/vue/dist/*.mjs'
+declare module '@nextcloud/vue/dist/*.cjs'
 declare module '@nextcloud/vue/dist/*.vue'
diff --git a/tsconfig.json b/tsconfig.json
index fd3c5de2c2..efe2157296 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
-	"include": ["./src/**/*.ts", "./src/**/*.vue"],
+	"extends": "@vue/tsconfig/tsconfig.json",
+	"include": ["src/**/*.ts"],
 	"exclude": ["node_modules", "vendor"],
 	"compilerOptions": {
 		"outDir": "./js",
@@ -7,12 +8,6 @@
 		"checkJs": true,
 		"allowImportingTsExtensions": true,
 		"lib": ["ESNext"],
-		"module": "ESNext",
-		"moduleResolution": "bundler",
-		"verbatimModuleSyntax": true,
-		"target": "ES2020",
-		"esModuleInterop": true,
-		"forceConsistentCasingInFileNames": true,
 	},
 	"vueCompilerOptions": {
 		"target": 2.7,