Skip to content

Commit 7b15180

Browse files
authored
Merge pull request #344 from misantronic/master
fix: add startDir to if-clause Closes #343
2 parents d33d311 + 4d32d51 commit 7b15180

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Chris Sauve <chrismsauve@gmail.com>
1313
Christian Linne <ShadowVampire@web.de>
1414
Christian Rackerseder <git@echooff.de>
1515
Daniel Perez Alvarez <unindented@gmail.com>
16+
David Schkalee <david.schkalee@magicline.de>
1617
David Sheldrick <djsheldrick@gmail.com>
1718
Emil Persson <emil.n.persson@gmail.com>
1819
Eric Anderson <e@ericlanderson.com>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ts-jest",
3-
"version": "21.1.1",
3+
"version": "21.1.2",
44
"main": "index.js",
55
"types": "./dist/index.d.ts",
66
"description": "A preprocessor with sourcemap support to help use Typescript with Jest",

src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export function getTSConfig(globals, collectCoverage: boolean = false) {
204204

205205
config = readCompilerOptions(configPath);
206206

207-
if (configFileName === 'tsconfig.json') {
207+
if (configFileName === path.join(getStartDir(), 'tsconfig.json')) {
208208
// hardcode module to 'commonjs' in case the config is being loaded
209209
// from the default tsconfig file. This is to ensure that coverage
210210
// works well. If there's a need to override, it can be done using

0 commit comments

Comments
 (0)