[webpack] enforce using elasticsearch-browser

elastic · Feb 5, 2016 · 811991b · 811991b
1 parent 05392a7
commit 811991b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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');