Merge pull request #8164 from flcdrg/express-static

Remove circular dependency
This commit is contained in:
Jason Jarrett
2016-03-14 18:57:30 -07:00
5 changed files with 1100 additions and 1058 deletions

View File

@@ -0,0 +1,5 @@
/// <reference path="express-serve-static-core.d.ts" />
import * as express from 'express-serve-static-core';
// null test file - everything should be tested from express.d.ts and serve-static.d.ts

File diff suppressed because it is too large Load Diff

1085
express/express.d.ts vendored

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,5 @@
/// <reference path="serve-static.d.ts" />
/// <reference path="../express/express.d.ts" />
import * as express from 'express';
import * as serveStatic from 'serve-static';

View File

@@ -10,11 +10,11 @@
=============================================== */
/// <reference path="../express/express.d.ts" />
/// <reference path="../express-serve-static-core/express-serve-static-core.d.ts" />
/// <reference path="../mime/mime.d.ts" />
declare module "serve-static" {
import * as express from "express";
import * as express from "express-serve-static-core";
/**
* Create a new middleware function to serve files from within a given root directory.