From 266f089b3ed38219e6a12c56c1bf339ec9145846 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Wed, 5 May 2021 09:47:35 +0200
Subject: [PATCH] Cleanup tsconfig (#866)

* Simplify tsconfig

* Add separate tsconfig for renderer to get rid of last warnings
---
 package-lock.json       |  6 ++++++
 package.json            |  1 +
 src/app/dummy.module.ts | 14 --------------
 tsconfig.json           | 16 ++++------------
 tsconfig.renderer.json  |  8 ++++++++
 webpack.renderer.js     |  2 +-
 6 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 src/app/dummy.module.ts
 create mode 100644 tsconfig.renderer.json

diff --git a/package-lock.json b/package-lock.json
index c87d5c1c..d057305c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1066,6 +1066,12 @@
       "integrity": "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==",
       "dev": true
     },
+    "@types/duo_web_sdk": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@types/duo_web_sdk/-/duo_web_sdk-2.7.0.tgz",
+      "integrity": "sha512-E8cRtor4+hYNVYZ/hk+0WoZtiGOWvxhX3UsJtNtVlDIk2d8dnbYX6wdhqBTwixPpw7ea3I8IS3BAK81GRXyLUQ==",
+      "dev": true
+    },
     "@types/fs-extra": {
       "version": "9.0.11",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
diff --git a/package.json b/package.json
index 229c478e..bfd9083f 100644
--- a/package.json
+++ b/package.json
@@ -248,6 +248,7 @@
   "devDependencies": {
     "@angular/compiler-cli": "^11.2.10",
     "@ngtools/webpack": "^11.2.10",
+    "@types/duo_web_sdk": "^2.7.0",
     "@types/lunr": "^2.3.3",
     "@types/node": "^10.17.58",
     "@types/node-forge": "^0.9.7",
diff --git a/src/app/dummy.module.ts b/src/app/dummy.module.ts
deleted file mode 100644
index 06195542..00000000
--- a/src/app/dummy.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { InputVerbatimDirective } from 'jslib/angular/directives/input-verbatim.directive';
-import { SearchPipe } from 'jslib/angular/pipes/search.pipe';
-
-@NgModule({
-    imports: [],
-    declarations: [
-        InputVerbatimDirective,
-        SearchPipe,
-    ],
-})
-export class DummyModule {
-}
diff --git a/tsconfig.json b/tsconfig.json
index ac173eef..738e28a0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,17 +21,9 @@
   "angularCompilerOptions": {
     "preserveWhitespaces": true
   },
-  "exclude": [
-    "node_modules",
-    "jslib/node_modules",
-    "proxy",
-    "dist",
-    "dist-safari",
-    "jslib/dist",
-    "build",
-    "jslib/spec",
-    "jslib/src/cli",
-    "jslib/src/services/nodeApi.service.ts",
-    "jslib/src/services/lowdbStorage.service.ts"
+  "files": [
+    "src/entry.ts",
+    "src/global.d.ts",
+    "jslib/src/globals.d.ts"
   ]
 }
diff --git a/tsconfig.renderer.json b/tsconfig.renderer.json
new file mode 100644
index 00000000..e7500456
--- /dev/null
+++ b/tsconfig.renderer.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "files": [
+    "src/app/main.ts",
+    "src/global.d.ts",
+    "jslib/src/globals.d.ts"
+  ]
+}
diff --git a/webpack.renderer.js b/webpack.renderer.js
index 16e63424..87f30ab5 100644
--- a/webpack.renderer.js
+++ b/webpack.renderer.js
@@ -108,7 +108,7 @@ const renderer = {
     },
     plugins: [
         new AngularCompilerPlugin({
-            tsConfigPath: 'tsconfig.json',
+            tsConfigPath: 'tsconfig.renderer.json',
             entryModule: 'src/app/app.module#AppModule',
             sourceMap: true,
         }),