Просмотр исходного кода

fix(build): fixed build after change that made panels into proper plugins

Torkel Ödegaard 10 лет назад
Родитель
Сommit
bd8f5e9bfd
4 измененных файлов с 5 добавлено и 9 удалено
  1. 1 3
      tasks/options/htmlmin.js
  2. 1 2
      tasks/options/jscs.js
  3. 1 2
      tasks/options/jshint.js
  4. 2 2
      tasks/options/requirejs.js

+ 1 - 3
tasks/options/htmlmin.js

@@ -8,9 +8,7 @@ module.exports = function(config) {
       expand: true,
       cwd: '<%= genDir %>',
       src: [
-        //'index.html',
-        'app/panels/**/*.html',
-        'app/partials/**/*.html'
+        'app/**/*.html',
       ],
       dest: '<%= genDir %>'
     }

+ 1 - 2
tasks/options/jscs.js

@@ -4,7 +4,6 @@ module.exports = function(config) {
       'Gruntfile.js',
       '<%= srcDir %>/app/**/*.js',
       '<%= srcDir %>/plugins/**/*.js',
-      '!<%= srcDir %>/app/panels/*/{lib,leaflet}/*',
       '!<%= srcDir %>/app/dashboards/*'
     ],
     options: {
@@ -20,4 +19,4 @@ module.exports = function(config) {
     "disallowRightStickedOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
     "requireRightStickedOperators": ["!"],
     "requireLeftStickedOperators": [","],
-   */
+   */

+ 1 - 2
tasks/options/jshint.js

@@ -18,9 +18,8 @@ module.exports = function(config) {
         'dist/*',
         'sample/*',
         '<%= srcDir %>/vendor/*',
-        '<%= srcDir %>/app/panels/*/{lib,leaflet}/*',
         '<%= srcDir %>/app/dashboards/*'
       ]
     }
   };
-};
+};

+ 2 - 2
tasks/options/requirejs.js

@@ -62,11 +62,11 @@ module.exports = function(config,grunt) {
     ];
 
     var fs = require('fs');
-    var panelPath = config.srcDir + '/app/panels';
+    var panelPath = config.srcDir + '/app/plugins/panels';
 
     // create a module for each directory in public/app/panels/
     fs.readdirSync(panelPath).forEach(function (panelName) {
-      requireModules[0].include.push('app/panels/'+panelName+'/module');
+      requireModules[0].include.push('app/plugins/panels/'+panelName+'/module');
     });
 
     return { options: options };