opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 17:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:torkelo/grafana-private into pro

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-02-03 13:36:25 +01:00
parent dfef4727b6 858d7be8cf
commit 16acdfc7c3
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -30,6 +30,7 @@
"grunt-filerev": "^0.2.1", "grunt-filerev": "^0.2.1",
"grunt-git-describe": "~2.3.2", "grunt-git-describe": "~2.3.2",
"grunt-karma": "~0.8.3", "grunt-karma": "~0.8.3",
"grunt-ng-annotate": "^0.9.2",
"grunt-ngmin": "0.0.3", "grunt-ngmin": "0.0.3",
"grunt-string-replace": "~0.2.4", "grunt-string-replace": "~0.2.4",
"grunt-usemin": "3.0.0", "grunt-usemin": "3.0.0",
@ -44,7 +45,7 @@
"karma-html2js-preprocessor": "~0.1.0", "karma-html2js-preprocessor": "~0.1.0",
"karma-jasmine": "~0.2.2", "karma-jasmine": "~0.2.2",
"karma-mocha": "~0.1.4", "karma-mocha": "~0.1.4",
"karma-phantomjs-launcher": "~0.1.1", "karma-phantomjs-launcher": "~0.1.4",
"karma-requirejs": "~0.2.1", "karma-requirejs": "~0.2.1",
"karma-script-launcher": "~0.1.0", "karma-script-launcher": "~0.1.0",
"load-grunt-tasks": "~0.2.0", "load-grunt-tasks": "~0.2.0",
@ -62,7 +63,7 @@
}, },
"license": "Apache License", "license": "Apache License",
"dependencies": { "dependencies": {
"grunt-jscs-checker": "^0.4.4", "grunt-jscs": "^0.8.1",
"karma-sinon": "^1.0.3", "karma-sinon": "^1.0.3",
"lodash": "^2.4.1", "lodash": "^2.4.1",
"sinon": "^1.10.3" "sinon": "^1.10.3"

2
tasks/build_task.js
View File

@ -15,7 +15,7 @@ module.exports = function(grunt) {
'ngtemplates', 'ngtemplates',
'cssmin:build', 'cssmin:build',
'build:grafanaVersion', 'build:grafanaVersion',
'ngmin:build', 'ngAnnotate:build',
'requirejs:build', 'requirejs:build',
'concat:js', 'concat:js',
'filerev', 'filerev',

2
tasks/options/ngmin.js → tasks/options/ngAnnotate.js
View File

@ -1,7 +1,7 @@
module.exports = function(config) { module.exports = function(config) {
return { return {
build: { build: {
expand:true, expand: true,
cwd:'<%= tempDir %>', cwd:'<%= tempDir %>',
src: [ src: [
'app/controllers/**/*.js', 'app/controllers/**/*.js',