diff --git a/sao/Gruntfile.js b/sao/Gruntfile.js index da85d7ca9f..f4082e28dc 100644 --- a/sao/Gruntfile.js +++ b/sao/Gruntfile.js @@ -75,36 +75,14 @@ module.exports = function(grunt) { dest: 'dist/<%= pkg.name %>.js' } }, - uglify: { - options: { - banner: '/*! <%= pkg.name %>-<%= pkg.version %> | GPL-3\n' + - 'This file is part of Tryton. ' + - 'The COPYRIGHT file at the top level of\n' + - 'this repository contains the full copyright notices ' + - 'and license terms. */\n' - }, - dist: { - src: 'dist/<%= pkg.name %>.js', - dest: 'dist/<%= pkg.name %>.min.js' - } - }, less: { - dev: { + 'default': { options: { paths: less_paths, }, files: { 'dist/<%= pkg.name %>.css': 'src/sao.less' } - }, - 'default': { - options: { - paths: less_paths, - yuicompress: true - }, - files: { - 'dist/<%= pkg.name %>.min.css': 'src/sao.less' - } } }, watch: { @@ -114,7 +92,11 @@ module.exports = function(grunt) { }, styles: { files: ['src/*.less'], - tasks: 'less:dev' + tasks: 'less' + }, + translations: { + files: ['locale/*.po'], + tasks: 'po2json' } }, qunit: { @@ -135,18 +117,14 @@ module.exports = function(grunt) { }); grunt.loadNpmTasks('grunt-contrib-concat'); - grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-less'); grunt.loadNpmTasks('grunt-po2json'); grunt.loadNpmTasks('grunt-qunit-junit'); grunt.registerTask('default', 'Build for production.', function() { - grunt.task.run(['concat', 'uglify', 'less', 'po2json']); + grunt.task.run(['concat', 'less', 'po2json']); }); - grunt.registerTask('dev', 'Build for development.', function() { - grunt.task.run(['concat', 'less:dev']); - }); - grunt.registerTask('devwatch', 'Watch development', function() { + grunt.registerTask('watch', 'Watch development', function() { grunt.loadNpmTasks('grunt-contrib-watch'); grunt.task.run(['watch']); }); @@ -160,7 +138,7 @@ module.exports = function(grunt) { }); grunt.registerTask('test', 'Run tests', function() { grunt.loadNpmTasks('grunt-contrib-qunit'); - grunt.task.run(['concat', 'less:dev', 'qunit_junit', 'qunit']); + grunt.task.run(['concat', 'less', 'qunit_junit', 'qunit']); }); }; diff --git a/sao/README.md b/sao/README.md index c4bb4865ab..cfab2100a1 100644 --- a/sao/README.md +++ b/sao/README.md @@ -20,7 +20,7 @@ Development For development, you have to run instead: $ npm install --legacy-peer-deps - $ grunt dev + $ grunt Setup ----- diff --git a/sao/index.html b/sao/index.html index 21067ea1f5..3984b4d831 100644 --- a/sao/index.html +++ b/sao/index.html @@ -9,32 +9,25 @@ this repository contains the full copyright notices and license terms. --> Tryton - - - - - - - - - + + + + + + + + + - - - + + + - - + + - - - + + diff --git a/sao/package.json b/sao/package.json index 16fe7c9a94..37439f21aa 100644 --- a/sao/package.json +++ b/sao/package.json @@ -55,7 +55,6 @@ "grunt": "^1.0", "grunt-cli": "^1.3", "grunt-contrib-concat": "^1.0", - "grunt-contrib-less": "^2.0", - "grunt-contrib-uglify": "^5.0" + "grunt-contrib-less": "^2.0" } } diff --git a/sao/tests/index.html b/sao/tests/index.html index e3b1725a0e..b41b5beb8b 100644 --- a/sao/tests/index.html +++ b/sao/tests/index.html @@ -4,9 +4,9 @@ this repository contains the full copyright notices and license terms. --> Sao Test Suite - - - + + +