diff --git a/angular.json b/angular.json
index e58e15f0170..0af64dff122 100644
--- a/angular.json
+++ b/angular.json
@@ -117,7 +117,12 @@
             "options": {
               "protractorConfig": "e2e/protractor.conf.js",
               "devServerTarget": "primeng:serve"
-            }
+            },
+            "configurations": {
+                "production": {
+                  "devServerTarget": "primeng:serve:production"
+                }
+              }
           },
           "lint": {
             "builder": "@angular-devkit/build-angular:tslint",
diff --git a/package-lock.json b/package-lock.json
index 82fb645fe50..a5b844a56ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,33 +1,22 @@
 {
     "name": "primeng",
-    "version": "6.0.1",
+    "version": "6.1.0-rc.1-SNAPSHOT",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
-        "@angular-devkit/architect": {
-            "version": "0.6.8",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.6.8.tgz",
-            "integrity": "sha512-ZKTm/zC61iY9IBHOEAKoMSzZpvhkmv+1O/HHzpHEuR551jCzu6vSyCmMY9Z7GBcccscCV+hjeSMwgFrFRcqlkw==",
-            "dev": true,
-            "requires": {
-                "@angular-devkit/core": "0.6.8",
-                "rxjs": "6.2.1"
-            }
-        },
         "@angular-devkit/build-angular": {
-            "version": "0.6.8",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.6.8.tgz",
-            "integrity": "sha512-VGqYAk8jpISraz2UHfsDre270NOUmV0CTSZw2p9sm5g/XIr5m+IHetFZz3gpoAr9+If2aFTs8Rt3sGdCRzwBqA==",
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.7.1.tgz",
+            "integrity": "sha512-GolB7Av3zTfQ23wDbuMR1b049vRlEVGtfIQCATE05yGmet+w+sogN2/YgRX3dPtG/tEhjJTbTIe5kV0RCVVlqQ==",
             "dev": true,
             "requires": {
-                "@angular-devkit/architect": "0.6.8",
-                "@angular-devkit/build-optimizer": "0.6.8",
-                "@angular-devkit/core": "0.6.8",
-                "@ngtools/webpack": "6.0.8",
+                "@angular-devkit/architect": "0.7.1",
+                "@angular-devkit/build-optimizer": "0.7.1",
+                "@angular-devkit/build-webpack": "0.7.1",
+                "@angular-devkit/core": "0.7.1",
+                "@ngtools/webpack": "6.1.1",
                 "ajv": "6.4.0",
                 "autoprefixer": "8.6.5",
-                "cache-loader": "1.2.2",
-                "chalk": "2.2.2",
                 "circular-dependency-plugin": "5.0.2",
                 "clean-css": "4.1.11",
                 "copy-webpack-plugin": "4.5.2",
@@ -40,8 +29,6 @@
                 "less": "3.5.3",
                 "less-loader": "4.1.0",
                 "license-webpack-plugin": "1.3.1",
-                "lodash": "4.17.10",
-                "memory-fs": "0.4.1",
                 "mini-css-extract-plugin": "0.4.1",
                 "minimatch": "3.0.4",
                 "node-sass": "4.9.2",
@@ -53,10 +40,9 @@
                 "postcss-loader": "2.1.5",
                 "postcss-url": "7.3.2",
                 "raw-loader": "0.5.1",
-                "resolve": "1.8.1",
                 "rxjs": "6.2.1",
-                "sass-loader": "7.0.3",
-                "silent-error": "1.1.0",
+                "sass-loader": "6.0.7",
+                "source-map-loader": "0.2.3",
                 "source-map-support": "0.5.6",
                 "stats-webpack-plugin": "0.6.2",
                 "style-loader": "0.21.0",
@@ -65,85 +51,232 @@
                 "tree-kill": "1.2.0",
                 "uglifyjs-webpack-plugin": "1.2.7",
                 "url-loader": "1.0.1",
-                "webpack": "4.8.3",
+                "webpack": "4.9.2",
                 "webpack-dev-middleware": "3.1.3",
                 "webpack-dev-server": "3.1.4",
                 "webpack-merge": "4.1.3",
                 "webpack-sources": "1.1.0",
                 "webpack-subresource-integrity": "1.1.0-rc.4"
-            }
-        },
-        "@angular-devkit/build-optimizer": {
-            "version": "0.6.8",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.6.8.tgz",
-            "integrity": "sha512-of5syQbv3uNPp4AQkfRecfnp8AE8kvffbfYi+FFPZ6OGr7e59T1fGwk6+Zgb2qQFQg8HO2tzWI/uygtLIqmbmw==",
-            "dev": true,
-            "requires": {
-                "loader-utils": "1.1.0",
-                "source-map": "0.5.7",
-                "typescript": "2.9.2",
-                "webpack-sources": "1.1.0"
             },
             "dependencies": {
+                "@angular-devkit/architect": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.7.1.tgz",
+                    "integrity": "sha512-eJ9hXQ4JC8yJKmCjShikg48IVqYh/0laJ2tnfwrILtwbeM1mDYtpjR5NNUvovR+voYZJyI7uHc/XRu9CCz4NhA==",
+                    "dev": true,
+                    "requires": {
+                        "@angular-devkit/core": "0.7.1",
+                        "rxjs": "6.2.1"
+                    }
+                },
+                "@angular-devkit/build-optimizer": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.7.1.tgz",
+                    "integrity": "sha512-KzuDnrlzpP1ualq8gtq6BhGnhZ4gs9q55Pw/CHDFNUK7f4Ikw0eNyfdfyT5tVSYphgvYb/Msmk7YcyzTveunVw==",
+                    "dev": true,
+                    "requires": {
+                        "loader-utils": "1.1.0",
+                        "source-map": "0.5.7",
+                        "typescript": "2.9.2",
+                        "webpack-sources": "1.1.0"
+                    }
+                },
+                "@angular-devkit/core": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.1.tgz",
+                    "integrity": "sha512-m+j1d+oMZRu0jUN7UyE4C8Kh8YoY9TP6ltjcrO2SzE89mzHg+apY1taf4EzOYKrrCZxw7Q4viPa8EXeF2AJ1cQ==",
+                    "dev": true,
+                    "requires": {
+                        "ajv": "6.4.0",
+                        "chokidar": "2.0.4",
+                        "rxjs": "6.2.1",
+                        "source-map": "0.5.7"
+                    }
+                },
+                "@ngtools/webpack": {
+                    "version": "6.1.1",
+                    "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.1.1.tgz",
+                    "integrity": "sha512-PfZhltQmzmyF67GLgcAgVcbEHsl8VpIBUZFp3P6sGpn+/U2r6dRSHKI02882KHsRl4sdjFkP9o72q37/Ah4yfQ==",
+                    "dev": true,
+                    "requires": {
+                        "@angular-devkit/core": "0.7.1",
+                        "rxjs": "6.2.1",
+                        "tree-kill": "1.2.0",
+                        "webpack-sources": "1.1.0"
+                    }
+                },
+                "sass-loader": {
+                    "version": "6.0.7",
+                    "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz",
+                    "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
+                    "dev": true,
+                    "requires": {
+                        "clone-deep": "2.0.2",
+                        "loader-utils": "1.1.0",
+                        "lodash.tail": "4.1.1",
+                        "neo-async": "2.5.1",
+                        "pify": "3.0.0"
+                    }
+                },
                 "typescript": {
                     "version": "2.9.2",
                     "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
                     "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
                     "dev": true
+                },
+                "webpack": {
+                    "version": "4.9.2",
+                    "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.9.2.tgz",
+                    "integrity": "sha512-jlWrCrJDU3sdWFprel6jHH8esN2C++Q8ehedRo74u7MWLTUJn9SD7RSgsCTEZCSRpVpMascDylAqPoldauOMfA==",
+                    "dev": true,
+                    "requires": {
+                        "@webassemblyjs/ast": "1.4.3",
+                        "@webassemblyjs/wasm-edit": "1.4.3",
+                        "@webassemblyjs/wasm-parser": "1.4.3",
+                        "acorn": "5.7.1",
+                        "acorn-dynamic-import": "3.0.0",
+                        "ajv": "6.4.0",
+                        "ajv-keywords": "3.2.0",
+                        "chrome-trace-event": "0.1.3",
+                        "enhanced-resolve": "4.1.0",
+                        "eslint-scope": "3.7.1",
+                        "json-parse-better-errors": "1.0.2",
+                        "loader-runner": "2.3.0",
+                        "loader-utils": "1.1.0",
+                        "memory-fs": "0.4.1",
+                        "micromatch": "3.1.10",
+                        "mkdirp": "0.5.1",
+                        "neo-async": "2.5.1",
+                        "node-libs-browser": "2.1.0",
+                        "schema-utils": "0.4.5",
+                        "tapable": "1.0.0",
+                        "uglifyjs-webpack-plugin": "1.2.7",
+                        "watchpack": "1.6.0",
+                        "webpack-sources": "1.1.0"
+                    }
                 }
             }
         },
-        "@angular-devkit/core": {
-            "version": "0.6.8",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz",
-            "integrity": "sha512-rkIa1OSVWTt4g9leLSK/PsqOj3HZbDKHbZjqlslyfVa3AyCeiumFoOgViOVXlYgPX3HHDbE5uH24nyUWSD8uww==",
-            "dev": true,
-            "requires": {
-                "ajv": "6.4.0",
-                "chokidar": "2.0.4",
-                "rxjs": "6.2.1",
-                "source-map": "0.5.7"
-            }
-        },
-        "@angular-devkit/schematics": {
-            "version": "0.6.8",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.6.8.tgz",
-            "integrity": "sha512-R4YqAUdo62wtrhX/5HSRGSKXNTWqfQb66ZE6m8jj6GEJNFKdNXMdxOchxr07LCiKTxfh1w6G3nGzxIsu/+D4KA==",
+        "@angular-devkit/build-webpack": {
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.7.1.tgz",
+            "integrity": "sha512-GC70ZjSzvgzsMBvxT4ZzupSR2XaGgXizh2gT+l0R+nHe95OmImea0XqB3ph0ogUsgN5keNjh8m0Fr+qb3QNkBA==",
             "dev": true,
             "requires": {
-                "@angular-devkit/core": "0.6.8",
+                "@angular-devkit/architect": "0.7.1",
+                "@angular-devkit/core": "0.7.1",
                 "rxjs": "6.2.1"
+            },
+            "dependencies": {
+                "@angular-devkit/architect": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.7.1.tgz",
+                    "integrity": "sha512-eJ9hXQ4JC8yJKmCjShikg48IVqYh/0laJ2tnfwrILtwbeM1mDYtpjR5NNUvovR+voYZJyI7uHc/XRu9CCz4NhA==",
+                    "dev": true,
+                    "requires": {
+                        "@angular-devkit/core": "0.7.1",
+                        "rxjs": "6.2.1"
+                    }
+                },
+                "@angular-devkit/core": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.1.tgz",
+                    "integrity": "sha512-m+j1d+oMZRu0jUN7UyE4C8Kh8YoY9TP6ltjcrO2SzE89mzHg+apY1taf4EzOYKrrCZxw7Q4viPa8EXeF2AJ1cQ==",
+                    "dev": true,
+                    "requires": {
+                        "ajv": "6.4.0",
+                        "chokidar": "2.0.4",
+                        "rxjs": "6.2.1",
+                        "source-map": "0.5.7"
+                    }
+                }
             }
         },
         "@angular/animations": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.7.tgz",
-            "integrity": "sha512-yOig45sxzpEmlXy+eFgh2v2yxoE/Hh9rn7BX82uj71yobSpCYoe58AEOay1cu0FCcLi/P5qltHepDrRRxNxPMw==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.0.tgz",
+            "integrity": "sha512-9IJs1czyoOlgcaY3QUyQI0XeTFX45Qr/o5qlPrce240gi7TXbdJs3WIbLzxx7BhMf20GholCaOvSS3BZrNlFSA==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
         "@angular/cli": {
-            "version": "6.0.8",
-            "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.0.8.tgz",
-            "integrity": "sha512-DhH1Zq5Yonthw6zh6W07fhf+9XrAZbD1fcQ0MrmbxlieCfLlTAdBqyK2LavFCKwSZkUMLF6UHM3+jiNRVZSSIg==",
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.1.1.tgz",
+            "integrity": "sha512-lY8c6x6mJsIEQRKajjxNxTaG0WlcHZp+0wP+aJ5n4plmYKxTIVo4IMTRpzMxNBnPy//OKD9gRM2hPbik7+7geQ==",
             "dev": true,
             "requires": {
-                "@angular-devkit/architect": "0.6.8",
-                "@angular-devkit/core": "0.6.8",
-                "@angular-devkit/schematics": "0.6.8",
-                "@schematics/angular": "0.6.8",
-                "@schematics/update": "0.6.8",
+                "@angular-devkit/architect": "0.7.1",
+                "@angular-devkit/core": "0.7.1",
+                "@angular-devkit/schematics": "0.7.1",
+                "@schematics/angular": "0.7.1",
+                "@schematics/update": "0.7.1",
                 "opn": "5.3.0",
-                "resolve": "1.8.1",
                 "rxjs": "6.2.1",
                 "semver": "5.5.0",
-                "silent-error": "1.1.0",
                 "symbol-observable": "1.2.0",
                 "yargs-parser": "10.1.0"
             },
             "dependencies": {
+                "@angular-devkit/architect": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.7.1.tgz",
+                    "integrity": "sha512-eJ9hXQ4JC8yJKmCjShikg48IVqYh/0laJ2tnfwrILtwbeM1mDYtpjR5NNUvovR+voYZJyI7uHc/XRu9CCz4NhA==",
+                    "dev": true,
+                    "requires": {
+                        "@angular-devkit/core": "0.7.1",
+                        "rxjs": "6.2.1"
+                    }
+                },
+                "@angular-devkit/core": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.1.tgz",
+                    "integrity": "sha512-m+j1d+oMZRu0jUN7UyE4C8Kh8YoY9TP6ltjcrO2SzE89mzHg+apY1taf4EzOYKrrCZxw7Q4viPa8EXeF2AJ1cQ==",
+                    "dev": true,
+                    "requires": {
+                        "ajv": "6.4.0",
+                        "chokidar": "2.0.4",
+                        "rxjs": "6.2.1",
+                        "source-map": "0.5.7"
+                    }
+                },
+                "@angular-devkit/schematics": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.7.1.tgz",
+                    "integrity": "sha512-8G223dq6RgV1tvp3od6mn5TX3VH57OWCN+v6pz4o27pDOQUhxX94VeuetOrhe2oYu4nmcs8epCateG4CJF7phg==",
+                    "dev": true,
+                    "requires": {
+                        "@angular-devkit/core": "0.7.1",
+                        "rxjs": "6.2.1"
+                    }
+                },
+                "@schematics/angular": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.7.1.tgz",
+                    "integrity": "sha512-wvP1ofwKVIbu3UCCsLTxdNZ7D0iVl0njoHvFEiMAQEVO+1VnhY3y+xpvnujhmU0pdYfIv17mc/hRNwEH6gQwkQ==",
+                    "dev": true,
+                    "requires": {
+                        "@angular-devkit/core": "0.7.1",
+                        "@angular-devkit/schematics": "0.7.1",
+                        "typescript": "2.7.2"
+                    }
+                },
+                "@schematics/update": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.7.1.tgz",
+                    "integrity": "sha512-b2LXdqGMhQVA4Iy3JzBpalRDQy/kuFzDob3nh2DuYtriJLnvRuAvIQ9J6bbUGpQhad8ED+lDjx2ADt1gfBg9xQ==",
+                    "dev": true,
+                    "requires": {
+                        "@angular-devkit/core": "0.7.1",
+                        "@angular-devkit/schematics": "0.7.1",
+                        "npm-registry-client": "8.5.1",
+                        "rc": "1.2.8",
+                        "rxjs": "6.2.1",
+                        "semver": "5.5.0",
+                        "semver-intersect": "1.3.1"
+                    }
+                },
                 "camelcase": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
@@ -162,33 +295,33 @@
             }
         },
         "@angular/common": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.7.tgz",
-            "integrity": "sha512-MUCCs3FLwqyp5wuvkUTHVGMTd3bNGDxD5IJNvaLgVliGe4r0IlETRXYqyRPs7gdVFPbiJ97P1DUONArj9xL9XA==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.0.tgz",
+            "integrity": "sha512-uxdjxbuTYiCsOcrfO9EumGrfXo+7nB7HlS9F4wraKcnR22oJYNUh36meFKZwpoj5pDIBLnZQu75boI16o3W+SQ==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
         "@angular/compiler": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.7.tgz",
-            "integrity": "sha512-J9I2U4NiWIBXl0ZOJkBW5G7xXhphggSirTwFLD4yKCTeJXgyldZytJZRkDUx1uouZtI2/PycvaOZoRr85N67AA==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.0.tgz",
+            "integrity": "sha512-5c8ZYCFv0xccy0F12zBRIJX0pJd9BgCThJuhVJAuaRFFOqPZl8FKEO3SFqKJNywT0UktZD9JpYFKxhUVxuSHDg==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
         "@angular/compiler-cli": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.7.tgz",
-            "integrity": "sha512-nDIo4TtE3oXgZiQ5vJEcr5fi3FuXRDJQSOeOQinpCrtEt3s4pU5WAX5DLFGPSD2C/EXRDvHZgF9OTJeu5U4ErQ==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.0.tgz",
+            "integrity": "sha512-g4fXQwAYnxtr08BK3CiodJsUXz3fIBCVfZaWIcLMdOlyarFDEvB3TA9qfPkQtlndm87WpXjZ6Xd9OAkmG8t8dw==",
             "dev": true,
             "requires": {
                 "chokidar": "1.7.0",
                 "minimist": "1.2.0",
                 "reflect-metadata": "0.1.12",
-                "tsickle": "0.29.0"
+                "tsickle": "0.30.0"
             },
             "dependencies": {
                 "anymatch": {
@@ -321,105 +454,88 @@
                     "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
                     "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
                     "dev": true
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
+                "tsickle": {
+                    "version": "0.30.0",
+                    "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.30.0.tgz",
+                    "integrity": "sha512-A4ALnEDQNrECn5xhgHmoXKM5qERCM395pKIfqcV57ex3zEInVogu/A191Btv8OPEINkr3xQ3Q2XRywyqkge3Qg==",
+                    "dev": true,
+                    "requires": {
+                        "jasmine-diff": "0.1.3",
+                        "minimist": "1.2.0",
+                        "mkdirp": "0.5.1",
+                        "source-map": "0.6.1",
+                        "source-map-support": "0.5.6"
+                    }
                 }
             }
         },
         "@angular/core": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.7.tgz",
-            "integrity": "sha512-aZ0NvbYsMGqg0zUu7+9vuDxnGzwe++RsBBhlwHZHz1ZZwJmU6VJhUhaI+MuKC7rHyFFr9vUxvJ7ilhGaK2+J7A==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.0.tgz",
+            "integrity": "sha512-gWu9Q7q2+fhFC5dl/BvGW7Ha7NUJtK9wQLYQlfIMim4lKTOiM1/S0MYBVMrEq58ldMr9DnA35f5jGno3x6/v+g==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
         "@angular/forms": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.7.tgz",
-            "integrity": "sha512-bFRdWxLmTiG7z0yZaq22oBHTgVSpJwUJEbZ5ieu21JqTgIDYne+YR/xCJrPj+P2S5NDlEK84g/4y4GoNt/thhQ==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.0.tgz",
+            "integrity": "sha512-6InfsKWEL9w2RvTXjy5R3F8GRjENT9d444o95aSvf+ZK7KsYOeIwcYgN2pw+LjfNu2O3EbAqps8APQ6oD/Fn3A==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
         "@angular/http": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.7.tgz",
-            "integrity": "sha512-zk/kjsfEXjEQIRpmsjuJO5wgFNxj7JGY6Bq0nianZuyCuj/mlm0zflww2NLX4O22IMnvVSun2Kx+kDY44n4hfw==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.0.tgz",
+            "integrity": "sha512-Tky6T93xX22m7zeXSdxALXglKh00QerubV9+exKLUethDGE/xvdRKKdsiMo72w+4yj/1bXAd4fXw+SDneUco7Q==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
         "@angular/language-service": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.0.7.tgz",
-            "integrity": "sha512-R96kTy9Hpy5QPHirJz+5JjnzjJZdwbGwZ6rpq79Fe15RYaYfMjFTAAhmmOgWrnTFBug0QWBWyKV7950JcJIr3Q==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.1.0.tgz",
+            "integrity": "sha512-5Sunf/YnsoHeChpE0NAeT7XfCPfUQt2i8TBWqPH+wCfaTVZB45gU/zlqx6VtR4/4CUof6rM6MeVlHjOm2YlHeg==",
             "dev": true
         },
         "@angular/platform-browser": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.7.tgz",
-            "integrity": "sha512-CASH1CDr2DD+aBrWN9qpDDFTI3H6p/oqH23h28bEV+LZl7F57r4sj8KXKgaE+mcrOFRQqXTAlPoq3hRCLmhtVA==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.0.tgz",
+            "integrity": "sha512-LcpcHLpy+fjN+gKcnTkWuTTuF+uYT350mje1kNr4Advoco76tXYBjAda/EehG+vmQmDTd5E+uxJhKJr/1POVEw==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
         "@angular/platform-browser-dynamic": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.7.tgz",
-            "integrity": "sha512-8G45A9w8UJvX3vPEHqeJHt/sd0zu6w1M+rsnOCo78r35SjsLbrmDNhc4VkLZFJ+iNjgPWtNtdpeXQqtTHE46yw==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.0.tgz",
+            "integrity": "sha512-gjOJ38ciuIgdAuG8bEs/sdJmkfm/oICLrCcQexz+EUCZAiqbKDb0HvFTDaKaLtR7iDbTXVMQhoYMOyTY40FwLQ==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
         "@angular/router": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.7.tgz",
-            "integrity": "sha512-KuQBeIgfiwV3bLafepMhYVJQIAF8cTckCudFh5Z0OqckJgGsWSgtvEdtBctPi+lzt7OQBi7Ym2rOv3X0dOvu0Q==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.0.tgz",
+            "integrity": "sha512-tIcHLuat19cnoQBbOfe/8zAHVqf/9S17YgwSO6VUPTuXLRe9ZBgYT50BzqRhcm8ODOqVmLBQYlzP7zRcNRkHDA==",
             "dev": true,
             "requires": {
                 "tslib": "1.9.3"
             }
         },
-        "@ngtools/webpack": {
-            "version": "6.0.8",
-            "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.0.8.tgz",
-            "integrity": "sha512-jorGpTd82ILbyUwg4JQekovHFaYwSMlZan4f7x+sd3+2WgyL3Z1+ZbVSGKvXZWKS/mAVx7eLkRikzJkuC4FgHw==",
-            "dev": true,
-            "requires": {
-                "@angular-devkit/core": "0.6.8",
-                "tree-kill": "1.2.0",
-                "webpack-sources": "1.1.0"
-            }
-        },
-        "@schematics/angular": {
-            "version": "0.6.8",
-            "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.6.8.tgz",
-            "integrity": "sha512-9kRphqTYG5Df/I8fvnT1zMsw0YNDPO9tl18tQZXj4am4raT7l9UCr+WkwJdlBoA5pwG6baWE9sL0iGWV/bzF/g==",
-            "dev": true,
-            "requires": {
-                "@angular-devkit/core": "0.6.8",
-                "@angular-devkit/schematics": "0.6.8",
-                "typescript": "2.7.2"
-            }
-        },
-        "@schematics/update": {
-            "version": "0.6.8",
-            "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.6.8.tgz",
-            "integrity": "sha512-1Uq7LYnwL2wBwGVCgNz76QAR13ghAk+2vDDHOi+VX5+usHManxydrpoMGeX66OBPd+y5D3D2MFb+8mYHE7mygg==",
-            "dev": true,
-            "requires": {
-                "@angular-devkit/core": "0.6.8",
-                "@angular-devkit/schematics": "0.6.8",
-                "npm-registry-client": "8.5.1",
-                "rxjs": "6.2.1",
-                "semver": "5.5.0",
-                "semver-intersect": "1.3.1"
-            }
-        },
         "@types/jasmine": {
             "version": "2.8.8",
             "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.8.tgz",
@@ -1673,18 +1789,6 @@
                 "unset-value": "1.0.0"
             }
         },
-        "cache-loader": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-1.2.2.tgz",
-            "integrity": "sha512-rsGh4SIYyB9glU+d0OcHwiXHXBoUgDhHZaQ1KAbiXqfz1CDPxtTboh1gPbJ0q2qdO8a9lfcjgC5CJ2Ms32y5bw==",
-            "dev": true,
-            "requires": {
-                "loader-utils": "1.1.0",
-                "mkdirp": "0.5.1",
-                "neo-async": "2.5.1",
-                "schema-utils": "0.4.5"
-            }
-        },
         "callsite": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
@@ -2534,6 +2638,12 @@
             "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
             "dev": true
         },
+        "deep-extend": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+            "dev": true
+        },
         "deep-is": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -6339,6 +6449,15 @@
             "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
             "dev": true
         },
+        "jasmine-diff": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/jasmine-diff/-/jasmine-diff-0.1.3.tgz",
+            "integrity": "sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=",
+            "dev": true,
+            "requires": {
+                "diff": "3.5.0"
+            }
+        },
         "jasmine-spec-reporter": {
             "version": "4.2.1",
             "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
@@ -6398,6 +6517,12 @@
             "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
             "dev": true
         },
+        "json-parse-better-errors": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+            "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+            "dev": true
+        },
         "json-schema": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -6689,9 +6814,9 @@
             }
         },
         "karma-coverage-istanbul-reporter": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.3.tgz",
-            "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.1.tgz",
+            "integrity": "sha512-UcgrHkFehI5+ivMouD8NH/UOHiX4oCAtwaANylzPFdcAuD52fnCUuelacq2gh8tZ4ydhU3+xiXofSq7j5Ehygw==",
             "dev": true,
             "requires": {
                 "istanbul-api": "1.3.1",
@@ -9020,6 +9145,26 @@
             "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
             "dev": true
         },
+        "rc": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+            "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+            "dev": true,
+            "requires": {
+                "deep-extend": "0.6.0",
+                "ini": "1.3.5",
+                "minimist": "1.2.0",
+                "strip-json-comments": "2.0.1"
+            },
+            "dependencies": {
+                "minimist": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                    "dev": true
+                }
+            }
+        },
         "read-cache": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -9509,19 +9654,6 @@
                 }
             }
         },
-        "sass-loader": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.3.tgz",
-            "integrity": "sha512-iaSFtQcGo4SSgDw5Aes5p4VTrA5jCGSA7sGmhPIcOloBlgI1VktM2MUrk2IHHjbNagckXlPz+HWq1vAAPrcYxA==",
-            "dev": true,
-            "requires": {
-                "clone-deep": "2.0.2",
-                "loader-utils": "1.1.0",
-                "lodash.tail": "4.1.1",
-                "neo-async": "2.5.1",
-                "pify": "3.0.0"
-            }
-        },
         "saucelabs": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz",
@@ -9810,15 +9942,6 @@
             "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
             "dev": true
         },
-        "silent-error": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/silent-error/-/silent-error-1.1.0.tgz",
-            "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=",
-            "dev": true,
-            "requires": {
-                "debug": "2.6.9"
-            }
-        },
         "slash": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -10137,6 +10260,46 @@
             "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
             "dev": true
         },
+        "source-map-loader": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.3.tgz",
+            "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==",
+            "dev": true,
+            "requires": {
+                "async": "2.6.1",
+                "loader-utils": "0.2.17",
+                "source-map": "0.6.1"
+            },
+            "dependencies": {
+                "async": {
+                    "version": "2.6.1",
+                    "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+                    "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+                    "dev": true,
+                    "requires": {
+                        "lodash": "4.17.10"
+                    }
+                },
+                "loader-utils": {
+                    "version": "0.2.17",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+                    "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+                    "dev": true,
+                    "requires": {
+                        "big.js": "3.2.0",
+                        "emojis-list": "2.1.0",
+                        "json5": "0.5.1",
+                        "object-assign": "4.1.1"
+                    }
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                }
+            }
+        },
         "source-map-resolve": {
             "version": "0.5.2",
             "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
@@ -10433,6 +10596,12 @@
                 "get-stdin": "4.0.1"
             }
         },
+        "strip-json-comments": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+            "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+            "dev": true
+        },
         "style-loader": {
             "version": "0.21.0",
             "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz",
@@ -10785,32 +10954,6 @@
                 }
             }
         },
-        "tsickle": {
-            "version": "0.29.0",
-            "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.29.0.tgz",
-            "integrity": "sha512-JpID0Lv8/irRtPmqJJxb5fCwfZhjZeKmav9Zna7UjqVuJoSbI49Wue/c2PPybX1SbRrjl7bbI/JsCl0dSUJygA==",
-            "dev": true,
-            "requires": {
-                "minimist": "1.2.0",
-                "mkdirp": "0.5.1",
-                "source-map": "0.6.1",
-                "source-map-support": "0.5.6"
-            },
-            "dependencies": {
-                "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                }
-            }
-        },
         "tslib": {
             "version": "1.9.3",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
@@ -11514,36 +11657,6 @@
                 }
             }
         },
-        "webpack": {
-            "version": "4.8.3",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.8.3.tgz",
-            "integrity": "sha512-/hfAjBISycdK597lxONjKEFX7dSIU1PsYwC3XlXUXoykWBlv9QV5HnO+ql3HvrrgfBJ7WXdnjO9iGPR2aAc5sw==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.4.3",
-                "@webassemblyjs/wasm-edit": "1.4.3",
-                "@webassemblyjs/wasm-parser": "1.4.3",
-                "acorn": "5.7.1",
-                "acorn-dynamic-import": "3.0.0",
-                "ajv": "6.4.0",
-                "ajv-keywords": "3.2.0",
-                "chrome-trace-event": "0.1.3",
-                "enhanced-resolve": "4.1.0",
-                "eslint-scope": "3.7.1",
-                "loader-runner": "2.3.0",
-                "loader-utils": "1.1.0",
-                "memory-fs": "0.4.1",
-                "micromatch": "3.1.10",
-                "mkdirp": "0.5.1",
-                "neo-async": "2.5.1",
-                "node-libs-browser": "2.1.0",
-                "schema-utils": "0.4.5",
-                "tapable": "1.0.0",
-                "uglifyjs-webpack-plugin": "1.2.7",
-                "watchpack": "1.6.0",
-                "webpack-sources": "1.1.0"
-            }
-        },
         "webpack-core": {
             "version": "0.6.9",
             "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
diff --git a/package.json b/package.json
index 241636ed8a1..7c36d2a4d54 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "primeng",
-    "version": "6.1.0-SNAPSHOT",
+    "version": "6.1.0-rc.1-SNAPSHOT",
     "license": "MIT",
     "scripts": {
         "ng": "ng",
@@ -15,23 +15,22 @@
         "url": "https://github.com/primefaces/primeng.git"
     },
     "devDependencies": {
-        "@angular/animations": "^6.0.2",
-        "@angular/common": "^6.0.2",
-        "@angular/compiler": "^6.0.2",
-        "@angular/core": "^6.0.2",
-        "@angular/forms": "^6.0.2",
-        "@angular/http": "^6.0.2",
-        "@angular/platform-browser": "^6.0.2",
-        "@angular/platform-browser-dynamic": "^6.0.2",
-        "@angular/router": "^6.0.2",
+        "@angular/animations": "^6.1.0",
+        "@angular/common": "^6.1.0",
+        "@angular/compiler": "^6.1.0",
+        "@angular/core": "^6.1.0",
+        "@angular/forms": "^6.1.0",
+        "@angular/http": "^6.1.0",
+        "@angular/platform-browser": "^6.1.0",
+        "@angular/platform-browser-dynamic": "^6.1.0",
+        "@angular/router": "^6.1.0",
         "core-js": "^2.5.4",
         "rxjs": "^6.0.0",
-        "zone.js": "^0.8.26",
-        "@angular/compiler-cli": "^6.0.2",
-        "@angular-devkit/build-angular": "~0.6.3",
-        "typescript": "~2.7.2",
-        "@angular/cli": "~6.0.3",
-        "@angular/language-service": "^6.0.2",
+        "zone.js": "~0.8.26",
+        "@angular-devkit/build-angular": "~0.7.0",
+        "@angular/cli": "~6.1.1",
+        "@angular/compiler-cli": "^6.1.0",
+        "@angular/language-service": "^6.1.0",
         "@types/jasmine": "~2.8.6",
         "@types/jasminewd2": "~2.0.3",
         "@types/node": "~8.9.4",
@@ -40,12 +39,13 @@
         "jasmine-spec-reporter": "~4.2.1",
         "karma": "~1.7.1",
         "karma-chrome-launcher": "~2.2.0",
-        "karma-coverage-istanbul-reporter": "~1.4.2",
+        "karma-coverage-istanbul-reporter": "~2.0.0",
         "karma-jasmine": "~1.1.1",
         "karma-jasmine-html-reporter": "^0.2.2",
         "protractor": "~5.3.0",
         "ts-node": "~5.0.1",
         "tslint": "~5.9.1",
+        "typescript": "~2.7.2",
         "chart.js": "2.7.1",
         "del": "2.2.0",
         "font-awesome": "4.7.0",
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index 4007305e887..1a20dd09145 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -1,13 +1,11 @@
 {
     "extends": "../tsconfig.json",
     "compilerOptions": {
-      "outDir": "../out-tsc/app",
-      "module": "es2015",
-      "types": []
+        "outDir": "../out-tsc/app",
+        "types": []
     },
     "exclude": [
-      "src/test.ts",
-      "**/*.spec.ts"
+        "src/test.ts",
+        "**/*.spec.ts"
     ]
-  }
-  
\ No newline at end of file
+}
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index 51b6f653320..0a65d17bb48 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -1,20 +1,18 @@
 {
     "extends": "../tsconfig.json",
     "compilerOptions": {
-      "outDir": "../out-tsc/spec",
-      "module": "commonjs",
-      "types": [
-        "jasmine",
-        "node"
-      ]
+        "outDir": "../out-tsc/spec",
+        "types": [
+            "jasmine",
+            "node"
+        ]
     },
     "files": [
-      "test.ts",
-      "polyfills.ts"
+        "test.ts",
+        "polyfills.ts"
     ],
     "include": [
-      "**/*.spec.ts",
-      "**/*.d.ts"
+        "**/*.spec.ts",
+        "**/*.d.ts"
     ]
-  }
-  
\ No newline at end of file
+}
diff --git a/tsconfig.json b/tsconfig.json
index 0bfef80dcdc..11608faac46 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,20 +1,21 @@
 {
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "target": "es5",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ]
-  }
+    "compileOnSave": false,
+    "compilerOptions": {
+        "baseUrl": "./",
+        "outDir": "./dist/out-tsc",
+        "sourceMap": true,
+        "declaration": false,
+        "module": "es2015",
+        "moduleResolution": "node",
+        "emitDecoratorMetadata": true,
+        "experimentalDecorators": true,
+        "target": "es5",
+        "typeRoots": [
+            "node_modules/@types"
+        ],
+        "lib": [
+            "es2017",
+            "dom"
+        ]
+    }
 }
\ No newline at end of file