Merge branch 'master' into feature/merge-code

elastic · Dec 11, 2018 · 7427d16 · 7427d16
2 parents 0fe322e + 459cbe4
commit 7427d16
Show file tree

Hide file tree

Showing 100 changed files with 47,908 additions and 44,837 deletions.
diff --git a/package.json b/package.json
@@ -93,7 +93,7 @@
   },
   "dependencies": {
     "@elastic/datemath": "5.0.1",
-    "@elastic/eui": "5.3.0",
+    "@elastic/eui": "5.6.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.2",
@@ -205,7 +205,7 @@
     "regression": "2.0.0",
     "request": "^2.88.0",
     "reselect": "^3.0.1",
-    "resize-observer-polyfill": "1.2.1",
+    "resize-observer-polyfill": "^1.5.0",
     "rimraf": "2.4.3",
     "rison-node": "1.0.0",
     "rxjs": "^6.2.1",
@@ -216,7 +216,7 @@
     "style-loader": "0.23.1",
     "tar": "2.2.0",
     "tinygradient": "0.3.0",
-    "tinymath": "1.1.0",
+    "tinymath": "1.1.1",
     "topojson-client": "3.0.0",
     "trunc-html": "1.0.2",
     "trunc-text": "1.0.2",

diff --git a/packages/kbn-interpreter/src/public/socket.js b/packages/kbn-interpreter/src/public/socket.js
@@ -55,6 +55,9 @@ export async function createSocket(basePath) {
 
     socket.on('connect', () => {
       resolve();
+      socket.off('connectionFailed', errorHandler);
+      socket.off('connect_error', errorHandler);
+      socket.off('connect_timeout', errorHandler);
     });
 
     function errorHandler(err) {

diff --git a/packages/kbn-interpreter/src/server/plugin_paths.js b/packages/kbn-interpreter/src/server/plugin_paths.js
@@ -30,4 +30,6 @@ export const pluginPaths = {
   modelUIs: ['uis', 'models'],
   viewUIs: ['uis', 'views'],
   argumentUIs: ['uis', 'arguments'],
+  templates: ['templates'],
+  tagUIs: ['uis', 'tags'],
 };