Angular2: using typings instead of tsd

diff --git a/angular2/showcase/README.md b/angular2/showcase/README.md
index 4000680..d94f182 100644 (file)
--- a/angular2/showcase/README.md
+++ b/angular2/showcase/README.md
@@ -4,13 +4,6 @@
 
   jspm: creates config.js and fills jspm section in package.json file.
 
-* tsd init
+* typings init
 
-  tsd init: creates tsd.json file
-
-  change default path to src/typings
-  change default bundle to src/typings/tsd.d.ts
-
-* tsd query angular2 -s --action install
-
-  install typescript definitions for angular2 and save in tsd.json
+  typings init: creates typings.json file

diff --git a/angular2/showcase/config.js b/angular2/showcase/config.js
index 5fa8885..25e6074 100644 (file)
--- a/angular2/showcase/config.js
+++ b/angular2/showcase/config.js
@@ -2,30 +2,36 @@ System.config({
   baseURL: "/",
   defaultJSExtensions: true,
   transpiler: "typescript",
+  typescriptOptions: {
+    "module": "system",
+    "target": "ES5",
+    "sourceMap": true,
+    "noImplicitAny": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "removeComments": false
+  },
   paths: {
     "github:*": "jspm_packages/github/*",
     "npm:*": "jspm_packages/npm/*"
   },
 
   map: {
-    "angular2": "npm:angular2@2.0.0-alpha.42",
-    "es6-shim": "github:es-shims/es6-shim@0.33.6",
-    "immutable": "npm:immutable@3.7.5",
-    "reflect-metadata": "npm:reflect-metadata@0.1.2",
-    "text": "github:systemjs/plugin-text@0.0.2",
-    "typescript": "npm:typescript@1.6.2",
-    "zone.js": "npm:zone.js@0.5.8",
+    "angular2": "npm:angular2@2.0.0-beta.3",
+    "es6-shim": "github:es-shims/es6-shim@0.34.2",
+    "reflect-metadata": "npm:reflect-metadata@0.1.3",
+    "typescript": "npm:typescript@1.8.0",
     "github:jspm/nodelibs-assert@0.1.0": {
       "assert": "npm:assert@1.3.0"
     },
     "github:jspm/nodelibs-buffer@0.1.0": {
-      "buffer": "npm:buffer@3.5.1"
+      "buffer": "npm:buffer@3.6.0"
     },
     "github:jspm/nodelibs-constants@0.1.0": {
       "constants-browserify": "npm:constants-browserify@0.0.1"
     },
     "github:jspm/nodelibs-crypto@0.1.0": {
-      "crypto-browserify": "npm:crypto-browserify@3.10.0"
+      "crypto-browserify": "npm:crypto-browserify@3.11.0"
     },
     "github:jspm/nodelibs-events@0.1.1": {
       "events": "npm:events@1.0.2"
@@ -48,19 +54,18 @@ System.config({
     "github:jspm/nodelibs-vm@0.1.0": {
       "vm-browserify": "npm:vm-browserify@0.0.4"
     },
-    "npm:angular2@2.0.0-alpha.42": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+    "npm:angular2@2.0.0-beta.3": {
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
+      "es6-promise": "npm:es6-promise@3.0.2",
+      "es6-shim": "npm:es6-shim@0.33.13",
       "process": "github:jspm/nodelibs-process@0.1.2",
       "reflect-metadata": "npm:reflect-metadata@0.1.2",
-      "rx": "npm:rx@2.5.1",
-      "zone.js": "npm:zone.js@0.5.8"
+      "rxjs": "npm:rxjs@5.0.0-beta.0",
+      "zone.js": "npm:zone.js@0.5.11"
     },
-    "npm:asn1.js@2.2.1": {
+    "npm:asn1.js@4.4.0": {
       "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "bn.js": "npm:bn.js@2.2.0",
+      "bn.js": "npm:bn.js@4.10.1",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "inherits": "npm:inherits@2.0.1",
       "minimalistic-assert": "npm:minimalistic-assert@1.0.0",
@@ -69,10 +74,13 @@ System.config({
     "npm:assert@1.3.0": {
       "util": "npm:util@0.10.3"
     },
-    "npm:browserify-aes@1.0.5": {
+    "npm:bn.js@4.10.1": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
+    },
+    "npm:browserify-aes@1.0.6": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "buffer-xor": "npm:buffer-xor@1.0.3",
-      "cipher-base": "npm:cipher-base@1.0.1",
+      "cipher-base": "npm:cipher-base@1.0.2",
       "create-hash": "npm:create-hash@1.1.2",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
       "evp_bytestokey": "npm:evp_bytestokey@1.0.0",
@@ -81,7 +89,7 @@ System.config({
       "systemjs-json": "github:systemjs/plugin-json@0.1.0"
     },
     "npm:browserify-cipher@1.0.0": {
-      "browserify-aes": "npm:browserify-aes@1.0.5",
+      "browserify-aes": "npm:browserify-aes@1.0.6",
       "browserify-des": "npm:browserify-des@1.0.0",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
@@ -89,40 +97,43 @@ System.config({
     },
     "npm:browserify-des@1.0.0": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "cipher-base": "npm:cipher-base@1.0.1",
+      "cipher-base": "npm:cipher-base@1.0.2",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
       "des.js": "npm:des.js@1.0.0",
       "inherits": "npm:inherits@2.0.1"
     },
-    "npm:browserify-rsa@2.0.1": {
-      "bn.js": "npm:bn.js@2.2.0",
+    "npm:browserify-rsa@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.1",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "constants": "github:jspm/nodelibs-constants@0.1.0",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-      "randombytes": "npm:randombytes@2.0.1"
+      "randombytes": "npm:randombytes@2.0.2"
     },
-    "npm:browserify-sign@3.0.8": {
-      "bn.js": "npm:bn.js@2.2.0",
-      "browserify-rsa": "npm:browserify-rsa@2.0.1",
+    "npm:browserify-sign@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.1",
+      "browserify-rsa": "npm:browserify-rsa@4.0.0",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "create-hash": "npm:create-hash@1.1.2",
       "create-hmac": "npm:create-hmac@1.1.4",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-      "elliptic": "npm:elliptic@3.1.0",
+      "elliptic": "npm:elliptic@6.2.3",
       "inherits": "npm:inherits@2.0.1",
-      "parse-asn1": "npm:parse-asn1@3.0.2",
+      "parse-asn1": "npm:parse-asn1@5.0.0",
       "stream": "github:jspm/nodelibs-stream@0.1.0"
     },
     "npm:buffer-xor@1.0.3": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "systemjs-json": "github:systemjs/plugin-json@0.1.0"
     },
-    "npm:buffer@3.5.1": {
+    "npm:buffer@3.6.0": {
       "base64-js": "npm:base64-js@0.0.8",
+      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
       "ieee754": "npm:ieee754@1.1.6",
-      "is-array": "npm:is-array@1.0.1"
+      "isarray": "npm:isarray@1.0.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:cipher-base@1.0.1": {
+    "npm:cipher-base@1.0.2": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "inherits": "npm:inherits@2.0.1",
       "stream": "github:jspm/nodelibs-stream@0.1.0",
@@ -131,18 +142,18 @@ System.config({
     "npm:constants-browserify@0.0.1": {
       "systemjs-json": "github:systemjs/plugin-json@0.1.0"
     },
-    "npm:core-util-is@1.0.1": {
+    "npm:core-util-is@1.0.2": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0"
     },
-    "npm:create-ecdh@2.0.2": {
-      "bn.js": "npm:bn.js@2.2.0",
+    "npm:create-ecdh@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.1",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-      "elliptic": "npm:elliptic@3.1.0"
+      "elliptic": "npm:elliptic@6.2.3"
     },
     "npm:create-hash@1.1.2": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "cipher-base": "npm:cipher-base@1.0.1",
+      "cipher-base": "npm:cipher-base@1.0.2",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "inherits": "npm:inherits@2.0.1",
@@ -156,33 +167,33 @@ System.config({
       "inherits": "npm:inherits@2.0.1",
       "stream": "github:jspm/nodelibs-stream@0.1.0"
     },
-    "npm:crypto-browserify@3.10.0": {
+    "npm:crypto-browserify@3.11.0": {
       "browserify-cipher": "npm:browserify-cipher@1.0.0",
-      "browserify-sign": "npm:browserify-sign@3.0.8",
-      "create-ecdh": "npm:create-ecdh@2.0.2",
+      "browserify-sign": "npm:browserify-sign@4.0.0",
+      "create-ecdh": "npm:create-ecdh@4.0.0",
       "create-hash": "npm:create-hash@1.1.2",
       "create-hmac": "npm:create-hmac@1.1.4",
-      "diffie-hellman": "npm:diffie-hellman@3.0.2",
+      "diffie-hellman": "npm:diffie-hellman@5.0.2",
       "inherits": "npm:inherits@2.0.1",
       "pbkdf2": "npm:pbkdf2@3.0.4",
-      "public-encrypt": "npm:public-encrypt@2.0.1",
-      "randombytes": "npm:randombytes@2.0.1"
+      "public-encrypt": "npm:public-encrypt@4.0.0",
+      "randombytes": "npm:randombytes@2.0.2"
     },
     "npm:des.js@1.0.0": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "inherits": "npm:inherits@2.0.1",
       "minimalistic-assert": "npm:minimalistic-assert@1.0.0"
     },
-    "npm:diffie-hellman@3.0.2": {
-      "bn.js": "npm:bn.js@2.2.0",
+    "npm:diffie-hellman@5.0.2": {
+      "bn.js": "npm:bn.js@4.10.1",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-      "miller-rabin": "npm:miller-rabin@2.0.1",
-      "randombytes": "npm:randombytes@2.0.1",
+      "miller-rabin": "npm:miller-rabin@4.0.0",
+      "randombytes": "npm:randombytes@2.0.2",
       "systemjs-json": "github:systemjs/plugin-json@0.1.0"
     },
-    "npm:elliptic@3.1.0": {
-      "bn.js": "npm:bn.js@2.2.0",
+    "npm:elliptic@6.2.3": {
+      "bn.js": "npm:bn.js@4.10.1",
       "brorand": "npm:brorand@1.0.5",
       "hash.js": "npm:hash.js@1.0.3",
       "inherits": "npm:inherits@2.0.1",
@@ -191,6 +202,9 @@ System.config({
     "npm:es6-promise@3.0.2": {
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
+    "npm:es6-shim@0.33.13": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
     "npm:evp_bytestokey@1.0.0": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "create-hash": "npm:create-hash@1.1.2",
@@ -202,13 +216,13 @@ System.config({
     "npm:inherits@2.0.1": {
       "util": "github:jspm/nodelibs-util@0.1.0"
     },
-    "npm:miller-rabin@2.0.1": {
-      "bn.js": "npm:bn.js@2.2.0",
+    "npm:miller-rabin@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.1",
       "brorand": "npm:brorand@1.0.5"
     },
-    "npm:parse-asn1@3.0.2": {
-      "asn1.js": "npm:asn1.js@2.2.1",
-      "browserify-aes": "npm:browserify-aes@1.0.5",
+    "npm:parse-asn1@5.0.0": {
+      "asn1.js": "npm:asn1.js@4.4.0",
+      "browserify-aes": "npm:browserify-aes@1.0.6",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "create-hash": "npm:create-hash@1.1.2",
       "evp_bytestokey": "npm:evp_bytestokey@1.0.0",
@@ -230,23 +244,23 @@ System.config({
     "npm:process@0.11.2": {
       "assert": "github:jspm/nodelibs-assert@0.1.0"
     },
-    "npm:public-encrypt@2.0.1": {
-      "bn.js": "npm:bn.js@2.2.0",
-      "browserify-rsa": "npm:browserify-rsa@2.0.1",
+    "npm:public-encrypt@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.1",
+      "browserify-rsa": "npm:browserify-rsa@4.0.0",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "create-hash": "npm:create-hash@1.1.2",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-      "parse-asn1": "npm:parse-asn1@3.0.2",
-      "randombytes": "npm:randombytes@2.0.1"
+      "parse-asn1": "npm:parse-asn1@5.0.0",
+      "randombytes": "npm:randombytes@2.0.2"
     },
-    "npm:randombytes@2.0.1": {
+    "npm:randombytes@2.0.2": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "crypto": "github:jspm/nodelibs-crypto@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:readable-stream@1.1.13": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "core-util-is": "npm:core-util-is@1.0.1",
+      "core-util-is": "npm:core-util-is@1.0.2",
       "events": "github:jspm/nodelibs-events@0.1.1",
       "inherits": "npm:inherits@2.0.1",
       "isarray": "npm:isarray@0.0.1",
@@ -258,11 +272,16 @@ System.config({
       "assert": "github:jspm/nodelibs-assert@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
+    "npm:reflect-metadata@0.1.3": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
     "npm:ripemd160@1.0.1": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:rx@2.5.1": {
+    "npm:rxjs@5.0.0-beta.0": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:sha.js@2.4.4": {
@@ -286,7 +305,7 @@ System.config({
     "npm:vm-browserify@0.0.4": {
       "indexof": "npm:indexof@0.0.1"
     },
-    "npm:zone.js@0.5.8": {
+    "npm:zone.js@0.5.11": {
       "es6-promise": "npm:es6-promise@3.0.2",
       "process": "github:jspm/nodelibs-process@0.1.2"
     }

diff --git a/angular2/showcase/package.json b/angular2/showcase/package.json
index a55b223..c4f5a0a 100644 (file)
--- a/angular2/showcase/package.json
+++ b/angular2/showcase/package.json
@@ -12,18 +12,12 @@
   "scripts": {
     "build": "tsc -w"
   },
-  "devDependencies": {
-    "tsd": "~0.6.5",
-    "typescript": "~1.6.2"
-  },
+  "devDependencies": {},
   "jspm": {
     "dependencies": {
-      "angular2": "npm:angular2@^2.0.0-alpha.42",
-      "es6-shim": "github:es-shims/es6-shim@^0.33.6",
-      "immutable": "npm:immutable@^3.7.5",
-      "reflect-metadata": "npm:reflect-metadata@^0.1.2",
-      "text": "github:systemjs/plugin-text@^0.0.2",
-      "zone.js": "npm:zone.js@^0.5.8"
+      "angular2": "npm:angular2@^2.0.0-beta.3",
+      "es6-shim": "github:es-shims/es6-shim@^0.34.2",
+      "reflect-metadata": "npm:reflect-metadata@^0.1.3"
     },
     "devDependencies": {
       "typescript": "npm:typescript@^1.6.2"

diff --git a/angular2/showcase/src/app.js b/angular2/showcase/src/app.js
index c634987..14a44e2 100644 (file)
--- a/angular2/showcase/src/app.js
+++ b/angular2/showcase/src/app.js
@@ -40,4 +40,4 @@ var __metadata = (this && this.__metadata) || function (k, v) {
         }
     }
 });
-//# sourceMappingURL=app.js.map
\ No newline at end of file
+//# sourceMappingURL=app.js.map

diff --git a/angular2/showcase/src/tsconfig.json b/angular2/showcase/src/tsconfig.json
deleted file mode 100644 (file)
index 7881759..0000000
--- a/angular2/showcase/src/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-       "compilerOptions": {
-               "module": "system",
-               "target": "ES5",
-               "sourceMap": true,
-               "noImplicitAny": true,
-               "emitDecoratorMetadata": true,
-               "experimentalDecorators": true,
-               "removeComments": false
-       }
-}
\ No newline at end of file

diff --git a/angular2/showcase/src/typings/angular2/angular2.d.ts b/angular2/showcase/src/typings/angular2/angular2.d.ts
deleted file mode 100644 (file)
index 3560809..0000000
--- a/angular2/showcase/src/typings/angular2/angular2.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for Angular 2
-// Project: http://angular.io/
-// Definitions by: angular team <https://github.com/angular/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-// Angular 2 distributes typings in our NPM package.
-// To get the typings, simply:
-// $ npm install angular2
-// and use TypeScript 1.6.2 or later.
-//
-// Note that TypeScript must be configured with
-// --moduleResolution node
-// which is the default when --module commonjs

diff --git a/angular2/showcase/src/typings/tsd.d.ts b/angular2/showcase/src/typings/tsd.d.ts
deleted file mode 100644 (file)
index e5b2e14..0000000
--- a/angular2/showcase/src/typings/tsd.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference path="angular2/angular2.d.ts" />

diff --git a/angular2/showcase/tsd.json b/angular2/showcase/tsd.json
deleted file mode 100644 (file)
index 51a8b8b..0000000
--- a/angular2/showcase/tsd.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "version": "v4",
-  "repo": "borisyankov/DefinitelyTyped",
-  "ref": "master",
-  "path": "src/typings",
-  "bundle": "src/typings/tsd.d.ts",
-  "installed": {
-    "angular2/angular2.d.ts": {
-      "commit": "62eedc3121a5e28c50473d2e4a9cefbcb9c3957f"
-    }
-  }
-}

diff --git a/angular2/showcase/typings.json b/angular2/showcase/typings.json
new file mode 100644 (file)
index 0000000..9b55ba8
--- /dev/null
+++ b/angular2/showcase/typings.json
@@ -0,0 +1,4 @@
+{
+  "dependencies": {},
+  "devDependencies": {}
+}