From 19d5beb562790fda845fb1a2e5f5e920f0a3db8b Mon Sep 17 00:00:00 2001
From: Max Leiter <maxwell.leiter@gmail.com>
Date: Wed, 1 Jun 2022 11:45:08 -0700
Subject: [PATCH] Replace vetur with volar, small types cleanup

---
 .vscode/extensions.json |  3 ++-
 .vscode/settings.json   |  1 -
 client/js/types.d.ts    | 19 -------------------
 client/shims-vue.d.ts   |  7 +++++++
 test/.mocharc.yml       |  1 -
 vetur.config.js         |  3 ---
 6 files changed, 9 insertions(+), 25 deletions(-)
 create mode 100644 client/shims-vue.d.ts
 delete mode 100644 vetur.config.js

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index d401e0e3..6e4bf808 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,7 +3,8 @@
     "EditorConfig.EditorConfig",
     "esbenp.prettier-vscode",
     "dbaeumer.vscode-eslint",
-    "octref.vetur"
+    "Vue.volar",
+    "Vue.vscode-typescript-vue-plugin"
   ],
   "unwantedRecommendations": []
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d80731df..4237eb3b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,5 @@
 {
   "editor.formatOnSave": true,
-  "vetur.format.enable": false,
   "prettier.useEditorConfig": true,
   "prettier.requireConfig": true,
   "prettier.disableLanguages": [],
diff --git a/client/js/types.d.ts b/client/js/types.d.ts
index daeaf8d9..3e80ccdc 100644
--- a/client/js/types.d.ts
+++ b/client/js/types.d.ts
@@ -8,13 +8,6 @@ import {Mention} from "../../src/client";
 import {ClientConfiguration} from "../../src/server";
 import {LinkPreview} from "../../src/plugins/irc-events/link";
 
-// declare module '*.vue' {
-// 	import { defineComponent } from 'vue';
-
-// 	const component: ReturnType<typeof defineComponent>;
-// 	export default component;
-// }
-
 interface LoungeWindow extends Window {
 	g_TheLoungeRemoveLoading?: () => void;
 	navigator: Window["navigator"] & {
@@ -74,18 +67,6 @@ type ClientLinkPreview = LinkPreview & {
 	sourceLoaded?: boolean;
 };
 
-declare module "*.vue" {
-	const Component: ReturnType<typeof defineComponent>;
-	export default Component;
-}
-
-declare module "vue" {
-	// interface ComponentCustomProperties {
-	// 	// TODO: Vue struggles with typing using the options API, so we should switch to composition API
-	// 	// $root
-	// }
-}
-
 declare module "vue-router" {
 	import Vue from "./vue";
 
diff --git a/client/shims-vue.d.ts b/client/shims-vue.d.ts
new file mode 100644
index 00000000..32971832
--- /dev/null
+++ b/client/shims-vue.d.ts
@@ -0,0 +1,7 @@
+// https://vuejs.github.io/vetur/guide/setup.html#vue3
+declare module "*.vue" {
+	import type {DefineComponent} from "vue";
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	const component: DefineComponent<{}, {}, any>;
+	export default component;
+}
diff --git a/test/.mocharc.yml b/test/.mocharc.yml
index a091ea4c..5934e4b4 100644
--- a/test/.mocharc.yml
+++ b/test/.mocharc.yml
@@ -11,6 +11,5 @@ require:
   # - "jsdom-global/register"
   - "test/fixtures/env.ts"
 globals:
-  - "__VUE_OPTIONS_API__"
   - "__VUE_PROD_DEVTOOLS__"
   - "__VUE__"
diff --git a/vetur.config.js b/vetur.config.js
deleted file mode 100644
index 6bb6145d..00000000
--- a/vetur.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-	projects: ["./client/tsconfig.json"],
-};