From d1bfa282c30958eeb71a838b89dcd454cb463a9e Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Mon, 9 May 2022 11:48:30 +0200
Subject: [PATCH] build: ts config for renderer

---
 package.json                                 |  2 +-
 src/renderer/components/BaseConfirmModal.vue | 80 +++++++++++---------
 tsconfig.json                                |  1 +
 webpack.renderer.config.js                   | 15 +++-
 4 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index 75a582f4..44c9eb55 100644
--- a/package.json
+++ b/package.json
@@ -183,7 +183,7 @@
     "unzip-crx-3": "~0.2.0",
     "vue-eslint-parser": "~8.3.0",
     "vue-loader": "~16.8.3",
-    "webpack": "~5.60.0",
+    "webpack": "~5.72.0",
     "webpack-cli": "~4.9.1",
     "webpack-dev-server": "~4.4.0",
     "xvfb-maybe": "~0.2.1"
diff --git a/src/renderer/components/BaseConfirmModal.vue b/src/renderer/components/BaseConfirmModal.vue
index 2339be89..4a505ca5 100644
--- a/src/renderer/components/BaseConfirmModal.vue
+++ b/src/renderer/components/BaseConfirmModal.vue
@@ -46,13 +46,15 @@
    </div>
 </template>
 
-<script>
-export default {
+<script lang="ts">
+import { computed, defineComponent, onBeforeUnmount } from 'vue';
+
+export default defineComponent({
    name: 'BaseConfirmModal',
    props: {
       size: {
          type: String,
-         validator: prop => ['small', 'medium', '400', 'large'].includes(prop),
+         validator: (prop: string) => ['small', 'medium', '400', 'large'].includes(prop),
          default: 'small'
       },
       hideFooter: {
@@ -63,48 +65,52 @@ export default {
       cancelText: String
    },
    emits: ['confirm', 'hide'],
-   computed: {
-      hasHeader () {
-         return !!this.$slots.header;
-      },
-      hasBody () {
-         return !!this.$slots.body;
-      },
-      hasDefault () {
-         return !!this.$slots.default;
-      },
-      modalSizeClass () {
-         if (this.size === 'small')
+   setup (props, { slots, emit }) {
+      const hasHeader = computed(() => !!slots.header);
+      const hasBody = computed(() => !!slots.body);
+      const hasDefault = computed(() => !!slots.default);
+      const modalSizeClass = computed(() => {
+         if (props.size === 'small')
             return 'modal-sm';
-         if (this.size === '400')
+         if (props.size === '400')
             return 'modal-400';
-         else if (this.size === 'large')
+         else if (props.size === 'large')
             return 'modal-lg';
          else return '';
-      }
-   },
-   created () {
-      window.addEventListener('keydown', this.onKey);
-   },
-   beforeUnmount () {
-      window.removeEventListener('keydown', this.onKey);
-   },
-   methods: {
-      confirmModal () {
-         this.$emit('confirm');
-         this.hideModal();
-      },
+      });
 
-      hideModal () {
-         this.$emit('hide');
-      },
-      onKey (e) {
+      const confirmModal = () => {
+         emit('confirm');
+         hideModal();
+      };
+
+      const hideModal = () => {
+         emit('hide');
+      };
+
+      const onKey = (e: KeyboardEvent) => {
          e.stopPropagation();
          if (e.key === 'Escape')
-            this.hideModal();
-      }
+            hideModal();
+      };
+
+      window.addEventListener('keydown', onKey);
+
+      onBeforeUnmount(() => {
+         window.removeEventListener('keydown', onKey);
+      });
+
+      return {
+         hasHeader,
+         hasBody,
+         hasDefault,
+         modalSizeClass,
+         confirmModal,
+         hideModal,
+         onKey
+      };
    }
-};
+});
 </script>
 
 <style scoped>
diff --git a/tsconfig.json b/tsconfig.json
index 33613a2a..606af9f9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "include": [
     "./tests/**/*", 
     "./src/main/**/*", 
+    "./src/renderer/**/*", 
     "./src/common/interfaces/antares.ts"
   ],
   "compilerOptions": {
diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js
index f300182d..5f7cf8f4 100644
--- a/webpack.renderer.config.js
+++ b/webpack.renderer.config.js
@@ -44,7 +44,7 @@ const config = {
          '@': path.resolve(__dirname, 'src/renderer'),
          common: path.resolve(__dirname, 'src/common')
       },
-      extensions: ['', '.js', '.vue', '.json'],
+      extensions: ['', '.js', '.vue', '.ts', '.json'],
       fallback: {
          fs: false,
          path: false,
@@ -88,13 +88,22 @@ const config = {
             use: 'babel-loader',
             exclude: /node_modules/
          },
+         {
+            test: /\.vue$/,
+            loader: 'vue-loader'
+         },
          {
             test: /\.node$/,
             use: 'node-loader'
          },
          {
-            test: /\.vue$/,
-            loader: 'vue-loader'
+            test: /\.ts$/,
+            exclude: /node_modules/,
+            loader: 'ts-loader',
+            options: {
+               appendTsSuffixTo: [/.vue$/],
+               transpileOnly: true
+            }
          },
          {
             test: /\.s(c|a)ss$/,