clean up old grunt tasks

.jshintrc

@@ -23,5 +23,6 @@
   "sub": true,
   "-W084": true,
   "scripturl": true,
-  "evil": true
+  "evil": true,
+  "esnext": true
 }

.jshintrc.browser

@@ -2,6 +2,7 @@
   "extends": "./.jshintrc",
   "node": false,
   "browser": true,
+  "esnext": false,
 
   "predef": {
     // require.js

Gruntfile.js

@@ -40,17 +40,6 @@ module.exports = function (grunt) {
 
   grunt.config.merge(config);
 
-  var dirname = require('path').dirname;
-  var indexFiles = grunt.file.expand({ cwd: 'src/kibana/plugins' }, [
-    '*/index.js',
-    '!' + config.devPlugins + '/index.js'
-  ]);
-  var moduleIds = indexFiles.map(function (fileName) {
-    return 'plugins/' + dirname(fileName) + '/index';
-  });
-
-  config.bundled_plugin_module_ids = grunt.bundled_plugin_module_ids = moduleIds;
-
   // load plugins
   require('load-grunt-config')(grunt, {
     configPath: __dirname + '/tasks/config',

tasks/build.js

@@ -5,7 +5,7 @@ module.exports = function (grunt) {
     'clean:build',
     'less:build',
     'copy:kibana_src',
-    'clean:dev_only_plugins',
+    'clean:noDistPlugins',
 
     'webpack:build',
     'clean:unneeded_source_in_build',

tasks/chmod_kibana.js

@@ -1,9 +0,0 @@
-var fs = require('fs');
-var join = require('path').join;
-module.exports = function (grunt) {
-  grunt.registerTask('chmod_kibana', 'Chmods bin/kibana', function () {
-    var done = this.async();
-    var path = join(grunt.config.get('build'), 'dist', 'kibana', 'bin', 'kibana');
-    fs.chmod(path, 0755, done);
-  });
-};

tasks/config/clean.js

@@ -3,33 +3,6 @@ module.exports = function (grunt) {
   return {
     build: '<%= build %>',
     target: '<%= target %>',
-    unneeded_source_in_build: {
-      src: [
-        // select all top level folders in bower_components
-        '<%= build %>/kibana/public/bower_components/*',
-
-        // exclude the following top level components
-        '!<%= build %>/kibana/public/bower_components/' + notIncludedComponents,
-
-        // remove the all bower_components except for notIncludedComponents, and keep the one files they need
-        '<%= build %>/kibana/public/bower_components/' + notIncludedComponents + '/*',
-        '!<%= build %>/kibana/public/bower_components/requirejs/require.js',
-        '!<%= build %>/kibana/public/bower_components/font-awesome/fonts',
-        '!<%= build %>/kibana/public/bower_components/zeroclipboard/dist',
-        '!<%= build %>/kibana/public/bower_components/leaflet-draw/dist',
-
-        // delete the contents of the dist dir, except the ZeroClipboard.swf file
-        '<%= build %>/kibana/public/bower_components/zeroclipboard/dist/*',
-        '!<%= build %>/kibana/public/bower_components/zeroclipboard/dist/ZeroClipboard.swf',
-
-        '<%= build %>/kibana/public/**/_empty_',
-        '<%= build %>/kibana/public/**/*.less',
-        '<%= build %>/kibana/public/config',
-        '<%= build %>/kibana/public/{css-builder,normalize}.js',
-        '<%= app %>/public/{css-builder,normalize}.js'
-      ]
-    },
-    dev_only_plugins: '<%= build %>/src/plugins/<%= devPlugins %>',
-    test_from_node_modules: '<%= build %>/dist/kibana/src/node_modules/**/*test*'
+    noDistPlugins: '<%= build %>/src/plugins/<%= noDistPlugins %>'
   };
 };

tasks/config/esvm.js

@@ -1,8 +1,7 @@
 module.exports = function (grunt) {
-  var join = require('path').join;
-  var rel = require('path').join.bind(null, grunt.config.get('root'));
-  var directory = join(grunt.config.get('root'), 'esvm');
-  var dataDir = join(directory, 'data_dir');
+  var resolve = require('path').resolve;
+  var directory = resolve(__dirname, '../../esvm');
+  var dataDir = resolve(directory, 'data_dir');
 
   return {
     options: {

tasks/config/run.js

@@ -1,35 +1,14 @@
 module.exports = function (grunt) {
-  var os = require('os');
-  var arch = os.arch();
-  var platform = os.platform();
-
-  // config:
-  // wait: should task wait until the script exits before finishing
-  // ready: if not waiting, then how do we know the process is ready?
-  // quiet: ignore stdout from the process
-  // failOnError: the process is killed if output to stderr
-
-  var options = {
-    wait: false,
-    ready: /kibana server started/i,
-    quiet: true,
-    failOnError: true
-  };
-
-  var args = ['-H', '127.0.0.1'];
-
-  var config = {
-    built_kibana: {
+  return {
+    devServer: {
       options: {
         wait: false,
-        ready: /Listening/i,
-        quiet: true,
+        ready: /Server running/,
+        quiet: false,
         failOnError: false
       },
-      cmd: './target/<%= pkg.name + "-" + pkg.version %>-' + platform + '-' + arch + '/bin/kibana',
-      args: args
+      cmd: './bin/kibana',
+      args: ['--logging.json=false']
     }
   };
-
-  return config;
 };

tasks/default.js

@@ -1,4 +0,0 @@
-// Lint and build CSS
-module.exports = function (grunt) {
-  grunt.registerTask('default', ['jshint:source', 'jscs:source', 'less']);
-};

tasks/maybeStartKibana.js

@@ -52,6 +52,6 @@ module.exports = function (grunt) {
   grunt.registerTask('maybeStartKibana', maybeStartServer({
     name: 'kibana-server',
     port: grunt.option('port') || 5601,
-    tasks: ['devServer']
+    tasks: ['run:devServer']
   }));
 };

tasks/touch_config.js

@@ -1,8 +0,0 @@
-module.exports = function (grunt) {
-  var join = require('path').join;
-  grunt.registerTask('touch_config', function () {
-    var configFile = join(grunt.config.get('build'), 'src', 'config');
-    grunt.log.ok('Touching: ' + configFile);
-    grunt.file.write(configFile, 'delete this');
-  });
-};

tasks/version.js

@@ -1,31 +0,0 @@
-module.exports = function (grunt) {
-  var root = require('path').resolve.bind(null, __dirname, '..');
-  var updateVersion = require('./utils/updateVersion');
-
-  var README_PATH = root('README.md');
-  var PKG_JSON_PATH = root('package.json');
-
-  function replace(source, from, to) {
-    return String(source).split(from).join(to);
-  }
-
-  grunt.registerTask('version', function (updateExpr) {
-    var oldVersion = grunt.config.get('pkg.version');
-    var version = updateVersion(oldVersion, updateExpr);
-    grunt.log.debug('switching from %s to %s', oldVersion, version);
-
-    // update grunt config
-    grunt.config.set('pkg.version', version);
-
-    // write back to package.json
-    var pkgJson = grunt.file.read(PKG_JSON_PATH);
-    pkgJson = replace(pkgJson, JSON.stringify(oldVersion), JSON.stringify(version));
-    grunt.file.write(PKG_JSON_PATH, pkgJson);
-    grunt.log.ok('updated package.json', version);
-
-    // write the readme
-    var readme = grunt.file.read(README_PATH);
-    grunt.file.write(README_PATH, replace(readme, oldVersion, version));
-    grunt.log.ok('updated readme', version);
-  });
-};