Skip to content

Commit b9347eb

Browse files
committed
build: remove dependency on tsd and use @types/* instead
1 parent 4dbd8ed commit b9347eb

File tree

19 files changed

+94
-767
lines changed

19 files changed

+94
-767
lines changed

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ tmp
2626
**/*.css.ts
2727
**/*.css.shim.ts
2828

29-
# Or type definitions we mirror from github
30-
# (NB: these lines are removed in publish-build-artifacts.sh)
31-
/typings/
32-
3329
# Include when developing application packages.
3430
pubspec.lock
3531
.c9
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
/// <reference path="../../../../typings/node/node.d.ts" />
2-
/// <reference path="../../../../typings/jasmine/jasmine.d.ts" />
1+
/// <reference path="../../../../node_modules/@types/node/index.d.ts" />
2+
/// <reference path="../../../../node_modules/@types/jasmine/index.d.ts" />

modules/@angular/compiler_cli/tsconfig-es5.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"files": [
2828
"index.ts",
2929
"src/main.ts",
30-
"../../../typings/node/node.d.ts",
31-
"../../../typings/jasmine/jasmine.d.ts",
30+
"../../../node_modules/@types/node/index.d.ts",
31+
"../../../node_modules/@types/jasmine/index.d.ts",
3232
"../../../node_modules/zone.js/dist/zone.js.d.ts"
3333
]
3434
}

modules/@angular/core/tsconfig-es5.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"files": [
2424
"index.ts",
2525
"testing.ts",
26-
"../../../typings/jasmine/jasmine.d.ts",
2726
"../../../node_modules/zone.js/dist/zone.js.d.ts"
2827
]
2928
}

modules/@angular/platform-browser/tsconfig-es2015.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"moduleResolution": "node",
1313
"outDir": "../../../dist/packages-dist/platform-browser/esm",
1414
"paths": {
15-
"selenium-webdriver": ["./typings/selenium-webdriver/selenium-webdriver.d.ts"],
1615
"@angular/core": ["../../../dist/packages-dist/core"],
1716
"@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
1817
"@angular/common": ["../../../dist/packages-dist/common"],
@@ -28,9 +27,9 @@
2827
"files": [
2928
"index.ts",
3029
"testing.ts",
31-
"../../../typings/jasmine/jasmine.d.ts",
32-
"../../../typings/hammerjs/hammerjs.d.ts",
33-
"../../../typings/angular-protractor/angular-protractor.d.ts",
30+
"../../../node_modules/@types/hammerjs/index.d.ts",
31+
"../../../node_modules/@types/protractor/index.d.ts",
32+
"../../../node_modules/@types/jasmine/index.d.ts",
3433
"../../../node_modules/zone.js/dist/zone.js.d.ts"
3534
]
3635
}

modules/@angular/platform-browser/tsconfig-es5.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"moduleResolution": "node",
1313
"outDir": "../../../dist/packages-dist/platform-browser/",
1414
"paths": {
15-
"selenium-webdriver": ["./typings/selenium-webdriver/selenium-webdriver.d.ts"],
1615
"@angular/core": ["../../../dist/packages-dist/core"],
1716
"@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
1817
"@angular/common": ["../../../dist/packages-dist/common"],
@@ -29,9 +28,9 @@
2928
"files": [
3029
"index.ts",
3130
"testing.ts",
32-
"../../../typings/hammerjs/hammerjs.d.ts",
33-
"../../../typings/angular-protractor/angular-protractor.d.ts",
34-
"../../../typings/jasmine/jasmine.d.ts",
31+
"../../../node_modules/@types/hammerjs/index.d.ts",
32+
"../../../node_modules/@types/protractor/index.d.ts",
33+
"../../../node_modules/@types/jasmine/index.d.ts",
3534
"../../../node_modules/zone.js/dist/zone.js.d.ts"
3635
]
3736
}

modules/@angular/platform-server/tsconfig-es2015.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"files": [
2626
"index.ts",
27-
"../../../typings/node/node.d.ts",
27+
"../../../node_modules/@types/node/index.d.ts",
2828
"../../../node_modules/zone.js/dist/zone.js.d.ts"
2929
]
3030
}

modules/@angular/platform-server/tsconfig-es5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"files": [
2727
"index.ts",
28-
"../../../typings/node/node.d.ts",
28+
"../../../node_modules/@types/node/index.d.ts",
2929
"../../../node_modules/zone.js/dist/zone.js.d.ts"
3030
]
3131
}

modules/rollup-test/tsconfig.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@
1414
},
1515
"files": [
1616
"hello_world.ts"
17-
//"../typings/es6-collections/es6-collections.d.ts",
18-
//"../typings/es6-promise/es6-promise.d.ts"
1917
]
2018
}

modules/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"moduleResolution": "node",
1212
"outDir": "../dist/all/",
1313
"paths": {
14-
"selenium-webdriver": ["./@angular/typings/selenium-webdriver/selenium-webdriver.d.ts"],
14+
"selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
1515
"rxjs/*": ["../node_modules/rxjs/*"],
1616
"@angular/*": ["./@angular/*"],
1717
"tsc-wrapped": ["../dist/tools/tsc-wrapped"]

0 commit comments

Comments
 (0)