Merge branch '7.x' into backport/7.x/pr-101461

elastic · Jun 8, 2021 · 2a3aaac · 2a3aaac
2 parents 7d1c2fe + b89ff20
commit 2a3aaac
Show file tree

Hide file tree

Showing 635 changed files with 37,248 additions and 21,709 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,7 +63,7 @@ npm-debug.log*
 .vagrant
 
 ## @cypress/snapshot from apm plugin
-snapshots.js
+/snapshots.js
 
 # release notes script output
 report.csv

diff --git a/package.json b/package.json
@@ -746,6 +746,7 @@
     "jest-cli": "^26.6.3",
     "jest-diff": "^26.6.2",
     "jest-environment-jsdom": "^26.6.2",
+    "jest-environment-jsdom-thirteen": "^1.0.1",
     "jest-raw-loader": "^1.0.1",
     "jest-silent-reporter": "^0.5.0",
     "jest-snapshot": "^26.6.2",

diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
@@ -48471,7 +48471,7 @@ async function runBazelCommandWithRunner(bazelCommandRunner, bazelArgs, offline
   });
 
   if (offline) {
-    bazelArgs.push('--config=offline');
+    bazelArgs = [...bazelArgs, '--config=offline'];
   }
 
   const bazelProc = Object(_child_process__WEBPACK_IMPORTED_MODULE_4__["spawn"])(bazelCommandRunner, bazelArgs, bazelOpts);

diff --git a/packages/kbn-pm/src/utils/bazel/run.ts b/packages/kbn-pm/src/utils/bazel/run.ts
@@ -30,7 +30,7 @@ async function runBazelCommandWithRunner(
   };
 
   if (offline) {
-    bazelArgs.push('--config=offline');
+    bazelArgs = [...bazelArgs, '--config=offline'];
   }
 
   const bazelProc = spawn(bazelCommandRunner, bazelArgs, bazelOpts);

diff --git a/packages/kbn-test/src/jest/utils/testbed/types.ts b/packages/kbn-test/src/jest/utils/testbed/types.ts
@@ -121,7 +121,7 @@ export interface TestBed<T = string> {
      *
      * @param switchTestSubject The test subject of the EuiSwitch (can be a nested path. e.g. "myForm.mySwitch").
      */
-    toggleEuiSwitch: (switchTestSubject: T, isChecked?: boolean) => void;
+    toggleEuiSwitch: (switchTestSubject: T) => void;
     /**
      * The EUI ComboBox is a special input as it needs the ENTER key to be pressed
      * in order to register the value set. This helpers automatically does that.

diff --git a/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx b/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx
@@ -6,14 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { dashboardExpandPanelAction } from '../../dashboard_strings';
+import { DashboardContainerInput } from '../..';
 import { IEmbeddable } from '../../services/embeddable';
+import { dashboardExpandPanelAction } from '../../dashboard_strings';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
-import {
-  DASHBOARD_CONTAINER_TYPE,
-  DashboardContainer,
-  DashboardContainerInput,
-} from '../embeddable';
+import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
 
 export const ACTION_EXPAND_PANEL = 'togglePanel';