Merge branch 'jsModuleSearchDepth' of https://github.com/Microsoft/TypeScript into jsModuleSearchDepth

billti · billti · commit ace9d3e39d90 · 2016-02-08T20:08:51.000-08:00
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2683,6 +2683,7 @@ namespace ts {
          * - don't use tripleslash references
          */
         isExternalLibraryImport?: boolean;
+        isJsFileFromNodeSearch?: boolean;
     }
 
     export interface ResolvedModuleWithFailedLookupLocations {

Original file line number	Diff line number	Diff line change
`@@ -2683,6 +2683,7 @@ namespace ts {`
`2683`	`2683`	`* - don't use tripleslash references`
`2684`	`2684`	`*/`
`2685`	`2685`	`isExternalLibraryImport?: boolean;`
	`2686`	`+ isJsFileFromNodeSearch?: boolean;`
`2686`	`2687`	`}`
`2687`	`2688`
`2688`	`2689`	`export interface ResolvedModuleWithFailedLookupLocations {`