From 94ce78cb0106d45d3bfe2824be1721146cc754f8 Mon Sep 17 00:00:00 2001 From: Isman Usoh Date: Tue, 12 Apr 2016 21:17:59 +0700 Subject: [PATCH] declare namespace ExpressUseragent (#8918) * declare namespace ExpressUseragent - declare namespace ExpressUseragent - fix error Import declaration conflicts with local declaration of 'express' * Update express-useragent.d.ts * Update express-useragent.d.ts --- express-useragent/express-useragent.d.ts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/express-useragent/express-useragent.d.ts b/express-useragent/express-useragent.d.ts index 4ea3d91d73..ddf8fdf13f 100644 --- a/express-useragent/express-useragent.d.ts +++ b/express-useragent/express-useragent.d.ts @@ -6,7 +6,16 @@ /// declare namespace Express { - interface ExpressUserAgent { + + interface Request { + useragent?: ExpressUseragent.UserAgent; + } +} + +declare namespace ExpressUseragent { + import express = Express; + + interface UserAgent { isMobile: boolean; isTablet: boolean; isiPad: boolean; @@ -55,14 +64,10 @@ declare namespace Express { source: string; } - interface Request { - useragent?: ExpressUserAgent; - } + function parse(source: string): UserAgent; + function express(): (req: express.Request, res: express.Response, next?: Function) => void; } declare module "express-useragent" { - import express = require("express"); - - export function parse(source: string): Express.ExpressUserAgent; - export function express(): (req: express.Request, res: express.Response, next?: Function) => void; + export = ExpressUseragent; }