@rxdi/hapi 0.7.168 → 0.7.170-next-0

package/dist/hapi.module.config.d.ts

@@ -1,14 +1,14 @@
 import { InjectionToken } from "@rxdi/core";
-import { PluginNameVersion, PluginBase, PluginPackage, ServerOptions, ServerRoute } from 'hapi';
+import { PluginNameVersion, PluginBase, PluginPackage, ServerOptions, ServerRoute } from '@hapi/hapi';
 export declare class HapiConfigModel {
     randomPort?: boolean;
     staticConfig?: ServerRoute | ServerRoute[];
     hapi?: ServerOptions;
-    plugins?: Array<PluginBase<any> & (PluginNameVersion | PluginPackage)>;
+    plugins?: Array<PluginBase<any, any> & (PluginNameVersion | PluginPackage)>;
 }
 export declare const HAPI_CONFIG: InjectionToken<HapiConfigModel>;
 export declare const HAPI_SERVER: InjectionToken<any>;
-export declare const HAPI_PLUGINS: InjectionToken<(PluginBase<any> & (PluginNameVersion | PluginPackage))[]>;
+export declare const HAPI_PLUGINS: InjectionToken<(PluginBase<any, any> & (PluginNameVersion | PluginPackage))[]>;
 export declare const Route: ({ method, path }: {
     path: string;
     method: string;

package/dist/main.js

@@ -18,7 +18,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 var HapiModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HapiModule = void 0;
-const hapi_1 = require("hapi");
+const hapi_1 = require("@hapi/hapi");
 const hapi_plugin_1 = require("./plugins/hapi.plugin");
 const server_service_1 = require("./services/server/server.service");
 const core_1 = require("@rxdi/core");

package/dist/plugins/inert/inert.plugin.d.ts

@@ -1,5 +1,5 @@
 import { HapiConfigModel } from "../../hapi.module.config";
-import { Server } from "hapi";
+import { Server } from "@hapi/hapi";
 export declare class InertPlugin {
     private server;
     private config;

package/dist/plugins/inert/inert.plugin.js

@@ -24,8 +24,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InertPlugin = void 0;
 const core_1 = require("@rxdi/core");
 const hapi_module_config_1 = require("../../hapi.module.config");
-const hapi_1 = require("hapi");
-const inert = require("inert");
+const hapi_1 = require("@hapi/hapi");
+const inert = require("@hapi/inert");
 let InertPlugin = class InertPlugin {
     constructor(server, config) {
         this.server = server;

package/dist/services/open/open.service.d.ts

@@ -1,4 +1,4 @@
-import { Server } from "hapi";
+import { Server } from "@hapi/hapi";
 export declare class OpenService {
     private server;
     constructor(server: Server);

package/dist/services/open/open.service.js

@@ -25,7 +25,7 @@ exports.OpenService = void 0;
 const core_1 = require("@rxdi/core");
 const open = require("opn");
 const hapi_module_config_1 = require("../../hapi.module.config");
-const hapi_1 = require("hapi");
+const hapi_1 = require("@hapi/hapi");
 let OpenService = class OpenService {
     constructor(server) {
         this.server = server;

package/dist/services/server/server.service.d.ts

@@ -1,6 +1,6 @@
 import { BootstrapLogger, ExitHandlerService } from "@rxdi/core";
-import { Server, PluginBase, PluginNameVersion, PluginPackage } from "hapi";
-export declare type PluginType<T> = (PluginBase<T> & (PluginNameVersion | PluginPackage))[];
+import { Server, PluginBase, PluginNameVersion, PluginPackage } from "@hapi/hapi";
+export declare type PluginType<T> = (PluginBase<T, any> & (PluginNameVersion | PluginPackage))[];
 export declare class ServerService {
     private server;
     private plugins;
@@ -8,5 +8,5 @@ export declare class ServerService {
     private exitHandler;
     constructor(server: Server, plugins: PluginType<any>, logger: BootstrapLogger, exitHandler: ExitHandlerService);
     start(): Promise<void>;
-    registerPlugins<T>(plugins: PluginType<T>): Promise<void[]>;
+    registerPlugins<T>(plugins: PluginType<T>): Promise<any[]>;
 }

package/dist/services/server/server.service.js

@@ -24,7 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerService = void 0;
 const core_1 = require("@rxdi/core");
 const hapi_module_config_1 = require("../../hapi.module.config");
-const hapi_1 = require("hapi");
+const hapi_1 = require("@hapi/hapi");
 let ServerService = class ServerService {
     constructor(server, plugins, logger, exitHandler) {
         this.server = server;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdi/hapi",
-  "version": "0.7.168",
+  "version": "0.7.170-next-0",
   "repository": {
     "type": "git",
     "url": "https://github.com/rxdi/hapi"
@@ -28,14 +28,13 @@
   "module": "./dist/main.js",
   "typings": "./dist/main.d.ts",
   "dependencies": {
-    "hapi": "^18.1.0",
-    "inert": "^5.1.3",
+    "@hapi/hapi": "^21.3.2",
+    "@hapi/inert": "^7.1.0",
     "opn": "^6.0.0"
   },
   "devDependencies": {
-    "@rxdi/core": "^0.7.167",
-    "@types/hapi": "^18.0.4",
+    "@rxdi/core": "^0.7.170",
     "@types/node": "^12.0.10",
     "typescript": "^4.3.5"
   }
-}
+}