From 191125de9da5ae4cf122068429c65ade7237454c Mon Sep 17 00:00:00 2001 From: Rob Eisenberg Date: Tue, 7 Apr 2015 14:55:55 -0400 Subject: [PATCH] fix(all): update compiler --- build/babel-options.js | 19 +++++++------------ karma.conf.js | 5 ++++- package.json | 8 ++++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/build/babel-options.js b/build/babel-options.js index 6cf460d..59c9a33 100644 --- a/build/babel-options.js +++ b/build/babel-options.js @@ -1,8 +1,6 @@ module.exports = { filename: '', filenameRelative: '', - blacklist: [], - whitelist: [], modules: '', sourceMap: true, sourceMapName: '', @@ -10,14 +8,11 @@ module.exports = { moduleRoot: '', moduleIds: false, experimental: false, - format: { - comments: false, - compact: false, - indent: { - parentheses: true, - adjustMultilineComment: true, - style: " ", - base: 0 - } - } + comments: false, + compact: false, + code:true, + stage:2, + optional: [ + "es7.decorators" + ] }; diff --git a/karma.conf.js b/karma.conf.js index ec3dc2a..66ef689 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -37,7 +37,10 @@ module.exports = function(config) { options: { sourceMap: 'inline', modules: 'system', - moduleIds: false + moduleIds: false, + optional: [ + "es7.decorators" + ] } }, diff --git a/package.json b/package.json index 619b283..4032ee6 100644 --- a/package.json +++ b/package.json @@ -25,21 +25,21 @@ } }, "devDependencies": { - "aurelia-tools": "^0.1.0", + "aurelia-tools": "^0.1.3", "conventional-changelog": "0.0.11", "del": "^1.1.0", "gulp": "^3.8.10", - "gulp-babel": "^4.0.0", + "gulp-babel": "^5.0.0", "gulp-bump": "^0.1.11", "gulp-jshint": "^1.9.0", "gulp-yuidoc": "^0.1.2", "jasmine-core": "^2.1.3", "jshint-stylish": "^1.0.0", "karma": "^0.12.28", - "karma-babel-preprocessor": "^4.0.0", + "karma-babel-preprocessor": "^5.0.1", "karma-chrome-launcher": "^0.1.7", "karma-jasmine": "^0.3.5", - "karma-jspm": "^1.0.1", + "karma-jspm": "^1.1.4", "object.assign": "^1.0.3", "require-dir": "^0.1.0", "run-sequence": "^1.0.2",