Use platform types vs our own. Hook up NP via kbnServer.newPlatform.

x-pack/legacy/plugins/integrations_manager/common/types.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { Request, Server, ServerRoute } from 'hapi';
+export { Request, ServerRoute } from 'hapi';
 
 // the contract with the registry
 export type IntegrationList = IntegrationListItem[];

x-pack/legacy/plugins/integrations_manager/index.ts

@@ -7,9 +7,9 @@
 import { i18n } from '@kbn/i18n';
 import { resolve } from 'path';
 import { LegacyPluginInitializer, LegacyPluginOptions } from 'src/legacy/types';
+import KbnServer, { Server } from 'src/legacy/server/kbn_server';
 import { Feature } from '../xpack_main/server/lib/feature_registry';
 import { PLUGIN_ID } from './common/constants';
-import { Server } from './common/types';
 import manifest from './kibana.json';
 import { CoreSetup, Plugin as ServerPlugin, PluginInitializerContext } from './server/plugin';
 import { mappings, savedObjectSchemas } from './server/saved_objects';
@@ -75,12 +75,13 @@ const pluginOptions: LegacyPluginOptions = {
   init(server: Server) {
     server.plugins.xpack_main.registerFeature(feature);
 
-    const coreSetup: CoreSetup = {
-      http: {
-        route: server.route.bind(server),
-      },
-    };
+    // convert hapi instance to KbnServer
+    // `kbnServer.server` is the same hapi instance
+    // `kbnServer.newPlatform` has important values
+    const kbnServer = (server as unknown) as KbnServer;
     const initializerContext: PluginInitializerContext = {};
+    const coreSetup: CoreSetup = kbnServer.newPlatform.setup.core;
+
     new ServerPlugin(initializerContext).setup(coreSetup);
   },
   postInit: undefined,

x-pack/legacy/plugins/integrations_manager/public/index.ts

@@ -8,8 +8,8 @@ import 'ui/autoload/all';
 import 'ui/autoload/styles';
 import chrome from 'ui/chrome';
 import { npSetup, npStart } from 'ui/new_platform';
-import { Plugin, PluginInitializerContext, PluginStart } from './plugin';
 import { PLUGIN_ID } from '../common/constants';
+import { Plugin, PluginInitializerContext, PluginStart } from './plugin';
 
 const REACT_APP_ROOT_ID = `react-${PLUGIN_ID}-root`;
 const template = `<div id="${REACT_APP_ROOT_ID}" class="integrationsManagerReactRoot"></div>`;

x-pack/legacy/plugins/integrations_manager/server/plugin.ts

@@ -4,21 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ServerRoute } from '../common/types';
+import { HttpServiceSetup, CoreStart } from 'src/core/server';
 import { fetchList } from './registry';
 import { routes } from './routes';
 
 export interface CoreSetup {
   http: HttpServiceSetup;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface CoreStart {}
-
-export interface HttpServiceSetup {
-  route(route: ServerRoute | ServerRoute[]): void;
-}
-
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface PluginInitializerContext {}
 
@@ -28,11 +21,12 @@ export type PluginStart = ReturnType<Plugin['start']>;
 export class Plugin {
   constructor(initializerContext: PluginInitializerContext) {}
   public setup(core: CoreSetup) {
-    const { route } = core.http;
+    const { server } = core.http;
 
     // map routes to handlers
-    routes.forEach(route);
+    routes.forEach(route => server.route(route));
 
+    // the JS API for other consumers
     return {
       getList: fetchList,
     };