Merge branch 'master' into task/endpoint-details-to-ingest

Author: elasticmachine

package.json

@@ -127,7 +127,7 @@
     "@elastic/charts": "19.2.0",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.8.0",
-    "@elastic/eui": "23.3.1",
+    "@elastic/eui": "24.1.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",

packages/kbn-storybook/storybook_config/webpack.config.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-const { resolve } = require('path');
+const { parse, resolve } = require('path');
 const webpack = require('webpack');
 const { stringifyRequest } = require('loader-utils');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
@@ -95,6 +95,27 @@ module.exports = async ({ config }) => {
           },
         },
       },
+      {
+        loader: 'resolve-url-loader',
+        options: {
+          // If you don't have arguments (_, __) to the join function, the
+          // resolve-url-loader fails with a loader misconfiguration error.
+          //
+          // eslint-disable-next-line no-unused-vars
+          join: (_, __) => (uri, base) => {
+            if (!base || !parse(base).dir.includes('legacy')) {
+              return null;
+            }
+
+            // URIs on mixins in src/legacy/public/styles need to be resolved.
+            if (uri.startsWith('ui/assets')) {
+              return resolve(REPO_ROOT, 'src/core/server/core_app/', uri.replace('ui/', ''));
+            }
+
+            return null;
+          },
+        },
+      },
       {
         loader: 'sass-loader',
         options: {

packages/kbn-ui-shared-deps/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@elastic/charts": "19.2.0",
-    "@elastic/eui": "23.3.1",
+    "@elastic/eui": "24.1.0",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",

src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap

@@ -33,6 +33,8 @@ afterEach(async () => {
 });
 
 it('builds light themed SASS', async () => {
+  // Increased timeout from 5000ms due to intermittent timeout failures
+  jest.setTimeout(60000);
   const targetPath = resolve(TMP, 'style.css');
   await new Build({
     sourcePath: FIXTURE,

src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap

@@ -58,6 +58,10 @@ export function AppsMenuProvider({ getService, getPageObjects }: FtrProviderCont
     public async closeCollapsibleNav() {
       const CLOSE_BUTTON = '[data-test-subj=collapsibleNav] > button';
       if (await find.existsByCssSelector(CLOSE_BUTTON)) {
+        // Close button is only visible when focused
+        const button = await find.byCssSelector(CLOSE_BUTTON);
+        await button.focus();
+
         await find.clickByCssSelector(CLOSE_BUTTON);
       }
     }

src/legacy/server/sass/build.test.js

@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "23.3.1",
+    "@elastic/eui": "24.1.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },

src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap

@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "23.3.1",
+    "@elastic/eui": "24.1.0",
     "react": "^16.12.0"
   },
   "scripts": {