IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): fixed build after change that made panels into proper plugins

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-11-21 13:53:33 +01:00
parent 29f6283eab
commit bd8f5e9bfd
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/options/htmlmin.js
View File

@ -8,9 +8,7 @@ module.exports = function(config) {
expand: true,
cwd: '<%= genDir %>',
src: [
//'index.html',
'app/panels/**/*.html',
'app/partials/**/*.html'
'app/**/*.html',
],
dest: '<%= genDir %>'
}

3
tasks/options/jscs.js
View File

@ -4,7 +4,6 @@ module.exports = function(config) {
'Gruntfile.js',
'<%= srcDir %>/app/**/*.js',
'<%= srcDir %>/plugins/**/*.js',
'!<%= srcDir %>/app/panels/*/{lib,leaflet}/*',
'!<%= srcDir %>/app/dashboards/*'
],
options: {
@ -20,4 +19,4 @@ module.exports = function(config) {
"disallowRightStickedOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireRightStickedOperators": ["!"],
"requireLeftStickedOperators": [","],
*/
*/

3
tasks/options/jshint.js
View File

@ -18,9 +18,8 @@ module.exports = function(config) {
'dist/*',
'sample/*',
'<%= srcDir %>/vendor/*',
'<%= srcDir %>/app/panels/*/{lib,leaflet}/*',
'<%= srcDir %>/app/dashboards/*'
]
}
};
};
};

4
tasks/options/requirejs.js
View File

@ -62,11 +62,11 @@ module.exports = function(config,grunt) {
];
var fs = require('fs');
var panelPath = config.srcDir + '/app/panels';
var panelPath = config.srcDir + '/app/plugins/panels';
// create a module for each directory in public/app/panels/
fs.readdirSync(panelPath).forEach(function (panelName) {
requireModules[0].include.push('app/panels/'+panelName+'/module');
requireModules[0].include.push('app/plugins/panels/'+panelName+'/module');
});
return { options: options };