From 2eecb30774e4b92855e3f2f8487a79f4b8998d63 Mon Sep 17 00:00:00 2001 From: "Igor N. Dultsev" Date: Sat, 9 Jan 2016 18:40:21 +0600 Subject: [PATCH 1/3] fixed module export type from Exphbs to ExpressHandleBars Since it is now working this way --- express-handlebars/express-handlebars.d.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/express-handlebars/express-handlebars.d.ts b/express-handlebars/express-handlebars.d.ts index 04eb07162..70137e1d3 100644 --- a/express-handlebars/express-handlebars.d.ts +++ b/express-handlebars/express-handlebars.d.ts @@ -1,6 +1,7 @@ // Type definitions for express-handlebars // Project: https://github.com/ericf/express-handlebars // Definitions by: Sam Saint-Pettersen +// Updated by: Igor Dultsev // Definitions: https://github.com/borisyankov/DefinitelyTyped /// @@ -40,7 +41,12 @@ interface Exphbs { renderView(viewPath: string, optionsOrCallback: any, callback?: () => string): void; } +interface ExpressHandlebars { + (options?: ExphbsOptions): Function; + create (options?: ExphbsOptions): Exphbs; +} + declare module "express-handlebars" { - var exphbs: Exphbs; + var exphbs: ExpressHandlebars; export = exphbs; } From abd3d655962a537a8369e7a9b81956cc39127584 Mon Sep 17 00:00:00 2001 From: "Igor N. Dultsev" Date: Sat, 9 Jan 2016 18:40:38 +0600 Subject: [PATCH 2/3] updated test to reflect changes in typing file --- express-handlebars/express-handlebars-tests.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/express-handlebars/express-handlebars-tests.ts b/express-handlebars/express-handlebars-tests.ts index 3fa6ef31d..982ff2367 100644 --- a/express-handlebars/express-handlebars-tests.ts +++ b/express-handlebars/express-handlebars-tests.ts @@ -6,9 +6,8 @@ import express = require('express'); import exphbs = require('express-handlebars'); var app = express(); -var hbs: Exphbs = exphbs.create({defaultLayout: 'main'}); -app.engine('handlebars', hbs.engine); +app.engine('handlebars', exphbs({defaultLayout: 'main'})); app.set('view engine', 'handlebars'); app.listen(1337); From 2c157f229f62f851b9fa116f8a11d364ba29a97a Mon Sep 17 00:00:00 2001 From: "Igor N. Dultsev" Date: Sat, 9 Jan 2016 18:50:38 +0600 Subject: [PATCH 3/3] Fix header --- express-handlebars/express-handlebars.d.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/express-handlebars/express-handlebars.d.ts b/express-handlebars/express-handlebars.d.ts index 70137e1d3..1f24f5ea4 100644 --- a/express-handlebars/express-handlebars.d.ts +++ b/express-handlebars/express-handlebars.d.ts @@ -1,7 +1,6 @@ // Type definitions for express-handlebars // Project: https://github.com/ericf/express-handlebars -// Definitions by: Sam Saint-Pettersen -// Updated by: Igor Dultsev +// Definitions by: Sam Saint-Pettersen , Igor Dultsev // Definitions: https://github.com/borisyankov/DefinitelyTyped ///