Merge pull request #415 from cspotcode/feature/fix-tsconfig-extend-al…

…lowjs-bug Fix bug when "extend"ing a tsconfig that specifies "allowJs"
TypeStrong · Dec 14, 2016 · 5bb2a4a · 5bb2a4a
2 parents c3d707c + ae0ab04
commit 5bb2a4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ ts-loader works very well in combination with [babel](https://babeljs.io/) and [
 
 ### Contributing
 
-This is your TypeScript loader! We want you to help make it even better. Please feel free to contribute; see the [contributer's guide](CONTRIBUTING.md) to get started.
+This is your TypeScript loader! We want you to help make it even better. Please feel free to contribute; see the [contributor's guide](CONTRIBUTING.md) to get started.
 
 ### Installation
 

diff --git a/src/instances.ts b/src/instances.ts
@@ -89,7 +89,7 @@ export function ensureTypeScriptInstance(
     }
 
     // if allowJs is set then we should accept js(x) files
-    const scriptRegex = configFile.config.compilerOptions.allowJs && loaderOptions.entryFileIsJs
+    const scriptRegex = configParseResult.options.allowJs && loaderOptions.entryFileIsJs
         ? /\.tsx?$|\.jsx?$/i
         : /\.tsx?$/i;