summaryrefslogtreecommitdiffstats
path: root/js/Gruntfile.js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-11 03:55:52 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-11 03:55:52 +0200
commitea9ebd4826fe9807af5bc17e786b3dc58f163970 (patch)
tree2894b40614ebe977797cea5745b215e2a2851f61 /js/Gruntfile.js
parent594b92f649d8ed8a705f1af23639463078170d46 (diff)
port to es5 and add es6 shims for object prototypes instead
Diffstat (limited to 'js/Gruntfile.js')
-rw-r--r--js/Gruntfile.js25
1 files changed, 1 insertions, 24 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index f2df36050..71f2fea30 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -20,9 +20,6 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-wrap');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-ng-annotate');
- // 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');
@@ -65,26 +62,6 @@ module.exports = function (grunt) {
}
}
},
- // in place because grunt-traceur is buggy, remove when traceur 0.0.60
- // is supported
- shell: {
- traceur: {
- command: 'node_modules/traceur/traceur --block-binding true --out build/app.js --experimental --script build/app.js'
- }
- },
- /*traceur: {
- app: {
- files: [{
- src: ['<%= meta.production %>app.js'],
- dest: '<%= meta.production %>test.js'
- }]
- },
- options: {
- experimental: true,
- modules: 'inline'
- }
- },*/
-
wrap: {
basic: {
src: ['<%= meta.production %>app.js'],
@@ -183,7 +160,7 @@ module.exports = function (grunt) {
});
// make tasks available under simpler commands
- grunt.registerTask('default', ['jshint', 'concat', 'wrap', 'shell:traceur', 'ngAnnotate', 'uglify']);
+ grunt.registerTask('default', ['jshint', 'concat', 'wrap', 'ngAnnotate', 'uglify']);
grunt.registerTask('dev', ['watch:concat']);
grunt.registerTask('test', ['karma:unit']);
grunt.registerTask('php', ['watch:phpunit']);