Skip to content

Commit 9baa753

Browse files
committed
fix: fixing to pass existing test cases + fixing some tests
1 parent f148a0d commit 9baa753

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/legacy/config/config-set.spec.ts

-2
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,6 @@ describe('_resolveTsConfig', () => {
789789
expect(conf.options.configFilePath).toBeUndefined()
790790
expect(findConfig).not.toHaveBeenCalled()
791791
expect(readConfig.mock.calls[0][0]).toBe('/foo/tsconfig.bar.json')
792-
expect(parseConfig).not.toHaveBeenCalled()
793792
})
794793
})
795794

@@ -917,7 +916,6 @@ describe('_resolveTsConfig', () => {
917916

918917
const conf = cs.parsedTsConfig
919918
expect(conf.options.path).toBe(tscfgPathStub)
920-
expect(findConfig).not.toHaveBeenCalled()
921919
expect(readConfig.mock.calls[0][0]).toBe(tscfgPathStub)
922920
expect(parseConfig.mock.calls[0][2]).toBe('/foo')
923921
expect(parseConfig.mock.calls[0][4]).toBe(tscfgPathStub)

src/legacy/config/config-set.ts

+8-3
Original file line numberDiff line numberDiff line change
@@ -604,16 +604,21 @@ export class ConfigSet {
604604
? normalizeSlashes(resolvedConfigFile)
605605
: ts.findConfigFile(normalizeSlashes(this.rootDir), ts.sys.fileExists)
606606

607-
return this._findReferenceTsconfig(configFileName)
607+
const newTsconfigFile = this._findReferenceTsconfig(configFileName)
608+
609+
return newTsconfigFile ?? configFileName
608610
}
609611

610612
protected _findReferenceTsconfig(tsconfigFileName?: string): string | undefined {
611613
const ts = this.compilerModule
612614

613615
if (!tsconfigFileName) return
614616

615-
const rawTsconfig = ts.readConfigFile(tsconfigFileName, ts.sys.readFile).config
616-
const parsedTsconfig = this._parseTsconfig(rawTsconfig, dirname(tsconfigFileName), tsconfigFileName)
617+
const parsedTsconfig = this._parseTsconfig(
618+
ts.readConfigFile(tsconfigFileName, ts.sys.readFile).config || {},
619+
dirname(tsconfigFileName),
620+
tsconfigFileName,
621+
)
617622

618623
if (this._includesTestFilesInConfig(parsedTsconfig)) return tsconfigFileName
619624

0 commit comments

Comments
 (0)