summaryrefslogtreecommitdiffstats
path: root/js/Gruntfile.js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-05 12:44:54 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-05 12:44:54 +0200
commitb752c690b4e75ffbe53e00526276d725d30a01d4 (patch)
tree687f4a4a5af31ab2d4c976c8df86db9b9b379d94 /js/Gruntfile.js
parentdda6a6963cc4c2ba7f84572a8eae269dfd2a3287 (diff)
fix build
Diffstat (limited to 'js/Gruntfile.js')
-rw-r--r--js/Gruntfile.js21
1 files changed, 15 insertions, 6 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index d954d64c0..d525c9ded 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -19,7 +19,9 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-wrap');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-ng-annotate');
- grunt.loadNpmTasks('grunt-traceur');
+ // buggy, wait until it uses traceur 0.0.60
+ // grunt.loadNpmTasks('grunt-traceur');
+ grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-protractor-runner');
grunt.loadNpmTasks('grunt-protractor-webdriver');
@@ -55,19 +57,26 @@ module.exports = function (grunt) {
dest: '<%= meta.production %>app.js'
}
},
- traceur: {
+ // in place because grunt-traceur is buggy, remove when traceur 0.0.60
+ // is supported
+ shell: {
+ traceur: {
+ command: 'node_modules/traceur/traceur --modules inline --out build/app.js --experimental build/app.js '
+ }
+ },
+ /*traceur: {
app: {
files: [{
src: ['<%= meta.production %>app.js'],
- dest: '<%= meta.production %>app.js'
+ dest: '<%= meta.production %>test.js'
}]
},
options: {
- blockBinding: true,
experimental: true,
modules: 'inline'
}
- },
+ },*/
+
wrap: {
basic: {
src: ['<%= meta.production %>app.js'],
@@ -166,7 +175,7 @@ module.exports = function (grunt) {
});
// make tasks available under simpler commands
- grunt.registerTask('default', ['jshint', 'concat', 'wrap', 'traceur', 'ngAnnotate']);
+ grunt.registerTask('default', ['jshint', 'concat', 'wrap', 'shell:traceur', 'ngAnnotate']);
grunt.registerTask('dev', ['watch:concat']);
grunt.registerTask('test', ['karma:unit']);
grunt.registerTask('php', ['watch:phpunit']);