Merge pull request #25729 from garfty/master

Glue - Fixed compose return type
This commit is contained in:
Ron Buckton
2018-05-14 16:53:19 -07:00
committed by GitHub
2 changed files with 4 additions and 3 deletions

View File

@@ -7,8 +7,9 @@ const manifest: Glue.Manifest = {
},
register: {
plugins: [
"./test-plugin.js",
{
plugin: "./test",
plugin: "./test.js",
routes: {
prefix: "test"
}

View File

@@ -24,8 +24,8 @@ export interface Plugin {
export interface Manifest {
server: ServerOptions;
register?: {
plugins: string[] | Plugin[]
plugins: string[] | Plugin[] | Array<(string|Plugin)>
};
}
export function compose(manifest: Manifest, options?: Options): Server;
export function compose(manifest: Manifest, options?: Options): Promise<Server>;