build: remove dependency on tsd and use @types/* instead

rmshea · May 25, 2016 · b9347eb · b9347eb
1 parent 4dbd8ed
commit b9347eb
Show file tree

Hide file tree

Showing 19 changed files with 94 additions and 767 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,10 +26,6 @@ tmp
 **/*.css.ts
 **/*.css.shim.ts
 
-# Or type definitions we mirror from github
-# (NB: these lines are removed in publish-build-artifacts.sh)
-/typings/
-
 # Include when developing application packages.
 pubspec.lock
 .c9

diff --git a/modules/@angular/compiler_cli/integrationtest/typings.d.ts b/modules/@angular/compiler_cli/integrationtest/typings.d.ts
@@ -1,2 +1,2 @@
-/// <reference path="../../../../typings/node/node.d.ts" />
-/// <reference path="../../../../typings/jasmine/jasmine.d.ts" />
+/// <reference path="../../../../node_modules/@types/node/index.d.ts" />
+/// <reference path="../../../../node_modules/@types/jasmine/index.d.ts" />
diff --git a/modules/@angular/compiler_cli/tsconfig-es5.json b/modules/@angular/compiler_cli/tsconfig-es5.json
@@ -27,8 +27,8 @@
     "files": [
         "index.ts",
         "src/main.ts",
-        "../../../typings/node/node.d.ts",
-        "../../../typings/jasmine/jasmine.d.ts",
+        "../../../node_modules/@types/node/index.d.ts",
+        "../../../node_modules/@types/jasmine/index.d.ts",
         "../../../node_modules/zone.js/dist/zone.js.d.ts"
     ]
 }
diff --git a/modules/@angular/core/tsconfig-es5.json b/modules/@angular/core/tsconfig-es5.json
@@ -23,7 +23,6 @@
   "files": [
     "index.ts",
     "testing.ts",
-    "../../../typings/jasmine/jasmine.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }
diff --git a/modules/@angular/platform-browser/tsconfig-es2015.json b/modules/@angular/platform-browser/tsconfig-es2015.json
@@ -12,7 +12,6 @@
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/platform-browser/esm",
     "paths": {
-      "selenium-webdriver": ["./typings/selenium-webdriver/selenium-webdriver.d.ts"],
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
       "@angular/common": ["../../../dist/packages-dist/common"],
@@ -28,9 +27,9 @@
   "files": [
     "index.ts",
     "testing.ts",
-    "../../../typings/jasmine/jasmine.d.ts",
-    "../../../typings/hammerjs/hammerjs.d.ts",
-    "../../../typings/angular-protractor/angular-protractor.d.ts",
+    "../../../node_modules/@types/hammerjs/index.d.ts",
+    "../../../node_modules/@types/protractor/index.d.ts",
+    "../../../node_modules/@types/jasmine/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }
diff --git a/modules/@angular/platform-browser/tsconfig-es5.json b/modules/@angular/platform-browser/tsconfig-es5.json
@@ -12,7 +12,6 @@
     "moduleResolution": "node",
     "outDir": "../../../dist/packages-dist/platform-browser/",
     "paths": {
-      "selenium-webdriver": ["./typings/selenium-webdriver/selenium-webdriver.d.ts"],
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
       "@angular/common": ["../../../dist/packages-dist/common"],
@@ -29,9 +28,9 @@
   "files": [
     "index.ts",
     "testing.ts",
-    "../../../typings/hammerjs/hammerjs.d.ts",
-    "../../../typings/angular-protractor/angular-protractor.d.ts",
-    "../../../typings/jasmine/jasmine.d.ts",
+    "../../../node_modules/@types/hammerjs/index.d.ts",
+    "../../../node_modules/@types/protractor/index.d.ts",
+    "../../../node_modules/@types/jasmine/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }
diff --git a/modules/@angular/platform-server/tsconfig-es2015.json b/modules/@angular/platform-server/tsconfig-es2015.json
@@ -24,7 +24,7 @@
   },
   "files": [
     "index.ts",
-    "../../../typings/node/node.d.ts",
+    "../../../node_modules/@types/node/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }
diff --git a/modules/@angular/platform-server/tsconfig-es5.json b/modules/@angular/platform-server/tsconfig-es5.json
@@ -25,7 +25,7 @@
   },
   "files": [
     "index.ts",
-    "../../../typings/node/node.d.ts",
+    "../../../node_modules/@types/node/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }
diff --git a/modules/rollup-test/tsconfig.json b/modules/rollup-test/tsconfig.json
@@ -14,7 +14,5 @@
   },
   "files": [
     "hello_world.ts"
-    //"../typings/es6-collections/es6-collections.d.ts",
-    //"../typings/es6-promise/es6-promise.d.ts"
   ]
 }
diff --git a/modules/tsconfig.json b/modules/tsconfig.json
@@ -11,7 +11,7 @@
     "moduleResolution": "node",
     "outDir": "../dist/all/",
     "paths": {
-      "selenium-webdriver": ["./@angular/typings/selenium-webdriver/selenium-webdriver.d.ts"],
+      "selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
       "rxjs/*": ["../node_modules/rxjs/*"],
       "@angular/*": ["./@angular/*"],
       "tsc-wrapped": ["../dist/tools/tsc-wrapped"]

diff --git a/modules/types.d.ts b/modules/types.d.ts
@@ -1,8 +1,8 @@
 // This file contains all ambient imports needed to compile the modules/ source code
 
-/// <reference path="../typings/hammerjs/hammerjs.d.ts" />
-/// <reference path="../typings/jasmine/jasmine.d.ts" />
-/// <reference path="../typings/node/node.d.ts" />
-/// <reference path="../typings/selenium-webdriver/selenium-webdriver.d.ts" />
-/// <reference path="../typings/angular-protractor/angular-protractor.d.ts" />
 /// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
+/// <reference path="../node_modules/@types/hammerjs/index.d.ts" />
+/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
+/// <reference path="../node_modules/@types/node/index.d.ts" />
+/// <reference path="../node_modules/@types/protractor/index.d.ts" />
+/// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" />