Disallow importing Joi client side (#55018)

* Disallow importing Joi client side * Move elasticsearch lib into server folder * Add a comment about the 'joi' eslint rule Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Jan 24, 2020 · f7c53b5 · f7c53b5
1 parent b8f7748
commit f7c53b5
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 5 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -262,6 +262,8 @@ module.exports = {
                   'src/core/server/**/*',
                   '(src|x-pack)/plugins/*/server/**/*',
                   'examples/**/server/**/*',
+                  // TODO: Remove the 'joi' eslint rule once IE11 support is dropped
+                  'joi',
                 ],
                 errorMessage:
                   'Server modules cannot be imported into client modules or shared modules.',

diff --git a/src/legacy/core_plugins/elasticsearch/index.js b/src/legacy/core_plugins/elasticsearch/index.js
@@ -17,10 +17,10 @@
  * under the License.
  */
 import { first } from 'rxjs/operators';
-import healthCheck from './lib/health_check';
-import { Cluster } from './lib/cluster';
-import { createProxy } from './lib/create_proxy';
-import { handleESError } from './lib/handle_es_error';
+import healthCheck from './server/lib/health_check';
+import { Cluster } from './server/lib/cluster';
+import { createProxy } from './server/lib/create_proxy';
+import { handleESError } from './server/lib/handle_es_error';
 
 export default function(kibana) {
   let defaultVars;

diff --git a/...search/lib/__tests__/ensure_es_version.js → ...server/lib/__tests__/ensure_es_version.js b/...search/lib/__tests__/ensure_es_version.js → ...server/lib/__tests__/ensure_es_version.js
diff --git a/...icsearch/lib/__tests__/handle_es_error.js → ...h/server/lib/__tests__/handle_es_error.js b/...icsearch/lib/__tests__/handle_es_error.js → ...h/server/lib/__tests__/handle_es_error.js
diff --git a/...asticsearch/lib/__tests__/health_check.js → ...arch/server/lib/__tests__/health_check.js b/...asticsearch/lib/__tests__/health_check.js → ...arch/server/lib/__tests__/health_check.js
diff --git a/...__tests__/is_es_compatible_with_kibana.js → ...__tests__/is_es_compatible_with_kibana.js b/...__tests__/is_es_compatible_with_kibana.js → ...__tests__/is_es_compatible_with_kibana.js
diff --git a/...icsearch/lib/abortable_request_handler.js → ...h/server/lib/abortable_request_handler.js b/...icsearch/lib/abortable_request_handler.js → ...h/server/lib/abortable_request_handler.js
diff --git a/...rch/lib/abortable_request_handler.test.js → ...ver/lib/abortable_request_handler.test.js b/...rch/lib/abortable_request_handler.test.js → ...ver/lib/abortable_request_handler.test.js
diff --git a/...core_plugins/elasticsearch/lib/cluster.ts → ...ugins/elasticsearch/server/lib/cluster.ts b/...core_plugins/elasticsearch/lib/cluster.ts → ...ugins/elasticsearch/server/lib/cluster.ts
diff --git a/...plugins/elasticsearch/lib/create_proxy.js → .../elasticsearch/server/lib/create_proxy.js b/...plugins/elasticsearch/lib/create_proxy.js → .../elasticsearch/server/lib/create_proxy.js
diff --git a/...ns/elasticsearch/lib/ensure_es_version.js → ...ticsearch/server/lib/ensure_es_version.js b/...ns/elasticsearch/lib/ensure_es_version.js → ...ticsearch/server/lib/ensure_es_version.js
diff --git a/...gins/elasticsearch/lib/handle_es_error.js → ...asticsearch/server/lib/handle_es_error.js b/...gins/elasticsearch/lib/handle_es_error.js → ...asticsearch/server/lib/handle_es_error.js
diff --git a/...plugins/elasticsearch/lib/health_check.js → .../elasticsearch/server/lib/health_check.js b/...plugins/elasticsearch/lib/health_check.js → .../elasticsearch/server/lib/health_check.js
diff --git a/...earch/lib/is_es_compatible_with_kibana.js → ...erver/lib/is_es_compatible_with_kibana.js b/...earch/lib/is_es_compatible_with_kibana.js → ...erver/lib/is_es_compatible_with_kibana.js
diff --git a/...ugins/elasticsearch/lib/kibana_version.js → ...lasticsearch/server/lib/kibana_version.js b/...ugins/elasticsearch/lib/kibana_version.js → ...lasticsearch/server/lib/kibana_version.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { version as kibanaVersion } from '../../../../../package.json';
+import { version as kibanaVersion } from '../../../../../../package.json';
 
 export default {
   // Make the version stubbable to improve testability.