Commit 62c908a9 by Torkel Ödegaard

fix(build): fixed partials so they are included in optimized js file, fixes #2997

parent 58497ed5
...@@ -23,7 +23,6 @@ module.exports = function(grunt) { ...@@ -23,7 +23,6 @@ module.exports = function(grunt) {
'filerev', 'filerev',
'remapFilerev', 'remapFilerev',
'usemin', 'usemin',
'clean:temp',
'uglify:genDir' 'uglify:genDir'
]); ]);
......
...@@ -24,7 +24,6 @@ module.exports = function(config) { ...@@ -24,7 +24,6 @@ module.exports = function(config) {
], ],
dest: '<%= genDir %>/css/grafana.light.min.css' dest: '<%= genDir %>/css/grafana.light.min.css'
}, },
js: { js: {
src: [ src: [
'<%= tempDir %>/vendor/requirejs/require.js', '<%= tempDir %>/vendor/requirejs/require.js',
......
...@@ -6,7 +6,7 @@ module.exports = function(config) { ...@@ -6,7 +6,7 @@ module.exports = function(config) {
dest: '<%= genDir %>/app/components/partials.js', dest: '<%= genDir %>/app/components/partials.js',
options: { options: {
bootstrap: function(module, script) { bootstrap: function(module, script) {
return "define('components/partials', ['angular'], function(angular) { \n" + return "define('app/components/partials', ['angular'], function(angular) { \n" +
"angular.module('grafana').run(['$templateCache', function($templateCache) { \n" + "angular.module('grafana').run(['$templateCache', function($templateCache) { \n" +
script + script +
'\n}]);' + '\n}]);' +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment