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

Updated grunt tasks for the src -> public directory change

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-03-29 13:06:53 +02:00
parent fde11be279
commit b48b2ac656
4 changed files with 15 additions and 12 deletions

10
public/test/karma.conf.js
View File

@ -8,11 +8,11 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'src/test/test-main.js',
{pattern: 'src/app/**/*.js', included: false},
{pattern: 'src/vendor/**/*.js', included: false},
{pattern: 'src/test/**/*.js', included: false},
{pattern: 'src/**/*.js', included: false}
'public/test/test-main.js',
{pattern: 'public/app/**/*.js', included: false},
{pattern: 'public/vendor/**/*.js', included: false},
{pattern: 'public/test/**/*.js', included: false},
{pattern: 'public/**/*.js', included: false}
],
// list of files to exclude

2
public/test/test-main.js
View File

@ -1,5 +1,5 @@
require.config({
baseUrl: 'http://localhost:9876/base/src/app',
baseUrl: 'http://localhost:9876/base/public/app',
paths: {
specs: '../test/specs',

10
tasks/options/karma.js
View File

@ -1,22 +1,22 @@
module.exports = function(config) {
return {
dev: {
configFile: 'src/test/karma.conf.js',
configFile: '<%= srcDir %>/test/karma.conf.js',
singleRun: false,
},
debug: {
configFile: 'src/test/karma.conf.js',
configFile: '<%= srcDir %>/test/karma.conf.js',
singleRun: false,
browsers: ['Chrome']
},
test: {
configFile: 'src/test/karma.conf.js',
configFile: '<%= srcDir %>/test/karma.conf.js',
},
coveralls: {
configFile: 'src/test/karma.conf.js',
configFile: '<%= srcDir %>/test/karma.conf.js',
reporters: ['dots','coverage','coveralls'],
preprocessors: {
'src/app/**/*.js': ['coverage']
'<%= srcDir %>/app/**/*.js': ['coverage']
},
coverageReporter: {
type: 'lcov',

5
tasks/options/requirejs.js
View File

@ -61,7 +61,10 @@ module.exports = function(config,grunt) {
'controllers/all',
'routes/all',
'components/partials',
// bundle the datasources
'plugins/datasource/grafana/datasource',
'plugins/datasource/graphite/datasource',
'plugins/datasource/influxdb_08/datasource',
]
}
];
@ -69,7 +72,7 @@ module.exports = function(config,grunt) {
var fs = require('fs');
var panelPath = config.srcDir+'/app/panels';
// create a module for each directory in src/app/panels/
// create a module for each directory in public/app/panels/
fs.readdirSync(panelPath).forEach(function (panelName) {
requireModules[0].include.push('panels/'+panelName+'/module');
requireModules[0].include.push('text!panels/'+panelName+'/module.html');