diff --git a/express/express-tests.ts b/express/express-tests.ts index 76fa4da0d7..22ae73e72f 100644 --- a/express/express-tests.ts +++ b/express/express-tests.ts @@ -6,6 +6,9 @@ var app = express(); app.engine('jade', require('jade').__express); app.engine('html', require('ejs').renderFile); +express.static.mime.define({ + 'application/fx': ['fx'] +}); app.use('/static', express.static(__dirname + '/public')); // simple logger diff --git a/express/express.d.ts b/express/express.d.ts index 0bd42b82f6..f6e6928614 100644 --- a/express/express.d.ts +++ b/express/express.d.ts @@ -11,6 +11,7 @@ =============================================== */ /// +/// declare module Express { @@ -24,6 +25,7 @@ declare module Express { declare module "express" { import http = require('http'); + import serveStatic = require('serve-static'); function e(): e.Express; @@ -1067,31 +1069,7 @@ declare module "express" { response: Response; } - /** - * Static: - * - * Static file server with the given `root` path. - * - * Examples: - * - * var oneDay = 86400000; - * - * connect() - * .use(connect.static(__dirname + '/public')) - * - * connect() - * .use(connect.static(__dirname + '/public', { maxAge: oneDay })) - * - * Options: - * - * - `maxAge` Browser cache maxAge in milliseconds. defaults to 0 - * - `hidden` Allow transfer of hidden files. defaults to false - * - `redirect` Redirect to trailing "/" when the pathname is a dir. defaults to true - * - * @param root - * @param options - */ - function static(root: string, options?: any): RequestHandler; + var static: typeof serveStatic; } export = e;