Merge pull request #521 from urbanairship/issue-520-typescript-1.6

Update to typescript 1.6
tessera-metrics · Sep 18, 2015 · 9a00987 · 9a00987
2 parents bd7ddb3 + e3647e9
commit 9a00987
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tessera-frontend/Gruntfile.js b/tessera-frontend/Gruntfile.js
@@ -22,7 +22,8 @@ module.exports = function(grunt) {
         outDir: '_build/phase1',
         options: {
           target: 'es6',
-          comments: true
+          comments: true,
+          additionalFlags: '--moduleResolution node'
         }
       }
     },

diff --git a/tessera-frontend/package.json b/tessera-frontend/package.json
@@ -47,8 +47,8 @@
     "store": "^1.3.17"
   },
   "devDependencies": {
-    "babel-core": "^5.1.11",
-    "babelify": "^6.0.2",
+    "babel-core": "^5.8.23",
+    "babelify": "^6.3.0",
     "grunt": "^0.4.5",
     "grunt-browserify": "^3.8.0",
     "grunt-cli": "^0.1.13",
@@ -59,6 +59,7 @@
     "grunt-contrib-uglify": "^0.9.1",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-sass": "1.0.0",
-    "grunt-ts": "^4.2.0"
+    "grunt-ts": "^4.2.0",
+    "typescript": "1.6.2"
   }
 }