Merge branch '6.8' into bump-node

Author: watson

package.json

@@ -98,6 +98,7 @@
     "**/grunt-legacy-log-utils/lodash": "^4.17.21",
     "**/grunt-legacy-util/lodash": "^4.17.21",
     "**/grunt/js-yaml": "^3.13.1",
+    "**/@elastic/eui/highlight.js": "^9.18.5",
     "**/isomorphic-fetch/node-fetch": "^2.6.1",
     "**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
     "**/load-grunt-config/js-yaml": "^3.13.1",
@@ -126,20 +127,20 @@
     ]
   },
   "dependencies": {
+    "@commercial/boom": "^7.4.12",
+    "@commercial/hapi": "^17.9.4",
+    "@commercial/hoek": "^6.2.5",
+    "@commercial/podium": "^3.4.3",
     "@elastic/datemath": "5.0.2",
     "@elastic/eui": "6.10.9",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.2",
     "@elastic/ui-ace": "0.2.3",
-    "@hapi/boom": "^7.4.11",
     "@hapi/good-squeeze": "^6.0.0",
     "@hapi/h2o2": "^8.3.2",
-    "@hapi/hapi": "^17.9.0",
-    "@hapi/hoek": "^6.2.4",
     "@hapi/inert": "^5.2.2",
     "@hapi/oppsy": "^2.1.2",
-    "@hapi/podium": "^3.4.3",
     "@hapi/vision": "^5.5.4",
     "@hapi/wreck": "^16.0.1",
     "@kbn/babel-code-parser": "1.0.0",
@@ -300,6 +301,10 @@
     "@types/bluebird": "^3.1.1",
     "@types/chance": "^1.0.0",
     "@types/classnames": "^2.2.3",
+    "@types/commercial__boom": "npm:@types/hapi__boom@^7.4.1",
+    "@types/commercial__hapi": "npm:@types/[email protected]",
+    "@types/commercial__hoek": "npm:@types/hapi__hoek@^6.2.0",
+    "@types/commercial__podium": "npm:@types/hapi__podium@^3.4.1",
     "@types/d3": "^3.5.41",
     "@types/dedent": "^0.7.0",
     "@types/del": "^3.0.1",
@@ -313,10 +318,6 @@
     "@types/glob": "^5.0.35",
     "@types/globby": "^8.0.0",
     "@types/graphql": "^0.13.1",
-    "@types/hapi__boom": "^7.4.1",
-    "@types/hapi__hapi": "npm:@types/[email protected]",
-    "@types/hapi__hoek": "^6.2.0",
-    "@types/hapi__podium": "^3.4.1",
     "@types/has-ansi": "^3.0.0",
     "@types/humps": "^1.1.2",
     "@types/jest": "^23.3.1",

packages/kbn-ui-framework/package.json

@@ -46,7 +46,7 @@
     "grunt-babel": "^7.0.0",
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-copy": "^1.0.0",
-    "highlight.js": "9.0.0",
+    "highlight.js": "^9.18.5",
     "html": "1.0.0",
     "html-loader": "^0.5.5",
     "imports-loader": "^0.8.0",

src/core/server/http/base_path_proxy_server.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Server } from '@hapi/hapi';
+import { Server } from '@commercial/hapi';
 import { ByteSizeValue } from '@kbn/config-schema';
 import { Agent as HttpsAgent, ServerOptions as TlsOptions } from 'https';
 import { sample } from 'lodash';

src/core/server/http/http_server.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Server, ServerOptions } from '@hapi/hapi';
+import { Server, ServerOptions } from '@commercial/hapi';
 
 import { modifyUrl } from '../../utils';
 import { Logger } from '../logging';

src/core/server/http/http_tools.test.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Request, ResponseToolkit } from '@hapi/hapi';
+import { Request, ResponseToolkit } from '@commercial/hapi';
 import Joi from 'joi';
 import { defaultValidationErrorHandler, HapiValidationError } from './http_tools';
 

src/core/server/http/http_tools.ts

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, Util } from '@hapi/hapi';
-import Hoek from '@hapi/hoek';
+import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, Util } from '@commercial/hapi';
+import Hoek from '@commercial/hoek';
 import { readFileSync } from 'fs';
 import { ServerOptions as TLSOptions } from 'https';
 import { ValidationError } from 'joi';

src/core/server/http/https_redirect_server.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Request, ResponseToolkit, Server } from '@hapi/hapi';
+import { Request, ResponseToolkit, Server } from '@commercial/hapi';
 import { format as formatUrl } from 'url';
 
 import { Logger } from '../logging';

src/core/server/http/router/request.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Request } from '@hapi/hapi';
+import { Request } from '@commercial/hapi';
 import { ObjectType, TypeOf } from '@kbn/config-schema';
 
 import { filterHeaders, Headers } from './headers';

src/core/server/http/router/router.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Request, ResponseObject, ResponseToolkit } from '@hapi/hapi';
+import { Request, ResponseObject, ResponseToolkit } from '@commercial/hapi';
 import { ObjectType, schema, TypeOf } from '@kbn/config-schema';
 
 import { KibanaRequest } from './request';

src/core/server/legacy_compat/legacy_service.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Server as HapiServer } from '@hapi/hapi';
+import { Server as HapiServer } from '@commercial/hapi';
 import { combineLatest, ConnectableObservable, EMPTY, Subscription } from 'rxjs';
 import { first, map, mergeMap, publishReplay, tap } from 'rxjs/operators';
 import { CoreContext, CoreService } from '../../types';