Merge branch 'master' of github.com:elastic/kibana into fix/cli-polyf…

…ill-prod

# Conflicts:
#	src/dev/build/tasks/copy_source_task.ts

.github/CODEOWNERS

@@ -263,10 +263,8 @@
 /x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
 /x-pack/test/functional/apps/security/ @elastic/kibana-security
 /x-pack/test/kerberos_api_integration/ @elastic/kibana-security
-/x-pack/test/login_selector_api_integration/ @elastic/kibana-security
 /x-pack/test/oidc_api_integration/ @elastic/kibana-security
 /x-pack/test/pki_api_integration/ @elastic/kibana-security
-/x-pack/test/saml_api_integration/ @elastic/kibana-security
 /x-pack/test/security_api_integration/ @elastic/kibana-security
 /x-pack/test/security_functional/ @elastic/kibana-security
 /x-pack/test/spaces_api_integration/ @elastic/kibana-security

package.json

@@ -117,7 +117,7 @@
   "dependencies": {
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.1",
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",

packages/kbn-ui-framework/package.json

@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/optimizer": "1.0.0",
     "babel-loader": "^8.0.6",

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

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@elastic/charts": "23.0.0",
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",
@@ -39,6 +39,7 @@
   "devDependencies": {
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "css-loader": "^3.4.2",
     "del": "^5.1.0",
     "loader-utils": "^1.2.3",

packages/kbn-ui-shared-deps/webpack.config.js

@@ -77,6 +77,25 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
           },
         ],
       },
+      {
+        test: !dev ? /[\\\/]@elastic[\\\/]eui[\\\/].*\.js$/ : () => false,
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              plugins: [
+                [
+                  require.resolve('babel-plugin-transform-react-remove-prop-types'),
+                  {
+                    mode: 'remove',
+                    removeImport: true,
+                  },
+                ],
+              ],
+            },
+          },
+        ],
+      },
     ],
   },
 

src/dev/build/tasks/copy_source_task.ts

@@ -40,7 +40,7 @@ export const CopySource: Task = {
         '!src/dev/**',
         // this is the dev-only entry
         '!src/setup_node_env/index.js',
-        '!**/public/**',
+        '!**/public/**/*.{js,ts,tsx,json}',
         'typings/**',
         'config/kibana.yml',
         'config/node.options',

src/plugins/navigation/public/top_nav_menu/_index.scss

@@ -1,8 +1,3 @@
 .kbnTopNavMenu {
   margin-right: $euiSizeXS;
 }
-
-.kbnTopNavMenu > * > * {
-  // TEMP fix to adjust spacing between EuiHeaderList__list items
-  margin: 0 $euiSizeXS;
-}

src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx

@@ -164,10 +164,6 @@ describe('TopNavMenu', () => {
 
       // menu is rendered outside of the component
       expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(0);
-
-      const buttons = portalTarget.querySelectorAll('button');
-      expect(buttons.length).toBe(menuItems.length + 1); // should be n+1 buttons in mobile for popover button
-      expect(buttons[buttons.length - 1].getAttribute('aria-label')).toBe('Open navigation menu'); // last button should be mobile button
     });
   });
 });

src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx

@@ -88,7 +88,7 @@ export function TopNavMenu(props: TopNavMenuProps): ReactElement | null {
   function renderMenu(className: string): ReactElement | null {
     if (!config || config.length === 0) return null;
     return (
-      <EuiHeaderLinks data-test-subj="top-nav" className={className}>
+      <EuiHeaderLinks data-test-subj="top-nav" gutterSize="xs" className={className}>
         {renderItems()}
       </EuiHeaderLinks>
     );

src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx

@@ -52,7 +52,7 @@ export function TopNavMenuItem(props: TopNavMenuData) {
       {upperFirst(props.label || props.id!)}
     </EuiButton>
   ) : (
-    <EuiHeaderLink size="xs" isActive {...commonButtonProps}>
+    <EuiHeaderLink size="xs" color="primary" {...commonButtonProps}>
       {upperFirst(props.label || props.id!)}
     </EuiHeaderLink>
   );

src/plugins/share/public/types.ts

@@ -18,7 +18,8 @@
  */
 
 import { ComponentType } from 'react';
-import { EuiContextMenuPanelDescriptor, EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
+import { EuiContextMenuPanelDescriptor } from '@elastic/eui';
+import { EuiContextMenuPanelItemDescriptorEntry } from '@elastic/eui/src/components/context_menu/context_menu';
 
 /**
  * @public
@@ -53,7 +54,8 @@ export interface ShareContext {
  * used to order the individual items in a flat list returned by all registered
  * menu providers.
  * */
-export interface ShareContextMenuPanelItem extends Omit<EuiContextMenuPanelItemDescriptor, 'name'> {
+export interface ShareContextMenuPanelItem
+  extends Omit<EuiContextMenuPanelItemDescriptorEntry, 'name'> {
   name: string; // EUI will accept a `ReactNode` for the `name` prop, but `ShareContentMenu` assumes a `string`.
   sortOrder?: number;
 }

test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json

@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",

test/plugin_functional/plugins/kbn_sample_panel_action/package.json

@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"
   }

test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json

@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"

x-pack/README.md

@@ -55,7 +55,7 @@ yarn test:mocha
 
 For more info, see [the Elastic functional test development guide](https://www.elastic.co/guide/en/kibana/current/development-functional-tests.html).
 
-The functional UI tests, the API integration tests, and the SAML API integration tests are all run against a live browser, Kibana, and Elasticsearch install. Each set of tests is specified with a unique config that describes how to start the Elasticsearch server, the Kibana server, and what tests to run against them. The sets of tests that exist today are *functional UI tests* ([specified by this config](test/functional/config.js)), *API integration tests* ([specified by this config](test/api_integration/config.ts)), and *SAML API integration tests* ([specified by this config](test/saml_api_integration/config.ts)).
+The functional UI tests, the API integration tests, and the SAML API integration tests are all run against a live browser, Kibana, and Elasticsearch install. Each set of tests is specified with a unique config that describes how to start the Elasticsearch server, the Kibana server, and what tests to run against them. The sets of tests that exist today are *functional UI tests* ([specified by this config](test/functional/config.js)), *API integration tests* ([specified by this config](test/api_integration/config.ts)), and *SAML API integration tests* ([specified by this config](test/security_api_integration/saml.config.ts)).
 
 The script runs all sets of tests sequentially like so:
 * builds Elasticsearch and X-Pack
@@ -108,7 +108,7 @@ node scripts/functional_tests --config test/api_integration/config
 We also have SAML API integration tests which set up Elasticsearch and Kibana with SAML support. Run _only_ API integration tests with SAML enabled like so:
 
 ```sh
-node scripts/functional_tests --config test/saml_api_integration/config
+node scripts/functional_tests --config test/security_api_integration/saml.config
 ```
 
 #### Running Jest integration tests

x-pack/package.json

@@ -275,7 +275,7 @@
     "@babel/runtime": "^7.11.2",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.10.0",
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",

x-pack/plugins/apm/public/application/application.test.tsx

@@ -42,6 +42,13 @@ describe('renderApp', () => {
       licensing: { license$: new Observable() },
       triggers_actions_ui: { actionTypeRegistry: {}, alertTypeRegistry: {} },
       usageCollection: { reportUiStats: () => {} },
+      data: {
+        query: {
+          timefilter: {
+            timefilter: { setTime: () => {}, getTime: () => ({}) },
+          },
+        },
+      },
     };
     const params = {
       element: document.createElement('div'),