From 811991b58b56257c1dc72d69f9f177db50761b78 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Fri, 8 Jan 2016 15:29:56 -0700
Subject: [PATCH] [webpack] enforce using elasticsearch-browser

---
 package.json                          | 4 ++--
 src/ui/public/es.js                   | 3 +--
 webpackShims/elasticsearch-browser.js | 3 +++
 webpackShims/elasticsearch.js         | 5 ++---
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 webpackShims/elasticsearch-browser.js

diff --git a/package.json b/package.json
index acba26563bc94..5b65542fa2e11 100644
--- a/package.json
+++ b/package.json
@@ -92,8 +92,8 @@
     "commander": "2.8.1",
     "css-loader": "0.17.0",
     "d3": "3.5.6",
-    "elasticsearch": "8.0.1",
-    "elasticsearch-browser": "8.0.1",
+    "elasticsearch": "10.0.1",
+    "elasticsearch-browser": "10.0.1",
     "expiry-js": "0.1.7",
     "exports-loader": "0.6.2",
     "expose-loader": "0.7.0",
diff --git a/src/ui/public/es.js b/src/ui/public/es.js
index c95deb3f49eed..3af3d24269c60 100644
--- a/src/ui/public/es.js
+++ b/src/ui/public/es.js
@@ -1,7 +1,6 @@
-import 'elasticsearch-browser/elasticsearch.angular.js';
+import 'elasticsearch-browser';
 import _ from 'lodash';
 define(function (require) {
-
   var es; // share the client amoungst all apps
   require('ui/modules')
     .get('kibana', ['elasticsearch', 'kibana/config'])
diff --git a/webpackShims/elasticsearch-browser.js b/webpackShims/elasticsearch-browser.js
new file mode 100644
index 0000000000000..85f11933ae1fa
--- /dev/null
+++ b/webpackShims/elasticsearch-browser.js
@@ -0,0 +1,3 @@
+require('angular');
+module.exports = require('elasticsearch-browser/elasticsearch.angular.js');
+require('ui/modules').get('kibana', ['elasticsearch']);
diff --git a/webpackShims/elasticsearch.js b/webpackShims/elasticsearch.js
index 796b191673f77..07fc22241ba8e 100644
--- a/webpackShims/elasticsearch.js
+++ b/webpackShims/elasticsearch.js
@@ -1,3 +1,2 @@
-require('angular');
-module.exports = require('node_modules/elasticsearch/elasticsearch.angular.min');
-require('ui/modules').get('kibana', ['elasticsearch']);
+module.exports = false;
+throw new Error('The elasticsearch npm module is not designed for use in the browser. Please use elasticsearch-browser');