Merge branch 'master' of github.com:elastic/kibana into implement/abs…

…olute-test-archive-paths

package.json

@@ -118,7 +118,7 @@
     "@hapi/boom": "^9.1.1",
     "@hapi/cookie": "^11.0.2",
     "@hapi/good-squeeze": "6.0.0",
-    "@hapi/h2o2": "^9.0.2",
+    "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.0.3",
     "@hapi/hoek": "^9.1.1",
     "@hapi/inert": "^6.0.3",
@@ -198,7 +198,7 @@
     "broadcast-channel": "^3.0.3",
     "chalk": "^4.1.0",
     "check-disk-space": "^2.1.0",
-    "cheerio": "0.22.0",
+    "cheerio": "^1.0.0-rc.9",
     "chokidar": "^3.4.3",
     "chroma-js": "^1.4.1",
     "classnames": "2.2.6",
@@ -501,7 +501,6 @@
     "@types/base64-js": "^1.2.5",
     "@types/bluebird": "^3.1.1",
     "@types/chance": "^1.0.0",
-    "@types/cheerio": "^0.22.28",
     "@types/chroma-js": "^1.4.2",
     "@types/chromedriver": "^81.0.0",
     "@types/classnames": "^2.2.9",

packages/kbn-cli-dev-mode/src/base_path_proxy_server.test.ts

@@ -185,6 +185,45 @@ describe('BasePathProxyServer', () => {
       });
   });
 
+  test('forwards request cancellation', async () => {
+    let propagated = false;
+
+    let notifyRequestReceived: () => void;
+    const requestReceived = new Promise<void>((resolve) => {
+      notifyRequestReceived = resolve;
+    });
+
+    let notifyRequestAborted: () => void;
+    const requestAborted = new Promise<void>((resolve) => {
+      notifyRequestAborted = resolve;
+    });
+
+    server.route({
+      method: 'GET',
+      path: `${basePath}/foo/{test}`,
+      handler: async (request, h) => {
+        notifyRequestReceived();
+
+        request.raw.req.once('aborted', () => {
+          notifyRequestAborted();
+          propagated = true;
+        });
+        return await new Promise((resolve) => undefined);
+      },
+    });
+    await server.start();
+
+    const request = proxySupertest.get(`${basePath}/foo/some-string`).end();
+
+    await requestReceived;
+
+    request.abort();
+
+    await requestAborted;
+
+    expect(propagated).toEqual(true);
+  });
+
   test('handles putting', async () => {
     server.route({
       method: 'PUT',

packages/kbn-docs-utils/src/api_docs/tests/snapshots/plugin_a.json

@@ -598,7 +598,7 @@
             "section": "def-public.ImAType",
             "text": "ImAType"
           },
-          ", e?: string | undefined) => ",
+          ", e: string | undefined) => ",
           {
             "pluginId": "pluginA",
             "scope": "public",

packages/kbn-pm/dist/index.js

@@ -650,6 +650,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArray", function() { return __spreadArray; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
@@ -683,6 +684,8 @@ var extendStatics = function(d, b) {
 };
 
 function __extends(d, b) {
+    if (typeof b !== "function" && b !== null)
+        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
     extendStatics(d, b);
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -805,19 +808,27 @@ function __read(o, n) {
     return ar;
 }
 
+/** @deprecated */
 function __spread() {
     for (var ar = [], i = 0; i < arguments.length; i++)
         ar = ar.concat(__read(arguments[i]));
     return ar;
 }
 
+/** @deprecated */
 function __spreadArrays() {
     for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
     for (var r = Array(s), k = 0, i = 0; i < il; i++)
         for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
             r[k] = a[j];
     return r;
-};
+}
+
+function __spreadArray(to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+}
 
 function __await(v) {
     return this instanceof __await ? (this.v = v, this) : new __await(v);
@@ -872,19 +883,17 @@ function __importDefault(mod) {
     return (mod && mod.__esModule) ? mod : { default: mod };
 }
 
-function __classPrivateFieldGet(receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return privateMap.get(receiver);
+function __classPrivateFieldGet(receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 }
 
-function __classPrivateFieldSet(receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to set private field on non-instance");
-    }
-    privateMap.set(receiver, value);
-    return value;
+function __classPrivateFieldSet(receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 }
 
 

src/core/public/styles/_base.scss

@@ -28,3 +28,9 @@
 .euiBody--collapsibleNavIsDocked .euiBottomBar {
   margin-left: $euiCollapsibleNavWidth;
 }
+
+// Temporary fix for EuiPageHeader with a bottom border but no tabs or padding
+// Will fix in EUI -- @cchaos
+.euiPageHeader--bottomBorder:not(.euiPageHeader--tabsAtBottom):not([class*='euiPageHeader--padding']) {
+  padding-bottom: $euiSizeL;
+}

src/plugins/advanced_settings/public/management_app/advanced_settings.tsx

@@ -269,6 +269,7 @@ export class AdvancedSettings extends Component<AdvancedSettingsProps, AdvancedS
           dockLinks={this.props.dockLinks}
           toasts={this.props.toasts}
           trackUiMetric={this.props.trackUiMetric}
+          queryText={query.text}
         />
         <PageFooter
           toasts={this.props.toasts}