Speculative fix for #565 (#566)

* Speculative fix for #565 * Added 2.4.1 to the build matrix * Added 2.4.1 to the build matrix * Update CHANGELOG.md
TypeStrong · Jun 28, 2017 · b24d350 · b24d350
1 parent 91a7edb
commit b24d350
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,4 +17,5 @@ env:
   - [email protected]
   - [email protected]
   - [email protected]
+  - [email protected]
 #  - TYPESCRIPT=typescript@next
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## v2.2.1 - NOT RELEASED YET
 
 - [Report errors in JS(X) files when CheckJS is enabled](https://github.com/TypeStrong/ts-loader/pull/564) - thanks @schmuli!
+- [Cater for change to @types acquisition strategy in TypeScript 2.4.1](https://github.com/TypeStrong/ts-loader/pull/566) - thanks @johnnyreilly
 
 ## v2.2.0
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,6 +8,7 @@ environment:
   - TYPESCRIPT: [email protected]
   - TYPESCRIPT: [email protected]
   - TYPESCRIPT: [email protected]
+  - TYPESCRIPT: [email protected]
 #  - TYPESCRIPT: typescript@next
 install:
   - ps: Install-Product node $env:nodejs_version

diff --git a/src/servicesHost.ts b/src/servicesHost.ts
@@ -63,6 +63,12 @@ function makeServicesHost(
          * For @types expansion, these two functions are needed.
          */
         directoryExists: compiler.sys ? (<any> compiler.sys).directoryExists : undefined,
+
+        // The following three methods are necessary for @types resolution from TS 2.4.1 onwards see: https://github.com/Microsoft/TypeScript/issues/16772
+        fileExists: moduleResolutionHost.fileExists,
+        readFile: moduleResolutionHost.readFile,
+        readDirectory: compiler.sys ? (<any> compiler.sys).readDirectory : undefined,
+
         getCurrentDirectory: () => process.cwd(),
 
         getCompilationSettings: () => compilerOptions,