From bdc48a83713f34c2780aace265a03fd41d64d6d0 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Jan 2017 19:36:28 +0100
Subject: [PATCH] build: avoid typing errors in TypeScript 2.1 and update
 gulp-typescript (#2456)

Related to #1998.
---
 e2e/tsconfig.json          | 2 +-
 package.json               | 2 +-
 src/demo-app/tsconfig.json | 2 +-
 src/e2e-app/tsconfig.json  | 3 +--
 src/lib/tsconfig-srcs.json | 2 +-
 src/lib/tsconfig.json      | 2 +-
 tools/gulp/task_helpers.ts | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
index 06f19589b38..a4130cff60a 100644
--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -13,7 +13,7 @@
     "sourceMap": true,
     "target": "es5",
     "typeRoots": [
-      "../node_modules/@types/"
+      "../node_modules/@types"
     ],
     "types": [
       "jasmine"
diff --git a/package.json b/package.json
index e873dc345a8..c660fb3708d 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "gulp-shell": "^0.5.2",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-transform": "^1.1.0",
-    "gulp-typescript": "^2.13.6",
+    "gulp-typescript": "^3.1.3",
     "hammerjs": "^2.0.8",
     "highlight.js": "^9.9.0",
     "jasmine-core": "^2.4.1",
diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json
index 21634fd1e60..31ceecc975e 100644
--- a/src/demo-app/tsconfig.json
+++ b/src/demo-app/tsconfig.json
@@ -15,7 +15,7 @@
     "stripInternal": false,
     "baseUrl": "",
     "typeRoots": [
-      "../../node_modules/@types"
+      "../../node_modules/@types/!(node)"
     ],
     "paths": {
       "@angular/material": [
diff --git a/src/e2e-app/tsconfig.json b/src/e2e-app/tsconfig.json
index 898fe4d4ace..b6ab4c45d6f 100644
--- a/src/e2e-app/tsconfig.json
+++ b/src/e2e-app/tsconfig.json
@@ -15,8 +15,7 @@
     "stripInternal": false,
     "baseUrl": "",
     "typeRoots": [
-      "../../node_modules/@types",
-      "../../node_modules"
+      "../../node_modules/@types/!(node)"
     ],
     "paths": {
       "@angular/material": [
diff --git a/src/lib/tsconfig-srcs.json b/src/lib/tsconfig-srcs.json
index b9f9eb38226..42240acf486 100644
--- a/src/lib/tsconfig-srcs.json
+++ b/src/lib/tsconfig-srcs.json
@@ -16,7 +16,7 @@
     "inlineSources": true,
     "stripInternal": false,
     "typeRoots": [
-      "../../node_modules/@types"
+      "../../node_modules/@types/!(node)"
     ]
   },
   "exclude": [
diff --git a/src/lib/tsconfig.json b/src/lib/tsconfig.json
index 11887156a4c..c517a8fb807 100644
--- a/src/lib/tsconfig.json
+++ b/src/lib/tsconfig.json
@@ -19,7 +19,7 @@
     "paths": {
     },
     "typeRoots": [
-      "../../node_modules/@types"
+      "../../node_modules/@types/!(node)"
     ],
     "types": [
       "jasmine",
diff --git a/tools/gulp/task_helpers.ts b/tools/gulp/task_helpers.ts
index 90466174ea0..9bc71a0f4c5 100644
--- a/tools/gulp/task_helpers.ts
+++ b/tools/gulp/task_helpers.ts
@@ -54,7 +54,7 @@ export function tsBuildTask(tsConfigPath: string, tsConfigName = 'tsconfig.json'
 
     let pipe = tsProject.src()
       .pipe(gulpSourcemaps.init())
-      .pipe(gulpTs(tsProject));
+      .pipe(tsProject());
     let dts = pipe.dts.pipe(gulp.dest(dest));
 
     return gulpMerge([