Merge pull request #24502 from garfty/master

Glue: Moved typings to types folder

glue/index.d.ts

@@ -1,35 +0,0 @@
-// Type definitions for glue
-// Project: https://github.com/hapijs/glue
-// Definitions by: Gareth Parker
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.7
-
-declare module "glue" {
-  
-  import { Server, ServerOptions } from "hapi";
-
-  export interface Options {
-    relativeTo: string;
-    preConnections?: (Server:Server, next:(err:any)=>void ) => void;
-    preRegister?: (Server:Server, next:(err:any)=>void ) => void;
-  }
-  
-  interface Plugin {
-    plugin: string | {
-        register:string;
-        options?:any;
-    };
-    options?: any;
-    routes?: any
-  }
-  
-  interface Manifest {
-    server: ServerOptions;
-    register?: {
-      plugins: Array<Plugin>
-    }
-  }
-  
-  export function compose(manifest: Manifest, options?: Options): Server;
-
-}

types/glue/glue-tests.ts

@@ -15,6 +15,6 @@ const manifest: Glue.Manifest = {
       }
     ]
   }
-}
+};
 
-Glue.compose(manifest);
+Glue.compose(manifest);

types/glue/index.d.ts

@@ -0,0 +1,31 @@
+// Type definitions for glue 5.0
+// Project: https://github.com/hapijs/glue
+// Definitions by: Gareth Parker <https://github.com/garfty>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Server, ServerOptions } from "hapi";
+
+export interface Options {
+  relativeTo: string;
+  preConnections?: (Server: Server, next: (err: any) => void) => void;
+  preRegister?: (Server: Server, next: (err: any) => void) => void;
+}
+
+export interface Plugin {
+  plugin: string | {
+      register: string;
+      options?: any;
+  };
+  options?: any;
+  routes?: any;
+}
+
+export interface Manifest {
+  server: ServerOptions;
+  register?: {
+    plugins: Plugin[]
+  };
+}
+
+export function compose(manifest: Manifest, options?: Options): Server;

types/glue/tsconfig.json

@@ -21,6 +21,6 @@
   },
   "files": [
     "index.d.ts",
-    "hapi-glue-test.ts"
+    "glue-tests.ts"
   ]
 }