Fixed js concat issue

.gitignore

@@ -20,5 +20,5 @@ src/css/*.min.css
 /grafana-pro
 /grafana
 
-grafana.custom.ini
+conf/custom.ini
 fig.yml

conf/custom.ini

-app_mode = development
-
-[server]
-router_logging = false
-static_root_path = src
-
-[log]
-level = Trace
-mode = console
-
-
-

src/views/index.html

@@ -22,7 +22,7 @@
 
 		<!-- build:js app/app.js -->
     <script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script>
-    <script src="[[.AppSubUrl]]/public/app/components/require.config.js"></script>
+    <script src="[[.AppSubUrl]]/public/app/components/require.backend.js"></script>
     <!-- endbuild -->
   </head>
 

tasks/options/concat.js

@@ -30,7 +30,7 @@ module.exports = function(config) {
     js: {
       src: [
         '<%= destDir %>/vendor/require/require.js',
-        '<%= destDir %>/app/components/require.<%= mode %>.js',
+        '<%= destDir %>/app/components/require.config.js',
         '<%= destDir %>/app/app.js',
       ],
       dest: '<%= destDir %>/app/app.js'

tasks/options/ngAnnotate.js

@@ -5,13 +5,13 @@ module.exports = function(config) {
       cwd:'<%= tempDir %>',
       src: [
         'app/controllers/**/*.js',
+        'app/plugins/**/*.js',
         'app/directives/**/*.js',
         'app/services/**/*.js',
         'app/filters/**/*.js',
         'app/features/**/*.js',
         'app/panels/**/*.js',
         'app/routes/**/*.js',
-        'plugins/**/*.js',
         'app/app.js',
         'vendor/angular/**/*.js',
       ],