From 33bd71e216158f9674b1f9ab8568663c72bb80fb Mon Sep 17 00:00:00 2001
From: Martin Reinhardt <contact@martinreinhardt-online.de>
Date: Tue, 19 Nov 2019 05:12:21 +0100
Subject: [PATCH] chore(Build): Resolve tslint errors

---
 ngx-vis.ts        |  4 ++--
 package-lock.json | 14 +++++++-------
 package.json      |  4 ++--
 tsconfig.json     |  7 +++----
 tslint.json       |  3 +++
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ngx-vis.ts b/ngx-vis.ts
index 6d4dabd3..0f0bb93a 100644
--- a/ngx-vis.ts
+++ b/ngx-vis.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { Data, Edge, DataSet, Node, Options } from 'vis-network';
-import { DataItem, DataGroupCollectionType, DataItemCollectionType, TimelineOptions } from 'vis-timeline';
+import { Data, DataSet, Edge, Node, Options } from 'vis-network';
+import { DataGroupCollectionType, DataItem, DataItemCollectionType, TimelineOptions } from 'vis-timeline';
 
 import { VisNetworkDirective } from './components/network/vis-network.directive';
 import { VisNetworkService } from './components/network/vis-network.service';
diff --git a/package-lock.json b/package-lock.json
index 466fd5dc..86cd68fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3533,9 +3533,9 @@
             "dev": true
         },
         "diff": {
-            "version": "3.5.0",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-            "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+            "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
             "dev": true
         },
         "diffie-hellman": {
@@ -12221,16 +12221,16 @@
             "dev": true
         },
         "tslint": {
-            "version": "5.19.0",
-            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.19.0.tgz",
-            "integrity": "sha512-1LwwtBxfRJZnUvoS9c0uj8XQtAnyhWr9KlNvDIdB+oXyT+VpsOAaEhEgKi1HrZ8rq0ki/AAnbGSv4KM6/AfVZw==",
+            "version": "5.20.1",
+            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz",
+            "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.0.0",
                 "builtin-modules": "^1.1.1",
                 "chalk": "^2.3.0",
                 "commander": "^2.12.1",
-                "diff": "^3.2.0",
+                "diff": "^4.0.1",
                 "glob": "^7.1.1",
                 "js-yaml": "^3.13.1",
                 "minimatch": "^3.0.4",
diff --git a/package.json b/package.json
index 20c08b33..53e2438d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "flow.clean": "rimraf bundles coverage dist demo-build \"components/**/*.+(metadata.json|js|d.ts|js.map)\" dist \"ngx-vis.+(js|d.ts|js.map)\"",
   "flow.eslint": "eslint --ignore-path .gitignore --ext js --fix . .config",
   "flow.extract-metadata": "ng-packagr -p package.json",
-  "flow.tslint": "tslint --project tsconfig.json --exclude **/*.d.ts",
+  "flow.tslint": "tslint --project tsconfig.json --fix",
   "flow.lint": "npm run flow.eslint && npm run flow.tslint",
   "flow.build:demo": "cross-env NODE_ENV=production webpack --config .config/webpack.prod.js --progress --color",
   "flow.build:github-pages": "cross-env NODE_ENV=production webpack --config .config/webpack.github.js --progress --color",
@@ -121,7 +121,7 @@
   "to-string-loader": "^1.1.5",
   "ts-helpers": "^1.1.2",
   "tsickle": "^0.37.1",
-  "tslint": "^5.8.0",
+  "tslint": "^5.20.1",
   "tslint-loader": "^3.4.3",
   "typescript": "^3.5.3",
   "webpack": "^4.32.2",
diff --git a/tsconfig.json b/tsconfig.json
index 00a5c401..77c5f12d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
     "target": "es5",
     "module": "commonjs",
     "moduleResolution": "node",
@@ -14,9 +13,9 @@
     "stripInternal": true,
     "baseUrl": ".",
     "paths": {
-        "ngx-vis": [
-            "./ngx-vis.ts"
-        ]
+      "ngx-vis": [
+        "./ngx-vis.ts"
+      ]
     },
     "lib": [
       "dom",
diff --git a/tslint.json b/tslint.json
index d80e6e86..06a96ef1 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,5 +1,8 @@
 {
   "extends": "tslint:latest",
+  "linterOptions": {
+    "exclude": [".config", ".github", "dist", "node_modules"]
+  },
   "rules": {
     "max-line-length": [true, 180],
     "quotemark": false,