Skip to content

Commit bdc48a8

Browse files
crisbetokara
authored andcommitted
build: avoid typing errors in TypeScript 2.1 and update gulp-typescript (#2456)
Related to #1998.
1 parent 6cb6576 commit bdc48a8

File tree

7 files changed

+7
-8
lines changed

7 files changed

+7
-8
lines changed

e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"sourceMap": true,
1414
"target": "es5",
1515
"typeRoots": [
16-
"../node_modules/@types/"
16+
"../node_modules/@types"
1717
],
1818
"types": [
1919
"jasmine"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"gulp-shell": "^0.5.2",
7777
"gulp-sourcemaps": "^1.6.0",
7878
"gulp-transform": "^1.1.0",
79-
"gulp-typescript": "^2.13.6",
79+
"gulp-typescript": "^3.1.3",
8080
"hammerjs": "^2.0.8",
8181
"highlight.js": "^9.9.0",
8282
"jasmine-core": "^2.4.1",

src/demo-app/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"stripInternal": false,
1616
"baseUrl": "",
1717
"typeRoots": [
18-
"../../node_modules/@types"
18+
"../../node_modules/@types/!(node)"
1919
],
2020
"paths": {
2121
"@angular/material": [

src/e2e-app/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
"stripInternal": false,
1616
"baseUrl": "",
1717
"typeRoots": [
18-
"../../node_modules/@types",
19-
"../../node_modules"
18+
"../../node_modules/@types/!(node)"
2019
],
2120
"paths": {
2221
"@angular/material": [

src/lib/tsconfig-srcs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"inlineSources": true,
1717
"stripInternal": false,
1818
"typeRoots": [
19-
"../../node_modules/@types"
19+
"../../node_modules/@types/!(node)"
2020
]
2121
},
2222
"exclude": [

src/lib/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"paths": {
2020
},
2121
"typeRoots": [
22-
"../../node_modules/@types"
22+
"../../node_modules/@types/!(node)"
2323
],
2424
"types": [
2525
"jasmine",

tools/gulp/task_helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function tsBuildTask(tsConfigPath: string, tsConfigName = 'tsconfig.json'
5454

5555
let pipe = tsProject.src()
5656
.pipe(gulpSourcemaps.init())
57-
.pipe(gulpTs(tsProject));
57+
.pipe(tsProject());
5858
let dts = pipe.dts.pipe(gulp.dest(dest));
5959

6060
return gulpMerge([

0 commit comments

Comments
 (0)