Skip to content

Commit b7c87bb

Browse files
committed
Upgrade to typescript 1.6 and grunt-ts 5.0.0-beta.5
1 parent 601dffc commit b7c87bb

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

gruntfile.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,12 @@ module.exports = function(grunt) {
309309
outDir: localCfg.outModulesDir,
310310
options: {
311311
fast: 'never',
312+
313+
// Resolve non-relative modules like "ui/styling/style"
314+
// based on the project root (not on node_modules which
315+
// is the typescript 1.6+ default)
316+
additionalFlags: '--moduleResolution classic',
317+
312318
module: "commonjs",
313319
target: "es5",
314320
sourceMap: false,

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"grunt-exec": "0.4.6",
2020
"grunt-multi-dest": "1.0.0",
2121
"grunt-shell": "1.1.2",
22-
"grunt-ts": "4.2.0",
22+
"grunt-ts": "5.0.0-beta.5",
2323
"grunt-tslint": "2.4.0",
2424
"mocha": "2.2.5",
2525
"grunt-simple-mocha": "0.4.0",
2626
"grunt-env": "0.4.4",
2727
"chai": "3.2.0",
28-
"typescript": "1.5.3"
28+
"typescript": "1.6.2"
2929
}
3030
}

0 commit comments

Comments
 (0)