From e4d22423e84d2838633369e07ec56766bf414558 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Wed, 14 Dec 2016 02:23:41 -0500 Subject: [PATCH 1/2] Fixes spelling error in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84da29ab7..9a8a0b6fa 100644 --- 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 From ae0ab04b0fc5b980b081d76db1db064d9af1cc18 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Wed, 14 Dec 2016 02:24:28 -0500 Subject: [PATCH 2/2] Fixes bug when "allowJs" is specified in "extend"ed tsconfig --- src/instances.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/instances.ts b/src/instances.ts index 0ae03f950..7929a45cd 100644 --- 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;