From 62c908a905dcacfc94776dca4b99c3b902559731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 22 Oct 2015 10:02:29 -0400 Subject: [PATCH] fix(build): fixed partials so they are included in optimized js file, fixes #2997 --- tasks/build_task.js | 1 - tasks/options/concat.js | 1 - tasks/options/ngtemplates.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tasks/build_task.js b/tasks/build_task.js index 364c3dc797c..7773299a06d 100644 --- a/tasks/build_task.js +++ b/tasks/build_task.js @@ -23,7 +23,6 @@ module.exports = function(grunt) { 'filerev', 'remapFilerev', 'usemin', - 'clean:temp', 'uglify:genDir' ]); diff --git a/tasks/options/concat.js b/tasks/options/concat.js index 96ad9ae1341..c15aa8a2d6e 100644 --- a/tasks/options/concat.js +++ b/tasks/options/concat.js @@ -24,7 +24,6 @@ module.exports = function(config) { ], dest: '<%= genDir %>/css/grafana.light.min.css' }, - js: { src: [ '<%= tempDir %>/vendor/requirejs/require.js', diff --git a/tasks/options/ngtemplates.js b/tasks/options/ngtemplates.js index 2ccdf4ce5ef..10c39a49c39 100644 --- a/tasks/options/ngtemplates.js +++ b/tasks/options/ngtemplates.js @@ -6,7 +6,7 @@ module.exports = function(config) { dest: '<%= genDir %>/app/components/partials.js', options: { 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" + script + '\n}]);' +