Merge pull request #7562 from jbudz/issues/7275

Folder layout

.gitignore

@@ -19,7 +19,8 @@ target
 /esvm
 .htpasswd
 .eslintcache
-installedPlugins
+plugins
+data
 disabledPlugins
 webpackstats.json
 config/kibana.dev.yml

CONTRIBUTING.md

@@ -142,7 +142,7 @@ for development and fixing individual tests.
 This should work super if you're using the [Kibana plugin generator](https://github.com/elastic/generator-kibana-plugin). If you're not using the generator, well, you're on your own. We suggest you look at how the generator works.
 
 `npm run test:dev -- --kbnServer.testsBundle.pluginId=some_special_plugin --kbnServer.plugin-path=../some_special_plugin`
-Run the tests for just your particular plugin. Assuming you plugin lives outside of the `installedPlugins directory`, which it should.
+Run the tests for just your particular plugin. Assuming you plugin lives outside of the `plugins directory`, which it should.
 
 #### Running browser automation tests:
 

Gruntfile.js

@@ -10,7 +10,7 @@ module.exports = function (grunt) {
     root: __dirname,
     src: __dirname + '/src',
     buildDir: __dirname + '/build', // temporary build directory
-    plugins: __dirname + '/src/plugins',
+    plugins: __dirname + '/src/core_plugins',
     server: __dirname + '/src/server',
     target: __dirname + '/target', // location of the compressed build targets
     testUtilsDir: __dirname + '/src/test_utils',

src/cli/serve/serve.js

@@ -92,8 +92,8 @@ module.exports = function (program) {
     'times to specify multiple directories',
     pluginDirCollector,
     [
-      fromRoot('installedPlugins'),
-      fromRoot('src/plugins')
+      fromRoot('plugins'),
+      fromRoot('src/core_plugins')
     ]
   )
   .option(

src/cli_plugin/install/__tests__/settings.js

@@ -70,7 +70,7 @@ describe('kibana cli', function () {
         let options = {};
         const kbnPackage = { version: 1234 };
         beforeEach(function () {
-          options = { pluginDir: fromRoot('installedPlugins') };
+          options = { pluginDir: fromRoot('plugins') };
         });
 
         describe('timeout option', function () {
@@ -143,10 +143,10 @@ describe('kibana cli', function () {
 
         describe('pluginDir option', function () {
 
-          it('should default to installedPlugins', function () {
+          it('should default to plugins', function () {
             const settings = parse(command, options, kbnPackage);
 
-            expect(settings.pluginDir).to.be(fromRoot('installedPlugins'));
+            expect(settings.pluginDir).to.be(fromRoot('plugins'));
           });
 
           it('should set settings.config property', function () {

src/cli_plugin/install/index.js

@@ -39,7 +39,7 @@ export default function pluginInstall(program) {
   .option(
     '-d, --plugin-dir <path>',
     'path to the directory where plugins are stored',
-    fromRoot('installedPlugins')
+    fromRoot('plugins')
   )
   .description('install a plugin',
 `Common examples:

src/cli_plugin/install/kibana.js

@@ -35,7 +35,7 @@ export async function rebuildCache(settings, logger) {
       },
       plugins: {
         initialize: false,
-        scanDirs: [settings.pluginDir, fromRoot('src/plugins')]
+        scanDirs: [settings.pluginDir, fromRoot('src/core_plugins')]
       }
     }
   );

src/cli_plugin/list/__tests__/settings.js

@@ -15,15 +15,15 @@ describe('kibana cli', function () {
         let command;
         const options = {};
         beforeEach(function () {
-          command = { pluginDir: fromRoot('installedPlugins') };
+          command = { pluginDir: fromRoot('plugins') };
         });
 
         describe('pluginDir option', function () {
 
-          it('should default to installedPlugins', function () {
+          it('should default to plugins', function () {
             const settings = parse(command, options);
 
-            expect(settings.pluginDir).to.be(fromRoot('installedPlugins'));
+            expect(settings.pluginDir).to.be(fromRoot('plugins'));
           });
 
           it('should set settings.config property', function () {

src/cli_plugin/list/index.js

@@ -23,7 +23,7 @@ export default function pluginList(program) {
     .option(
       '-d, --plugin-dir <path>',
       'path to the directory where plugins are stored',
-      fromRoot('installedPlugins')
+      fromRoot('plugins')
     )
     .description('list installed plugins')
     .action(processCommand);

src/cli_plugin/remove/__tests__/settings.js

@@ -16,7 +16,7 @@ describe('kibana cli', function () {
         let options = {};
         const kbnPackage = { version: 1234 };
         beforeEach(function () {
-          options = { pluginDir: fromRoot('installedPlugins') };
+          options = { pluginDir: fromRoot('plugins') };
         });
 
         describe('quiet option', function () {
@@ -72,10 +72,10 @@ describe('kibana cli', function () {
 
         describe('pluginDir option', function () {
 
-          it('should default to installedPlugins', function () {
+          it('should default to plugins', function () {
             const settings = parse(command, options, kbnPackage);
 
-            expect(settings.pluginDir).to.be(fromRoot('installedPlugins'));
+            expect(settings.pluginDir).to.be(fromRoot('plugins'));
           });
 
           it('should set settings.config property', function () {

src/cli_plugin/remove/index.js

@@ -31,7 +31,7 @@ export default function pluginRemove(program) {
   .option(
     '-d, --plugin-dir <path>',
     'path to the directory where plugins are stored',
-    fromRoot('installedPlugins')
+    fromRoot('plugins')
   )
   .description('remove a plugin',
 `common examples: