tech(systemjs): worked on making optimized builds work with systemjs builder

tasks/options/concat.js

@@ -13,6 +13,7 @@ module.exports = function(config) {
       ],
       dest: '<%= genDir %>/css/grafana.dark.min.css'
     },
+
     cssLight: {
       src: [
         '<%= genDir %>/vendor/css/normalize.min.css',
@@ -24,13 +25,24 @@ module.exports = function(config) {
       ],
       dest: '<%= genDir %>/css/grafana.light.min.css'
     },
+
     js: {
       src: [
-        '<%= tempDir %>/vendor/requirejs/require.js',
-        '<%= tempDir %>/app/require_config.js',
-        '<%= tempDir %>/app/app.js',
+        '<%= genDir %>/vendor/npm/es6-shim/es6-shim.js',
+        '<%= genDir %>/vendor/npm/es6-promise/es6-promise.js',
+        '<%= genDir %>/vendor/npm/systemjs/dist/system.js',
+        '<%= genDir %>/app/systemjs.conf.js',
+        '<%= genDir %>/app/boot.js',
       ],
-      dest: '<%= genDir %>/app/app.js'
+      dest: '<%= genDir %>/app/boot.js'
+    },
+
+    bundle_and_boot: {
+      src: [
+        '<%= genDir %>/app/app_bundle.js',
+        '<%= genDir %>/app/boot.js',
+      ],
+      dest: '<%= genDir %>/app/boot.js'
     },
   };
 };

tasks/options/cssmin.js

@@ -3,7 +3,7 @@ module.exports = function(config) {
     build: {
       expand: true,
       cwd: '<%= genDir %>',
-      src: '**/*.css',
+      src: ['css/*.css', 'vendor/css/*.css'],
       dest: '<%= genDir %>'
     }
   };

tasks/options/ngtemplates.js

@@ -7,7 +7,7 @@ module.exports = function(config) {
       options: {
         bootstrap: function(module, script) {
           return "define('app/core/partials', ['app/core/core_module'], function(coreModule) { \n" +
-            "coreModule.run(['$templateCache', function($templateCache) { \n" +
+            "coreModule.default.run(['$templateCache', function($templateCache) { \n" +
                 script +
             '\n}]);' +
           '\n});';