Do not minify JavaScript nor CSS
It is better to rely on the server compression and ease debugging source code even on production installation. Closes #11936
This commit is contained in:
+9
-31
@@ -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']);
|
||||
});
|
||||
|
||||
};
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ Development
|
||||
For development, you have to run instead:
|
||||
|
||||
$ npm install --legacy-peer-deps
|
||||
$ grunt dev
|
||||
$ grunt
|
||||
|
||||
Setup
|
||||
-----
|
||||
|
||||
+16
-23
@@ -9,32 +9,25 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<title>Tryton</title>
|
||||
<link rel="icon" type="image/png" href="images/tryton-icon.png">
|
||||
|
||||
<script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/moment/min/moment.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/moment/min/locales.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/gettext.js/dist/gettext.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/d3/d3.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/c3/c3.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/papaparse/papaparse.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/fullcalendar/dist/fullcalendar.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/jquery/dist/jquery.js"></script>
|
||||
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
|
||||
<script type="text/javascript" src="bower_components/moment/moment.js"></script>
|
||||
<script type="text/javascript" src="bower_components/moment/min/locales.js"></script>
|
||||
<script type="text/javascript" src="bower_components/gettext.js/dist/gettext.js"></script>
|
||||
<script type="text/javascript" src="bower_components/d3/d3.js"></script>
|
||||
<script type="text/javascript" src="bower_components/c3/c3.js"></script>
|
||||
<script type="text/javascript" src="bower_components/papaparse/papaparse.js"></script>
|
||||
<script type="text/javascript" src="bower_components/fullcalendar/dist/fullcalendar.js"></script>
|
||||
<script type="text/javascript" src="bower_components/fullcalendar/dist/locale-all.js"></script>
|
||||
<script type="text/javascript" src="bower_components/mousetrap/mousetrap.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/mousetrap/plugins/pause/mousetrap-pause.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/Sortable/Sortable.min.js"></script>
|
||||
<script type="text/javascript" src="bower_components/mousetrap/mousetrap.js"></script>
|
||||
<script type="text/javascript" src="bower_components/mousetrap/plugins/pause/mousetrap-pause.js"></script>
|
||||
<script type="text/javascript" src="bower_components/Sortable/Sortable.js"></script>
|
||||
|
||||
<link rel="stylesheet" href="bower_components/c3/c3.min.css">
|
||||
<link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.min.css">
|
||||
<link rel="stylesheet" href="bower_components/c3/c3.css">
|
||||
<link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.css">
|
||||
|
||||
<script type="text/javascript" src="dist/tryton-sao.min.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="dist/tryton-sao.min.css"
|
||||
media="screen"/>
|
||||
<script type="text/javascript">
|
||||
if (typeof Sao == 'undefined') {
|
||||
document.write(unescape('%3cscript type="text/javascript" src="dist/tryton-sao.js"%3e%3c/script%3e'));
|
||||
document.write(unescape('%3clink rel="stylesheet" type="text/css" href="dist/tryton-sao.css" media="screen"/%3e'));
|
||||
}
|
||||
</script>
|
||||
<script type="text/javascript" src="dist/tryton-sao.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="dist/tryton-sao.css" media="screen"/>
|
||||
<script type="text/javascript" src="custom.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="custom.css" media="screen"/>
|
||||
</head>
|
||||
|
||||
+1
-2
@@ -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"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,9 +4,9 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<html>
|
||||
<head>
|
||||
<title>Sao Test Suite</title>
|
||||
<script type="text/javascript" src="../bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
|
||||
<script type="text/javascript" src="../bower_components/moment/min/moment.min.js"></script>
|
||||
<script type="text/javascript" src="../bower_components/jquery/dist/jquery.js"></script>
|
||||
<script type="text/javascript" src="../bower_components/bootstrap/dist/js/bootstrap.js"></script>
|
||||
<script type="text/javascript" src="../bower_components/moment/moment.js"></script>
|
||||
<script type="text/javascript" src="../bower_components/gettext.js/dist/gettext.js"></script>
|
||||
<script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" media="screen"/>
|
||||
|
||||
Reference in New Issue
Block a user