From f2a5cc20f6d34494d67018e8d3634719fc5ccea5 Mon Sep 17 00:00:00 2001
From: kiswa <kiswa.com@gmail.com>
Date: Fri, 23 Sep 2016 12:42:50 +0000
Subject: [PATCH] Update dependencies

---
 .travis.yml   |  1 -
 gulpfile.js   | 17 +++++------------
 package.json  |  8 +++++---
 tsconfig.json |  9 ++-------
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b240e0c..f155cf5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ before_script:
   - nvm install 4
   - nvm use 4
   - npm i -g gulp typings
-  - npm i escape-string-regexp
   - npm i
   - touch tests.db
   - chmod a+w tests.db
diff --git a/gulpfile.js b/gulpfile.js
index 7cec51a..3c26e54 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -41,6 +41,7 @@ let gulp = require('gulp'),
         images: 'src/images/**/*.*',
         scss: 'src/scss/**/*.scss',
         scssMain: 'src/scss/main.scss',
+        app: 'src/app/**/*.ts',
         api: [
             'src/api/**/*.*',
             'src/api/.htaccess',
@@ -93,22 +94,14 @@ gulp.task('scss', () => {
 gulp.task('tsc', () => {
     del('build/');
 
-    let tsProject = tsc.createProject('tsconfig.json'),
-        tsResult = tsProject.src()
-            .pipe(tsc(tsProject));
+    let tsProject = tsc.createProject('tsconfig.json');
 
-    return tsResult.js
+    return gulp.src(paths.app)
+        .pipe(tsProject())
         .pipe(gulp.dest('build/'));
 });
 
-gulp.task('sourceMaps', () => {
-    return gulp.src([
-            'node_modules/reflect-metadata/Reflect.js.map'
-        ])
-        .pipe(gulp.dest('dist/js/'));
-});
-
-gulp.task('vendor', ['sourceMaps'], () => {
+gulp.task('vendor', () => {
     return gulp.src([
             'node_modules/core-js/client/shim.js',
             'node_modules/zone.js/dist/zone.js',
diff --git a/package.json b/package.json
index 771f238..8c3bc18 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "core-js": "^2.4.1",
     "del": "^2.2.2",
     "dragula": "^3.7.2",
+    "escape-string-regexp": "^1.0.5",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^3.1.1",
     "gulp-chmod": "^1.3.0",
@@ -53,10 +54,10 @@
     "gulp-cssnano": "^2.1.2",
     "gulp-imagemin": "^3.0.3",
     "gulp-mocha": "^3.0.1",
-    "gulp-phpunit": "^0.18.0",
+    "gulp-phpunit": "^0.19.0",
     "gulp-sass": "^2.3.2",
     "gulp-scss-lint": "^0.4.0",
-    "gulp-typescript": "^2.14.1",
+    "gulp-typescript": "^3.0.0",
     "gulp-uglify": "^2.0.0",
     "gulp-util": "^3.0.7",
     "merge-stream": "^1.0.0",
@@ -68,7 +69,8 @@
     "systemjs": "0.19.38",
     "systemjs-builder": "0.15.31",
     "touch": "^1.0.0",
-    "typings": "^1.3.3",
+    "typescript": "^2.0.3",
+    "typings": "^1.4.0",
     "zone.js": "^0.6.23"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index ff10b2b..f1975e6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,11 +6,6 @@
         "sourceMap": false,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
-        "removeComments": true,
-        "noImplicitAny": false
-    },
-    "exclude": [
-        "node_modules",
-        ".c9"
-    ]
+        "removeComments": true
+    }
 }