Skip to content

Commit bb50fc1

Browse files
committed
chore(build): update TypeScript version to unreleased beta
Also fixup the typings which were broken by changes in typescript's lib.d.ts. Second attempt to merge this, now that bugfix for tsd is in.
1 parent 3aac2fe commit bb50fc1

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

modules/angular2/globals.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ interface Window {
1919
JSON: typeof JSON;
2020
Math: typeof Math;
2121
assert: typeof assert;
22-
NaN: typeof NaN;
2322
gc(): void;
2423
Reflect: any;
2524
}

modules/angular2/src/facade/math.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ import {global} from 'angular2/src/facade/lang';
66
export var __esModule = true;
77

88
export var Math = global.Math;
9-
export var NaN = global.NaN;
9+
export var NaN = typeof NaN;

modules/angular2/tsd.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
1010
},
1111
"hammerjs/hammerjs.d.ts": {
12-
"commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
12+
"commit": "22c44d95912a07f81c103a694330b15b92f7cb40"
1313
},
1414
"jasmine/jasmine.d.ts": {
1515
"commit": "055b3172e8eb374a75826710c4d08677872620d3"
@@ -72,9 +72,6 @@
7272
"selenium-webdriver/selenium-webdriver.d.ts": {
7373
"commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
7474
},
75-
"touch-events/touch-events.d.ts": {
76-
"commit": "055b3172e8eb374a75826710c4d08677872620d3"
77-
},
7875
"zone/zone.d.ts": {
7976
"commit": "055b3172e8eb374a75826710c4d08677872620d3"
8077
}

npm-shrinkwrap.clean.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8672,7 +8672,7 @@
86728672
}
86738673
},
86748674
"ts2dart": {
8675-
"version": "0.3.0",
8675+
"version": "0.4.2",
86768676
"dependencies": {
86778677
"source-map": {
86788678
"version": "0.4.2",
@@ -9087,7 +9087,7 @@
90879087
},
90889088
"typescript": {
90899089
"version": "1.5.0",
9090-
"resolved": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823"
9090+
"resolved": "git://github.com/mhegazy/TypeScript.git#v1.5-beta"
90919091
},
90929092
"vinyl": {
90939093
"version": "0.4.6",

npm-shrinkwrap.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@
107107
"temp": "^0.8.1",
108108
"ternary-stream": "^1.2.3",
109109
"through2": "^0.6.1",
110-
"ts2dart": "^0.3.0",
110+
"ts2dart": "^0.4.2",
111111
"tsd": "^0.5.7",
112-
"typescript": "alexeagle/TypeScript#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823",
112+
"typescript": "mhegazy/TypeScript#v1.5-beta",
113113
"vinyl": "^0.4.6",
114114
"walk-sync": "^0.1.3",
115115
"xtend": "^4.0.0",

0 commit comments

Comments
 (0)