diff --git a/js/src/designer/history.js b/js/src/designer/history.js
index b4f94f40cc..70b5ae08bd 100644
--- a/js/src/designer/history.js
+++ b/js/src/designer/history.js
@@ -16,13 +16,13 @@ var DesignerHistory = {};
 
 /**
  * Global array to store history objects.
- * @type {Array}
+ * @type {any[]}
  */
 DesignerHistory.historyArray = [];
 
 /**
  * Global array to store information for columns which are used in select clause.
- * @type {Array}
+ * @type {any[]}
  */
 DesignerHistory.selectField = [];
 
diff --git a/js/src/modules/config.js b/js/src/modules/config.js
index dc798531b7..50c3d4ecdc 100644
--- a/js/src/modules/config.js
+++ b/js/src/modules/config.js
@@ -302,7 +302,7 @@ window.validators = {
  * @param {string}  id       field id
  * @param {string}  type     validator (key in validators object)
  * @param {boolean} onKeyUp  whether fire on key up
- * @param {Array}   params   validation function parameters
+ * @param {any[]}   params   validation function parameters
  */
 Config.registerFieldValidator = (id, type, onKeyUp, params) => {
     if (typeof window.validators[type] === 'undefined') {
diff --git a/js/src/modules/functions.js b/js/src/modules/functions.js
index af0e8d97b0..eba0ef5732 100644
--- a/js/src/modules/functions.js
+++ b/js/src/modules/functions.js
@@ -44,7 +44,7 @@ let sqlAutoCompleteInProgress = false;
 
 /**
  * Object containing list of columns in each table.
- * @type {(array|boolean)}
+ * @type {(any[]|boolean)}
  */
 let sqlAutoComplete = false;
 
@@ -56,7 +56,7 @@ let sqlAutoCompleteDefaultTable = '';
 
 /**
  * Array to hold the columns in central list per db.
- * @type {array}
+ * @type {any[]}
  */
 window.centralColumnList = [];
 
diff --git a/js/src/modules/indexes.js b/js/src/modules/indexes.js
index 025fae8dc4..daa14509e8 100644
--- a/js/src/modules/indexes.js
+++ b/js/src/modules/indexes.js
@@ -20,31 +20,31 @@ const Indexes = {};
 
 /**
  * Array to hold 'Primary' index columns.
- * @type {array}
+ * @type {any[]}
  */
 let primaryColumns = [];
 
 /**
  * Array to hold 'Unique' index columns.
- * @type {array}
+ * @type {any[]}
  */
 let uniqueColumns = [];
 
 /**
  * Array to hold 'Index' columns.
- * @type {array}
+ * @type {any[]}
  */
 let indexColumns = [];
 
 /**
  * Array to hold 'Fulltext' columns.
- * @type {array}
+ * @type {any[]}
  */
 let fulltextColumns = [];
 
 /**
  * Array to hold 'Spatial' columns.
- * @type {array}
+ * @type {any[]}
  */
 let spatialColumns = [];
 
diff --git a/tsconfig.json b/tsconfig.json
index 210eb2d4b7..7294774e54 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,8 +1,4 @@
 {
-    "include": [
-        "./js/global.d.ts",
-        "./js/src/**/*"
-    ],
     "compilerOptions": {
         "target": "es6",
         "module": "es6",
@@ -12,6 +8,10 @@
         "declarationMap": true,
         "checkJs": true,
         "outDir": "./build/js",
-        "allowSyntheticDefaultImports": true
-    }
+        "allowSyntheticDefaultImports": true,
+        "strict": false,
+        "isolatedModules": true
+    },
+    "include": ["./js/global.d.ts", "./js/src/**/*"],
+    "exclude": ["node_modules"]
 }