Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug when "extend"ing a tsconfig that specifies "allowJs" #415

Merged
merged 2 commits into from
Dec 14, 2016
+2 −2
Merged

Fix bug when "extend"ing a tsconfig that specifies "allowJs" #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d2242
Fixes spelling error in README
cspotcode Dec 14, 2016
ae0ab04
Fixes bug when "allowJs" is specified in "extend"ed tsconfig
cspotcode Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/instances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down