Skip to content

Commit cba226b

Browse files
committed
Make sure we are using right options
1 parent 8f15ad5 commit cba226b

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

internal/compiler/fileloader.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,15 +338,16 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile,
338338
isJavaScriptFile := ast.IsSourceFileJS(file)
339339
isExternalModuleFile := ast.IsExternalModule(file)
340340

341-
compilerOptions := p.opts.Config.CompilerOptions() // !!! sheetal this should probably be options for file
342-
if isJavaScriptFile || (!file.IsDeclarationFile && (compilerOptions.GetIsolatedModules() || isExternalModuleFile)) {
343-
if compilerOptions.ImportHelpers.IsTrue() {
341+
redirect := p.projectReferenceFileMapper.getRedirectForResolution(file)
342+
optionsForFile := module.GetCompilerOptionsWithRedirect(p.opts.Config.CompilerOptions(), redirect)
343+
if isJavaScriptFile || (!file.IsDeclarationFile && (optionsForFile.GetIsolatedModules() || isExternalModuleFile)) {
344+
if optionsForFile.ImportHelpers.IsTrue() {
344345
specifier := p.createSyntheticImport(externalHelpersModuleNameText, file)
345346
moduleNames = append(moduleNames, specifier)
346347
importHelpersImportSpecifier = specifier
347348
}
348349

349-
jsxImport := ast.GetJSXRuntimeImport(ast.GetJSXImplicitImportBase(compilerOptions, file), compilerOptions)
350+
jsxImport := ast.GetJSXRuntimeImport(ast.GetJSXImplicitImportBase(optionsForFile, file), optionsForFile)
350351
if jsxImport != "" {
351352
specifier := p.createSyntheticImport(jsxImport, file)
352353
moduleNames = append(moduleNames, specifier)
@@ -360,9 +361,7 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile,
360361
if len(moduleNames) != 0 {
361362
toParse = make([]string, 0, len(moduleNames))
362363

363-
redirect := p.projectReferenceFileMapper.getRedirectForResolution(file)
364364
resolutions := p.resolveModuleNames(moduleNames, file, meta, redirect)
365-
optionsForFile := module.GetCompilerOptionsWithRedirect(compilerOptions, redirect)
366365

367366
resolutionsInFile = make(module.ModeAwareCache[*module.ResolvedModule], len(resolutions))
368367

0 commit comments

Comments
 (0)