From 3be0dfcd2b870e71fe1356f9737c0a38bd82f41f Mon Sep 17 00:00:00 2001
From: Eric Cornelson <EricCornelson@gmail.com>
Date: Wed, 7 May 2025 15:30:54 -0500
Subject: [PATCH 1/7] Add initial support for resolution mode

---
 internal/ast/ast.go                         |  47 ++++++
 internal/ast/utilities.go                   |  16 +++
 internal/checker/checker.go                 |  20 +--
 internal/compiler/fileloader.go             | 151 +++++++++++++++++---
 internal/compiler/program.go                |   4 +-
 internal/core/compileroptions.go            |  15 ++
 internal/transformers/importelision_test.go |   8 +-
 7 files changed, 224 insertions(+), 37 deletions(-)

diff --git a/internal/ast/ast.go b/internal/ast/ast.go
index df18a8f367..6aadf7d0eb 100644
--- a/internal/ast/ast.go
+++ b/internal/ast/ast.go
@@ -7500,6 +7500,53 @@ func IsImportAttributes(node *Node) bool {
 	return node.Kind == KindImportAttributes
 }
 
+func (node *ImportAttributesNode) GetResolutionModeOverride( /* !!! grammarErrorOnNode?: (node: Node, diagnostic: DiagnosticMessage) => void*/ ) (core.ResolutionMode, bool) {
+	if node == nil {
+		return core.ResolutionModeNone, false
+	}
+
+	attributes := node.AsImportAttributes().Attributes
+
+	if len(attributes.Nodes) != 1 {
+		// !!!
+		// grammarErrorOnNode?.(
+		//     node,
+		//     node.token === SyntaxKind.WithKeyword
+		//         ? Diagnostics.Type_import_attributes_should_have_exactly_one_key_resolution_mode_with_value_import_or_require
+		//         : Diagnostics.Type_import_assertions_should_have_exactly_one_key_resolution_mode_with_value_import_or_require,
+		// );
+		return core.ResolutionModeNone, false
+	}
+
+	elem := attributes.Nodes[0].AsImportAttribute()
+	if !IsStringLiteralLike(elem.Name()) {
+		return core.ResolutionModeNone, false
+	}
+	if elem.Name().Text() != "resolution-mode" {
+		// !!!
+		// grammarErrorOnNode?.(
+		//     elem.name,
+		//     node.token === SyntaxKind.WithKeyword
+		//         ? Diagnostics.resolution_mode_is_the_only_valid_key_for_type_import_attributes
+		//         : Diagnostics.resolution_mode_is_the_only_valid_key_for_type_import_assertions,
+		// );
+		return core.ResolutionModeNone, false
+	}
+	if !IsStringLiteralLike(elem.Value) {
+		return core.ResolutionModeNone, false
+	}
+	if elem.Value.Text() != "import" && elem.Value.Text() != "require" {
+		// !!!
+		// grammarErrorOnNode?.(elem.value, Diagnostics.resolution_mode_should_be_either_require_or_import);
+		return core.ResolutionModeNone, false
+	}
+	if elem.Value.Text() == "import" {
+		return core.ResolutionModeESM, true
+	} else {
+		return core.ModuleKindCommonJS, true
+	}
+}
+
 // TypeQueryNode
 
 type TypeQueryNode struct {
diff --git a/internal/ast/utilities.go b/internal/ast/utilities.go
index ea0a4fe29e..28eece50c3 100644
--- a/internal/ast/utilities.go
+++ b/internal/ast/utilities.go
@@ -2733,6 +2733,22 @@ func IsTypeOnlyImportOrExportDeclaration(node *Node) bool {
 	return IsTypeOnlyImportDeclaration(node) || isTypeOnlyExportDeclaration(node)
 }
 
+func IsExclusivelyTypeOnlyImportOrExport(node *Node) bool {
+	switch node.Kind {
+	case KindExportDeclaration:
+		return node.AsExportDeclaration().IsTypeOnly
+	case KindImportDeclaration, KindJSImportDeclaration:
+		if importClause := node.AsImportDeclaration().ImportClause; importClause != nil {
+			return importClause.AsImportClause().IsTypeOnly
+		}
+	case KindJSDocImportTag:
+		if importClause := node.AsJSDocImportTag().ImportClause; importClause != nil {
+			return importClause.AsImportClause().IsTypeOnly
+		}
+	}
+	return false
+}
+
 func GetSourceFileOfModule(module *Symbol) *SourceFile {
 	declaration := module.ValueDeclaration
 	if declaration == nil {
diff --git a/internal/checker/checker.go b/internal/checker/checker.go
index 87168d9b0b..652cf29596 100644
--- a/internal/checker/checker.go
+++ b/internal/checker/checker.go
@@ -524,7 +524,7 @@ type Program interface {
 	BindSourceFiles()
 	GetEmitModuleFormatOfFile(sourceFile *ast.SourceFile) core.ModuleKind
 	GetImpliedNodeFormatForEmit(sourceFile *ast.SourceFile) core.ModuleKind
-	GetResolvedModule(currentSourceFile *ast.SourceFile, moduleReference string) *ast.SourceFile
+	GetResolvedModule(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile
 	GetSourceFileMetaData(path tspath.Path) *ast.SourceFileMetaData
 	GetJSXRuntimeImportSpecifier(path tspath.Path) (moduleReference string, specifier *ast.Node)
 	GetImportHelpersImportSpecifier(path tspath.Path) *ast.Node
@@ -5060,7 +5060,7 @@ func (c *Checker) checkImportAttributes(declaration *ast.Node) {
 	if importAttributesType != c.emptyObjectType {
 		c.checkTypeAssignableTo(c.getTypeFromImportAttributes(node), c.getNullableType(importAttributesType, TypeFlagsUndefined), node, nil)
 	}
-	isTypeOnly := isExclusivelyTypeOnlyImportOrExport(declaration)
+	isTypeOnly := ast.IsExclusivelyTypeOnlyImportOrExport(declaration)
 	override := c.getResolutionModeOverride(node.AsImportAttributes(), isTypeOnly)
 	isImportAttributes := node.AsImportAttributes().Token == ast.KindWithKeyword
 	if isTypeOnly && override != core.ResolutionModeNone {
@@ -5098,18 +5098,6 @@ func (c *Checker) checkImportAttributes(declaration *ast.Node) {
 	}
 }
 
-func isExclusivelyTypeOnlyImportOrExport(node *ast.Node) bool {
-	switch node.Kind {
-	case ast.KindExportDeclaration:
-		return node.AsExportDeclaration().IsTypeOnly
-	case ast.KindImportDeclaration, ast.KindJSImportDeclaration:
-		if importClause := node.AsImportDeclaration().ImportClause; importClause != nil {
-			return importClause.AsImportClause().IsTypeOnly
-		}
-	}
-	return false
-}
-
 func (c *Checker) getTypeFromImportAttributes(node *ast.Node) *Type {
 	links := c.typeNodeLinks.Get(node)
 	if links.resolvedType == nil {
@@ -6378,6 +6366,7 @@ func (c *Checker) checkAliasSymbol(node *ast.Node) {
 			c.error(node, diagnostics.ESM_syntax_is_not_allowed_in_a_CommonJS_module_when_module_is_set_to_preserve)
 		}
 		// !!!
+
 		// if c.compilerOptions.VerbatimModuleSyntax.IsTrue() && !ast.IsTypeOnlyImportOrExportDeclaration(node) && node.Flags&ast.NodeFlagsAmbient == 0 && targetFlags&ast.SymbolFlagsConstEnum != 0 {
 		// 	constEnumDeclaration := target.ValueDeclaration
 		// 	redirect := host.getRedirectReferenceForResolutionFromSourceOfProject(ast.GetSourceFileOfNode(constEnumDeclaration).ResolvedPath)
@@ -14287,7 +14276,8 @@ func (c *Checker) resolveExternalModule(location *ast.Node, moduleReference stri
 		return ambientModule
 	}
 	// !!! The following only implements simple module resolution
-	sourceFile := c.program.GetResolvedModule(ast.GetSourceFileOfNode(location), moduleReference)
+	resolutionMode := c.compilerOptions.GetResolutionMode()
+	sourceFile := c.program.GetResolvedModule(ast.GetSourceFileOfNode(location), moduleReference, resolutionMode)
 	if sourceFile != nil {
 		// !!!
 		if sourceFile.Symbol != nil {
diff --git a/internal/compiler/fileloader.go b/internal/compiler/fileloader.go
index e932a2eb5e..8e37feb164 100644
--- a/internal/compiler/fileloader.go
+++ b/internal/compiler/fileloader.go
@@ -254,9 +254,12 @@ func (t *parseTask) start(loader *fileLoader) {
 		}
 
 		t.file = file
-		loader.wg.Queue(func() {
-			t.metadata = loader.loadSourceFileMetaData(file.Path())
-		})
+		t.metadata = loader.loadSourceFileMetaData(file.Path())
+
+		fileWithMetadata := &fileWithMetadata{
+			file: file,
+			meta: t.metadata,
+		}
 
 		// !!! if noResolve, skip all of this
 		t.subTasks = make([]*parseTask, 0, len(file.ReferencedFiles)+len(file.Imports)+len(file.ModuleAugmentations))
@@ -267,7 +270,8 @@ func (t *parseTask) start(loader *fileLoader) {
 		}
 
 		for _, ref := range file.TypeReferenceDirectives {
-			resolved := loader.resolver.ResolveTypeReferenceDirective(ref.FileName, file.FileName(), core.ModuleKindCommonJS /* !!! */, nil)
+			resolutionMode := getModeForTypeReferenceDirectiveInFile(ref, fileWithMetadata, loader.compilerOptions)
+			resolved := loader.resolver.ResolveTypeReferenceDirective(ref.FileName, file.FileName(), resolutionMode, nil)
 			if resolved.IsResolved() {
 				t.addSubTask(resolved.ResolvedFileName, false)
 			}
@@ -283,7 +287,7 @@ func (t *parseTask) start(loader *fileLoader) {
 			}
 		}
 
-		toParse, resolutionsInFile, importHelpersImportSpecifier, jsxRuntimeImportSpecifier := loader.resolveImportsAndModuleAugmentations(file)
+		toParse, resolutionsInFile, importHelpersImportSpecifier, jsxRuntimeImportSpecifier := loader.resolveImportsAndModuleAugmentations(fileWithMetadata)
 		for _, imp := range toParse {
 			t.addSubTask(imp, false)
 		}
@@ -328,12 +332,13 @@ func (p *fileLoader) resolveTripleslashPathReference(moduleName string, containi
 
 const externalHelpersModuleNameText = "tslib" // TODO(jakebailey): dedupe
 
-func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile) (
+func (p *fileLoader) resolveImportsAndModuleAugmentations(item *fileWithMetadata) (
 	toParse []string,
 	resolutionsInFile module.ModeAwareCache[*module.ResolvedModule],
 	importHelpersImportSpecifier *ast.Node,
 	jsxRuntimeImportSpecifier_ *jsxRuntimeImportSpecifier,
 ) {
+	file := item.file
 	moduleNames := make([]*ast.Node, 0, len(file.Imports)+len(file.ModuleAugmentations)+2)
 	moduleNames = append(moduleNames, file.Imports...)
 	for _, imp := range file.ModuleAugmentations {
@@ -367,16 +372,17 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile)
 	if len(moduleNames) != 0 {
 		toParse = make([]string, 0, len(moduleNames))
 
-		resolutions := p.resolveModuleNames(moduleNames, file)
+		resolutions := p.resolveModuleNames(moduleNames, item)
+		optionsForFile := p.getCompilerOptionsForFile(file)
 
 		resolutionsInFile = make(module.ModeAwareCache[*module.ResolvedModule], len(resolutions))
 
-		for i, resolution := range resolutions {
-			resolvedFileName := resolution.ResolvedFileName
+		for _, resolution := range resolutions {
+			resolvedFileName := resolution.resolvedModule.ResolvedFileName
 			// TODO(ercornel): !!!: check if from node modules
 
-			mode := core.ModuleKindCommonJS // !!!
-			resolutionsInFile[module.ModeAwareCacheKey{Name: moduleNames[i].Text(), Mode: mode}] = resolution
+			mode := getModeForUsageLocation(item, resolution.node, optionsForFile)
+			resolutionsInFile[module.ModeAwareCacheKey{Name: resolution.node.Text(), Mode: mode}] = resolution.resolvedModule
 
 			// add file to program only if:
 			// - resolution was successful
@@ -396,7 +402,7 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile)
 			} else {
 				hasAllowedExtension = tspath.FileExtensionIsOneOf(resolvedFileName, tspath.SupportedTSExtensionsFlat)
 			}
-			shouldAddFile := resolution.IsResolved() && hasAllowedExtension
+			shouldAddFile := resolution.resolvedModule.IsResolved() && hasAllowedExtension
 			// TODO(ercornel): !!!: other checks on whether or not to add the file
 
 			if shouldAddFile {
@@ -409,20 +415,20 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile)
 	return toParse, resolutionsInFile, importHelpersImportSpecifier, jsxRuntimeImportSpecifier_
 }
 
-func (p *fileLoader) resolveModuleNames(entries []*ast.Node, file *ast.SourceFile) []*module.ResolvedModule {
+func (p *fileLoader) resolveModuleNames(entries []*ast.Node, item *fileWithMetadata) []*resolution {
 	if len(entries) == 0 {
 		return nil
 	}
 
-	resolvedModules := make([]*module.ResolvedModule, 0, len(entries))
+	resolvedModules := make([]*resolution, 0, len(entries))
 
 	for _, entry := range entries {
 		moduleName := entry.Text()
 		if moduleName == "" {
 			continue
 		}
-		resolvedModule := p.resolver.ResolveModuleName(moduleName, file.FileName(), core.ModuleKindCommonJS /* !!! */, nil)
-		resolvedModules = append(resolvedModules, resolvedModule)
+		resolvedModule := p.resolver.ResolveModuleName(moduleName, item.file.FileName(), item.meta.ImpliedNodeFormat, nil)
+		resolvedModules = append(resolvedModules, &resolution{node: entry, resolvedModule: resolvedModule})
 	}
 
 	return resolvedModules
@@ -440,3 +446,116 @@ func (p *fileLoader) createSyntheticImport(text string, file *ast.SourceFile) *a
 	// !!! importDecl.Flags &^= ast.NodeFlagsSynthesized
 	return externalHelpersModuleReference
 }
+
+type fileWithMetadata struct {
+	file *ast.SourceFile
+	meta *ast.SourceFileMetaData
+}
+
+type resolution struct {
+	node           *ast.Node
+	resolvedModule *module.ResolvedModule
+}
+
+func (p *fileLoader) getCompilerOptionsForFile(file *ast.SourceFile) *core.CompilerOptions {
+	// !!! return getRedirectReferenceForResolution(file)?.commandLine.options || options;
+	return p.compilerOptions
+}
+
+func getModeForTypeReferenceDirectiveInFile(ref *ast.FileReference, item *fileWithMetadata, options *core.CompilerOptions) core.ResolutionMode {
+	if ref.ResolutionMode != core.ResolutionModeNone {
+		return ref.ResolutionMode
+	} else {
+		return getDefaultResolutionModeForFile(item, options)
+	}
+}
+
+func getDefaultResolutionModeForFile(item *fileWithMetadata, options *core.CompilerOptions) core.ResolutionMode {
+	if importSyntaxAffectsModuleResolution(options) {
+		return ast.GetImpliedNodeFormatForEmitWorker(item.file.FileName(), options, item.meta)
+	} else {
+		return core.ResolutionModeNone
+	}
+}
+
+func getModeForUsageLocation(item *fileWithMetadata, usage *ast.Node, options *core.CompilerOptions) core.ResolutionMode {
+	if ast.IsImportDeclaration(usage.Parent) || ast.IsExportDeclaration(usage.Parent) || ast.IsJSDocImportTag(usage.Parent) {
+		isTypeOnly := ast.IsExclusivelyTypeOnlyImportOrExport(usage.Parent)
+		if isTypeOnly {
+			var override core.ResolutionMode
+			var ok bool
+			switch usage.Parent.Kind {
+			case ast.KindImportDeclaration:
+				override, ok = usage.Parent.AsImportDeclaration().Attributes.GetResolutionModeOverride()
+			case ast.KindExportDeclaration:
+				override, ok = usage.Parent.AsExportDeclaration().Attributes.GetResolutionModeOverride()
+			case ast.KindJSDocImportTag:
+				override, ok = usage.Parent.AsJSDocImportTag().Attributes.GetResolutionModeOverride()
+			}
+			if ok {
+				return override
+			}
+		}
+	}
+	if usage.Parent.Parent != nil && ast.IsImportTypeNode(usage.Parent.Parent) {
+		if override, ok := usage.Parent.Parent.AsImportTypeNode().Attributes.GetResolutionModeOverride(); ok {
+			return override
+		}
+	}
+
+	if options != nil && importSyntaxAffectsModuleResolution(options) {
+		return getEmitSyntaxForUsageLocationWorker(item, usage, options)
+	}
+
+	return core.ResolutionModeNone
+}
+
+func importSyntaxAffectsModuleResolution(options *core.CompilerOptions) bool {
+	moduleResolution := options.ModuleResolution
+	return core.ModuleResolutionKindNode16 <= moduleResolution && moduleResolution <= core.ModuleResolutionKindNodeNext ||
+		options.ResolvePackageJsonExports.IsTrue() || options.ResolvePackageJsonImports.IsTrue()
+}
+
+func getEmitSyntaxForUsageLocationWorker(item *fileWithMetadata, usage *ast.Node, options *core.CompilerOptions) core.ResolutionMode {
+	if options == nil {
+		// This should always be provided, but we try to fail somewhat
+		// gracefully to allow projects like ts-node time to update.
+		return core.ResolutionModeNone
+	}
+
+	exprParentParent := ast.WalkUpParenthesizedExpressions(usage.Parent).Parent
+	if exprParentParent != nil && ast.IsImportEqualsDeclaration(exprParentParent) || ast.IsRequireCall(usage.Parent) {
+		return core.ModuleKindCommonJS
+	}
+	if ast.IsImportCall(ast.WalkUpParenthesizedExpressions(usage.Parent)) {
+		if shouldTransformImportCallWorker(item, options) {
+			return core.ModuleKindCommonJS
+		} else {
+			return core.ModuleKindESNext
+		}
+	}
+	// If we're in --module preserve on an input file, we know that an import
+	// is an import. But if this is a declaration file, we'd prefer to use the
+	// impliedNodeFormat. Since we want things to be consistent between the two,
+	// we need to issue errors when the user writes ESM syntax in a definitely-CJS
+	// file, until/unless declaration emit can indicate a true ESM import. On the
+	// other hand, writing CJS syntax in a definitely-ESM file is fine, since declaration
+	// emit preserves the CJS syntax.
+	fileEmitMode := ast.GetEmitModuleFormatOfFileWorker(item.file, options, item.meta)
+	if fileEmitMode == core.ModuleKindCommonJS {
+		return core.ModuleKindCommonJS
+	} else {
+		if fileEmitMode.IsNonNodeESM() || fileEmitMode == core.ModuleKindPreserve {
+			return core.ModuleKindESNext
+		}
+	}
+	return core.ModuleKindNone
+}
+
+func shouldTransformImportCallWorker(item *fileWithMetadata, options *core.CompilerOptions) bool {
+	moduleKind := options.GetEmitModuleKind()
+	if core.ModuleKindNode16 <= moduleKind && moduleKind <= core.ModuleKindNodeNext || moduleKind == core.ModuleKindPreserve {
+		return false
+	}
+	return ast.GetImpliedNodeFormatForEmitWorker(item.file.FileName(), options, item.meta) < core.ModuleKindES2015
+}
diff --git a/internal/compiler/program.go b/internal/compiler/program.go
index 4c4f90f208..995d26e8da 100644
--- a/internal/compiler/program.go
+++ b/internal/compiler/program.go
@@ -318,9 +318,9 @@ func (p *Program) GetTypeCheckerForFile(ctx context.Context, file *ast.SourceFil
 	return p.checkerPool.GetCheckerForFile(ctx, file)
 }
 
-func (p *Program) GetResolvedModule(file *ast.SourceFile, moduleReference string) *ast.SourceFile {
+func (p *Program) GetResolvedModule(file *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile {
 	if resolutions, ok := p.resolvedModules[file.Path()]; ok {
-		if resolved, ok := resolutions[module.ModeAwareCacheKey{Name: moduleReference, Mode: core.ModuleKindCommonJS}]; ok {
+		if resolved, ok := resolutions[module.ModeAwareCacheKey{Name: moduleReference, Mode: mode}]; ok {
 			return p.findSourceFile(resolved.ResolvedFileName, FileIncludeReason{FileIncludeKindImport, 0})
 		}
 	}
diff --git a/internal/core/compileroptions.go b/internal/core/compileroptions.go
index 8abeb0dc05..7f7cb2dc03 100644
--- a/internal/core/compileroptions.go
+++ b/internal/core/compileroptions.go
@@ -180,6 +180,17 @@ func (options *CompilerOptions) GetModuleResolutionKind() ModuleResolutionKind {
 	}
 }
 
+func (options *CompilerOptions) GetResolutionMode() ResolutionMode {
+	switch options.GetEmitModuleKind() {
+	case ModuleKindCommonJS:
+		return ResolutionModeCommonJS
+	case ModuleKindESNext:
+		return ResolutionModeESM
+	default:
+		return ResolutionModeNone
+	}
+}
+
 func (options *CompilerOptions) GetESModuleInterop() bool {
 	if options.ESModuleInterop != TSUnknown {
 		return options.ESModuleInterop == TSTrue
@@ -326,6 +337,10 @@ const (
 	ModuleKindPreserve ModuleKind = 200
 )
 
+func (moduleKind ModuleKind) IsNonNodeESM() bool {
+	return moduleKind >= ModuleKindES2015 && moduleKind <= ModuleKindESNext
+}
+
 type ResolutionMode = ModuleKind // ModuleKindNone | ModuleKindCommonJS | ModuleKindESNext
 
 const (
diff --git a/internal/transformers/importelision_test.go b/internal/transformers/importelision_test.go
index 63179e2192..9eac8c78f8 100644
--- a/internal/transformers/importelision_test.go
+++ b/internal/transformers/importelision_test.go
@@ -19,7 +19,7 @@ type fakeProgram struct {
 	files                       []*ast.SourceFile
 	getEmitModuleFormatOfFile   func(sourceFile *ast.SourceFile) core.ModuleKind
 	getImpliedNodeFormatForEmit func(sourceFile *ast.SourceFile) core.ModuleKind
-	getResolvedModule           func(currentSourceFile *ast.SourceFile, moduleReference string) *ast.SourceFile
+	getResolvedModule           func(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile
 }
 
 func (p *fakeProgram) Options() *core.CompilerOptions {
@@ -50,8 +50,8 @@ func (p *fakeProgram) GetImpliedNodeFormatForEmit(sourceFile *ast.SourceFile) co
 	return p.getImpliedNodeFormatForEmit(sourceFile)
 }
 
-func (p *fakeProgram) GetResolvedModule(currentSourceFile *ast.SourceFile, moduleReference string) *ast.SourceFile {
-	return p.getResolvedModule(currentSourceFile, moduleReference)
+func (p *fakeProgram) GetResolvedModule(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile {
+	return p.getResolvedModule(currentSourceFile, moduleReference, mode)
 }
 
 func (p *fakeProgram) GetSourceFileMetaData(path tspath.Path) *ast.SourceFileMetaData {
@@ -124,7 +124,7 @@ func TestImportElision(t *testing.T) {
 				getImpliedNodeFormatForEmit: func(sourceFile *ast.SourceFile) core.ModuleKind {
 					return core.ModuleKindESNext
 				},
-				getResolvedModule: func(currentSourceFile *ast.SourceFile, moduleReference string) *ast.SourceFile {
+				getResolvedModule: func(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile {
 					if currentSourceFile == file && moduleReference == "other" {
 						return other
 					}

From 0ce692df4ac4528d704278c431b2eb1fb93b6a86 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Thu, 22 May 2025 15:34:28 -0700
Subject: [PATCH 2/7] Port resolveExternalModule and error generation
 dependencies

---
 internal/ast/ast.go                         |   9 +-
 internal/ast/utilities.go                   |  55 +++-
 internal/checker/checker.go                 | 266 +++++++++++++++++++-
 internal/checker/utilities.go               |  29 +++
 internal/compiler/fileloader.go             |  71 +++---
 internal/compiler/program.go                |  16 +-
 internal/core/compileroptions.go            |  23 +-
 internal/module/resolver.go                 |  23 +-
 internal/module/util.go                     |   4 +
 internal/transformers/importelision_test.go |  39 ++-
 10 files changed, 458 insertions(+), 77 deletions(-)

diff --git a/internal/ast/ast.go b/internal/ast/ast.go
index 6aadf7d0eb..cc2093090d 100644
--- a/internal/ast/ast.go
+++ b/internal/ast/ast.go
@@ -4152,6 +4152,10 @@ func IsImportDeclaration(node *Node) bool {
 	return node.Kind == KindImportDeclaration
 }
 
+func IsImportDeclarationOrJSImportDeclaration(node *Node) bool {
+	return node.Kind == KindImportDeclaration || node.Kind == KindJSImportDeclaration
+}
+
 // ImportSpecifier
 
 type ImportSpecifier struct {
@@ -9936,8 +9940,9 @@ type CommentDirective struct {
 // SourceFile
 
 type SourceFileMetaData struct {
-	PackageJsonType   string
-	ImpliedNodeFormat core.ResolutionMode
+	PackageJsonType      string
+	PackageJsonDirectory string
+	ImpliedNodeFormat    core.ResolutionMode
 }
 
 type CheckJsDirective struct {
diff --git a/internal/ast/utilities.go b/internal/ast/utilities.go
index 28eece50c3..5168a00b6e 100644
--- a/internal/ast/utilities.go
+++ b/internal/ast/utilities.go
@@ -2404,7 +2404,7 @@ func GetImpliedNodeFormatForFile(path string, packageJsonType string) core.Modul
 		impliedNodeFormat = core.ResolutionModeESM
 	} else if tspath.FileExtensionIsOneOf(path, []string{tspath.ExtensionDcts, tspath.ExtensionCts, tspath.ExtensionCjs}) {
 		impliedNodeFormat = core.ResolutionModeCommonJS
-	} else if packageJsonType != "" && tspath.FileExtensionIsOneOf(path, []string{tspath.ExtensionDts, tspath.ExtensionTs, tspath.ExtensionTsx, tspath.ExtensionJs, tspath.ExtensionJsx}) {
+	} else if tspath.FileExtensionIsOneOf(path, []string{tspath.ExtensionDts, tspath.ExtensionTs, tspath.ExtensionTsx, tspath.ExtensionJs, tspath.ExtensionJsx}) {
 		impliedNodeFormat = core.IfElse(packageJsonType == "module", core.ResolutionModeESM, core.ResolutionModeCommonJS)
 	}
 
@@ -2968,3 +2968,56 @@ func GetPropertyNameForPropertyNameNode(name *Node) string {
 	}
 	panic("Unhandled case in getPropertyNameForPropertyNameNode")
 }
+
+func IsPartOfTypeOnlyImportOrExportDeclaration(node *Node) bool {
+	return FindAncestor(node, IsTypeOnlyImportOrExportDeclaration) != nil
+}
+
+func IsPartOfExclusivelyTypeOnlyImportOrExportDeclaration(node *Node) bool {
+	return FindAncestor(node, IsExclusivelyTypeOnlyImportOrExport) != nil
+}
+
+func IsEmittableImport(node *Node) bool {
+	switch node.Kind {
+	case KindImportDeclaration:
+		return node.AsImportDeclaration().ImportClause == nil || !node.AsImportDeclaration().ImportClause.IsTypeOnly()
+	case KindExportDeclaration:
+		return !node.AsExportDeclaration().IsTypeOnly
+	case KindImportEqualsDeclaration:
+		return !node.AsImportEqualsDeclaration().IsTypeOnly
+	case KindCallExpression:
+		return IsImportCall(node)
+	}
+	return false
+}
+
+func IsResolutionModeOverrideHost(node *Node) bool {
+	if node == nil {
+		return false
+	}
+	switch node.Kind {
+	case KindImportType, KindExportDeclaration, KindImportDeclaration, KindJSImportDeclaration:
+		return true
+	}
+	return false
+}
+
+func HasResolutionModeOverride(node *Node) bool {
+	if node == nil {
+		return false
+	}
+	var attributes *ImportAttributesNode
+	switch node.Kind {
+	case KindImportType:
+		attributes = node.AsImportTypeNode().Attributes
+	case KindImportDeclaration, KindJSImportDeclaration:
+		attributes = node.AsImportDeclaration().Attributes
+	case KindExportDeclaration:
+		attributes = node.AsExportDeclaration().Attributes
+	}
+	if attributes != nil {
+		_, ok := attributes.GetResolutionModeOverride()
+		return ok
+	}
+	return false
+}
diff --git a/internal/checker/checker.go b/internal/checker/checker.go
index 652cf29596..b403cb4d42 100644
--- a/internal/checker/checker.go
+++ b/internal/checker/checker.go
@@ -20,6 +20,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/diagnostics"
 	"github.com/microsoft/typescript-go/internal/evaluator"
 	"github.com/microsoft/typescript-go/internal/jsnum"
+	"github.com/microsoft/typescript-go/internal/module"
 	"github.com/microsoft/typescript-go/internal/printer"
 	"github.com/microsoft/typescript-go/internal/scanner"
 	"github.com/microsoft/typescript-go/internal/stringutil"
@@ -522,12 +523,17 @@ type Program interface {
 	Options() *core.CompilerOptions
 	SourceFiles() []*ast.SourceFile
 	BindSourceFiles()
+	FileExists(fileName string) bool
+	GetSourceFile(fileName string) *ast.SourceFile
 	GetEmitModuleFormatOfFile(sourceFile *ast.SourceFile) core.ModuleKind
 	GetImpliedNodeFormatForEmit(sourceFile *ast.SourceFile) core.ModuleKind
-	GetResolvedModule(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile
+	GetResolvedModule(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule
+	GetResolvedModules() map[tspath.Path]module.ModeAwareCache[*module.ResolvedModule]
 	GetSourceFileMetaData(path tspath.Path) *ast.SourceFileMetaData
 	GetJSXRuntimeImportSpecifier(path tspath.Path) (moduleReference string, specifier *ast.Node)
 	GetImportHelpersImportSpecifier(path tspath.Path) *ast.Node
+	GetModeForUsageLocation(sourceFile *ast.SourceFile, location *ast.Node) core.ResolutionMode
+	GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode
 }
 
 type Host interface{}
@@ -554,6 +560,7 @@ type Checker struct {
 	varianceTypeParameter                      *Type
 	languageVersion                            core.ScriptTarget
 	moduleKind                                 core.ModuleKind
+	moduleResolutionKind                       core.ModuleResolutionKind
 	isInferencePartiallyBlocked                bool
 	legacyDecorators                           bool
 	emitStandardClassFields                    bool
@@ -829,6 +836,7 @@ type Checker struct {
 	_jsxFactoryEntity                          *ast.Node
 	skipDirectInferenceNodes                   core.Set[*ast.Node]
 	ctx                                        context.Context
+	packagesMap                                map[string]bool
 }
 
 func NewChecker(program Program) *Checker {
@@ -844,6 +852,7 @@ func NewChecker(program Program) *Checker {
 	c.compareSymbols = c.compareSymbolsWorker // Closure optimization
 	c.languageVersion = c.compilerOptions.GetEmitScriptTarget()
 	c.moduleKind = c.compilerOptions.GetEmitModuleKind()
+	c.moduleResolutionKind = c.compilerOptions.GetModuleResolutionKind()
 	c.legacyDecorators = c.compilerOptions.ExperimentalDecorators == core.TSTrue
 	c.emitStandardClassFields = !c.compilerOptions.UseDefineForClassFields.IsFalse() && c.compilerOptions.GetEmitScriptTarget() >= core.ScriptTargetES2022
 	c.allowSyntheticDefaultImports = c.compilerOptions.GetAllowSyntheticDefaultImports()
@@ -14275,12 +14284,124 @@ func (c *Checker) resolveExternalModule(location *ast.Node, moduleReference stri
 	if ambientModule != nil {
 		return ambientModule
 	}
-	// !!! The following only implements simple module resolution
-	resolutionMode := c.compilerOptions.GetResolutionMode()
-	sourceFile := c.program.GetResolvedModule(ast.GetSourceFileOfNode(location), moduleReference, resolutionMode)
+
+	importingSourceFile := ast.GetSourceFileOfNode(location)
+	var (
+		contextSpecifier *ast.Node
+		mode             core.ResolutionMode
+	)
+
+	if ast.IsStringLiteralLike(location) || ast.IsModuleDeclaration(location.Parent) && location.Parent.AsModuleDeclaration().Name() == location {
+		contextSpecifier = location
+	} else if ast.IsModuleDeclaration(location) {
+		contextSpecifier = location.AsModuleDeclaration().Name()
+	} else if ast.IsLiteralImportTypeNode(location) {
+		contextSpecifier = location.AsImportTypeNode().Argument.AsLiteralTypeNode().Literal
+	} else if ast.IsVariableDeclarationInitializedToRequire(location) {
+		contextSpecifier = location.AsVariableDeclaration().Initializer.AsCallExpression().Arguments.Nodes[0]
+	} else {
+		var ancestor *ast.Node
+		ancestor = ast.FindAncestor(location, ast.IsImportCall)
+		if ancestor != nil {
+			contextSpecifier = ancestor.AsCallExpression().Arguments.Nodes[0]
+		}
+		if ancestor == nil {
+			ancestor = ast.FindAncestor(location, ast.IsImportDeclarationOrJSImportDeclaration)
+			if ancestor != nil {
+				contextSpecifier = ancestor.AsImportDeclaration().ModuleSpecifier
+			}
+		}
+		if ancestor == nil {
+			ancestor = ast.FindAncestor(location, ast.IsExportDeclaration)
+			if ancestor != nil {
+				contextSpecifier = ancestor.AsExportDeclaration().ModuleSpecifier
+			}
+		}
+		if ancestor == nil {
+			ancestor = ast.FindAncestor(location, ast.IsImportEqualsDeclaration)
+			if ancestor != nil {
+				contextSpecifier = ancestor.AsImportEqualsDeclaration().ModuleReference.AsExternalModuleReference().Expression
+			}
+		}
+	}
+
+	if contextSpecifier != nil && ast.IsStringLiteralLike(contextSpecifier) {
+		mode = c.program.GetModeForUsageLocation(importingSourceFile, contextSpecifier)
+	} else {
+		mode = c.program.GetDefaultResolutionModeForFile(importingSourceFile)
+	}
+
+	var sourceFile *ast.SourceFile
+	resolvedModule := c.program.GetResolvedModule(importingSourceFile, moduleReference, mode)
+	if resolvedModule != nil && resolvedModule.IsResolved() {
+		sourceFile = c.program.GetSourceFile(resolvedModule.ResolvedFileName)
+	}
+
 	if sourceFile != nil {
 		// !!!
+		if errorNode != nil {
+			if resolvedModule.ResolvedUsingTsExtension && tspath.IsDeclarationFileName(moduleReference) {
+				if ast.FindAncestor(location, ast.IsEmittableImport) != nil {
+					tsExtension := tspath.TryExtractTSExtension(moduleReference)
+					if tsExtension == "" {
+						panic("should be able to extract TS extension from string that passes IsDeclarationFileName")
+					}
+					c.error(
+						errorNode,
+						diagnostics.A_declaration_file_cannot_be_imported_without_import_type_Did_you_mean_to_import_an_implementation_file_0_instead,
+						c.getSuggestedImportSource(moduleReference, tsExtension, mode),
+					)
+				}
+			} else if resolvedModule.ResolvedUsingTsExtension && !c.compilerOptions.AllowImportingTsExtensionsFrom(importingSourceFile.FileName()) {
+				if ast.FindAncestor(location, ast.IsEmittableImport) != nil {
+					tsExtension := tspath.TryExtractTSExtension(moduleReference)
+					if tsExtension == "" {
+						panic("should be able to extract TS extension from string that passes IsDeclarationFileName")
+					}
+					c.error(
+						errorNode,
+						diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled,
+						tsExtension,
+					)
+				}
+			}
+		}
+
 		if sourceFile.Symbol != nil {
+			if errorNode != nil {
+				if resolvedModule.IsExternalLibraryImport && !(tspath.ExtensionIsTs(resolvedModule.Extension) || resolvedModule.Extension == tspath.ExtensionJson) {
+					c.errorOnImplicitAnyModule(false /*isError*/, errorNode, mode, resolvedModule, moduleReference)
+				}
+				if c.moduleResolutionKind == core.ModuleResolutionKindNode16 || c.moduleResolutionKind == core.ModuleResolutionKindNodeNext {
+					isSyncImport := c.program.GetDefaultResolutionModeForFile(importingSourceFile) == core.ModuleKindCommonJS && ast.FindAncestor(location, ast.IsImportCall) == nil ||
+						ast.FindAncestor(location, ast.IsImportEqualsDeclaration) != nil
+					overrideHost := ast.FindAncestor(location, ast.IsResolutionModeOverrideHost)
+					if isSyncImport && c.program.GetDefaultResolutionModeForFile(sourceFile) == core.ModuleKindESNext && !ast.HasResolutionModeOverride(overrideHost) {
+						if ast.FindAncestorKind(location, ast.KindImportEqualsDeclaration) != nil {
+							// ImportEquals in an ESM file resolving to another ESM file
+							c.error(errorNode, diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference)
+						} else {
+							// CJS file resolving to an ESM file
+							var diagnosticDetails *ast.Diagnostic
+							ext := tspath.TryGetExtensionFromPath(importingSourceFile.FileName())
+							if ext == tspath.ExtensionTs || ext == tspath.ExtensionJs || ext == tspath.ExtensionTsx || ext == tspath.ExtensionJsx {
+								diagnosticDetails = c.createModeMismatchDetails(importingSourceFile, errorNode)
+							}
+
+							var message *diagnostics.Message
+							if overrideHost != nil && overrideHost.Kind == ast.KindImportDeclaration && overrideHost.AsImportDeclaration().ImportClause.IsTypeOnly() {
+								message = diagnostics.Type_only_import_of_an_ECMAScript_module_from_a_CommonJS_module_must_have_a_resolution_mode_attribute
+							} else if overrideHost != nil && overrideHost.Kind == ast.KindImportType {
+								message = diagnostics.Type_import_of_an_ECMAScript_module_from_a_CommonJS_module_must_have_a_resolution_mode_attribute
+							} else {
+								message = diagnostics.The_current_file_is_a_CommonJS_module_whose_imports_will_produce_require_calls_however_the_referenced_file_is_an_ECMAScript_module_and_cannot_be_imported_with_require_Consider_writing_a_dynamic_import_0_call_instead
+							}
+
+							c.diagnostics.Add(NewDiagnosticChainForNode(diagnosticDetails, errorNode, message, moduleReference))
+						}
+					}
+				}
+			}
 			return c.getMergedSymbol(sourceFile.Symbol)
 		}
 		if errorNode != nil && moduleNotFoundError != nil && !isSideEffectImport(errorNode) {
@@ -14304,16 +14425,149 @@ func (c *Checker) resolveExternalModule(location *ast.Node, moduleReference stri
 		return nil
 	}
 
-	// !!!
+	if resolvedModule != nil && resolvedModule.IsResolved() && !(tspath.ExtensionIsTs(resolvedModule.Extension) || resolvedModule.Extension == tspath.ExtensionJson) {
+		if isForAugmentation {
+			c.error(
+				errorNode,
+				diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented,
+				moduleReference,
+				resolvedModule.ResolvedFileName,
+			)
+		} else {
+			c.errorOnImplicitAnyModule(c.noImplicitAny && moduleNotFoundError != nil, errorNode, mode, resolvedModule, moduleReference)
+		}
+		return nil
+	}
 
 	if moduleNotFoundError != nil {
 		// !!!
-		c.error(errorNode, moduleNotFoundError, moduleReference)
+		isExtensionlessRelativePathImport := tspath.PathIsRelative(moduleReference) && !tspath.HasExtension(moduleReference)
+		resolutionIsNode16OrNext := c.moduleResolutionKind == core.ModuleResolutionKindNode16 || c.moduleResolutionKind == core.ModuleResolutionKindNodeNext
+		if !c.compilerOptions.GetResolveJsonModule() && tspath.FileExtensionIs(moduleReference, tspath.ExtensionJson) {
+			c.error(errorNode, diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference)
+		} else if mode == core.ResolutionModeESM && resolutionIsNode16OrNext && isExtensionlessRelativePathImport {
+			absoluteRef := tspath.GetNormalizedAbsolutePath(moduleReference, tspath.GetDirectoryPath(importingSourceFile.FileName()))
+			if suggestedExt := c.getSuggestedImportExtension(absoluteRef); suggestedExt != "" {
+				c.error(errorNode, diagnostics.Relative_import_paths_need_explicit_file_extensions_in_ECMAScript_imports_when_moduleResolution_is_node16_or_nodenext_Did_you_mean_0, moduleReference+suggestedExt)
+			} else {
+				c.error(errorNode, diagnostics.Relative_import_paths_need_explicit_file_extensions_in_ECMAScript_imports_when_moduleResolution_is_node16_or_nodenext_Consider_adding_an_extension_to_the_import_path)
+			}
+		} else if resolvedModule != nil && resolvedModule.AlternateResult != "" {
+			errorInfo := c.createModuleNotFoundChain(resolvedModule, errorNode, moduleReference, mode, moduleReference)
+			c.diagnostics.Add(NewDiagnosticChainForNode(errorInfo, errorNode, moduleNotFoundError, moduleReference))
+		} else {
+			c.error(errorNode, moduleNotFoundError, moduleReference)
+		}
 	}
 
 	return nil
 }
 
+func (c *Checker) getSuggestedImportSource(moduleReference string, tsExtension string, mode core.ResolutionMode) string {
+	importSourceWithoutExtension := tspath.RemoveExtension(moduleReference, tsExtension)
+
+	// Direct users to import source with .js extension if outputting an ES module.
+	// @see https://github.com/microsoft/TypeScript/issues/42151
+	if c.moduleKind.IsNonNodeESM() || mode == core.ModuleKindESNext {
+		preferTs := tspath.IsDeclarationFileName(moduleReference) && c.compilerOptions.GetAllowImportingTsExtensions()
+		var ext string
+		switch {
+		case tsExtension == tspath.ExtensionMts || tsExtension == tspath.ExtensionDmts:
+			ext = core.IfElse(preferTs, ".mts", ".mjs")
+		case tsExtension == tspath.ExtensionCts || tsExtension == tspath.ExtensionDcts:
+			ext = core.IfElse(preferTs, ".cts", ".cjs")
+		default:
+			ext = core.IfElse(preferTs, ".ts", ".js")
+		}
+
+		return importSourceWithoutExtension + ext
+	}
+
+	return importSourceWithoutExtension
+}
+
+func (c *Checker) getSuggestedImportExtension(extensionlessImportPath string) string {
+	switch true {
+	case c.program.FileExists(extensionlessImportPath + ".mts"):
+		return ".mjs"
+	case c.program.FileExists(extensionlessImportPath + ".ts"):
+		return ".js"
+	case c.program.FileExists(extensionlessImportPath + ".cts"):
+		return ".cjs"
+	case c.program.FileExists(extensionlessImportPath + ".mjs"):
+		return ".mjs"
+	case c.program.FileExists(extensionlessImportPath + ".js"):
+		return ".js"
+	case c.program.FileExists(extensionlessImportPath + ".cjs"):
+		return ".cjs"
+	case c.program.FileExists(extensionlessImportPath + ".tsx"):
+		return core.IfElse(c.compilerOptions.Jsx == core.JsxEmitPreserve, ".jsx", ".js")
+	case c.program.FileExists(extensionlessImportPath + ".jsx"):
+		return ".jsx"
+	case c.program.FileExists(extensionlessImportPath + ".json"):
+		return ".json"
+	}
+	return ""
+}
+
+func (c *Checker) errorOnImplicitAnyModule(isError bool, errorNode *ast.Node, mode core.ResolutionMode, resolvedModule *module.ResolvedModule, moduleReference string) {
+	if isSideEffectImport(errorNode) {
+		return
+	}
+
+	var errorInfo *ast.Diagnostic
+	if !tspath.IsExternalModuleNameRelative(moduleReference) && resolvedModule.PackageId.Name != "" {
+		errorInfo = c.createModuleNotFoundChain(resolvedModule, errorNode, moduleReference, mode, resolvedModule.PackageId.Name)
+	}
+	c.addErrorOrSuggestion(
+		isError,
+		NewDiagnosticChainForNode(
+			errorInfo,
+			errorNode,
+			diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type,
+			moduleReference,
+			resolvedModule.ResolvedFileName,
+		),
+	)
+}
+
+func (c *Checker) createModuleNotFoundChain(resolvedModule *module.ResolvedModule, errorNode *ast.Node, moduleReference string, mode core.ResolutionMode, packageName string) *ast.Diagnostic {
+	if resolvedModule.AlternateResult != "" {
+		if strings.Contains(resolvedModule.AlternateResult, "/node_modules/@types/") {
+			packageName = "@types/" + module.MangleScopedPackageName(packageName)
+		}
+		return NewDiagnosticForNode(errorNode, diagnostics.There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings, resolvedModule.AlternateResult, packageName)
+	}
+	if c.typesPackageExists(packageName) {
+		return NewDiagnosticForNode(errorNode, diagnostics.If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_Slash_Slashgithub_com_SlashDefinitelyTyped_SlashDefinitelyTyped_Slashtree_Slashmaster_Slashtypes_Slash_1, packageName, module.MangleScopedPackageName(packageName))
+	}
+	if c.packageBundlesTypes(packageName) {
+		return NewDiagnosticForNode(errorNode, diagnostics.If_the_0_package_actually_exposes_this_module_try_adding_a_new_declaration_d_ts_file_containing_declare_module_1, packageName, moduleReference)
+	}
+	return NewDiagnosticForNode(errorNode, diagnostics.Try_npm_i_save_dev_types_Slash_1_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_module_0, moduleReference, module.MangleScopedPackageName(packageName))
+}
+
+func (c *Checker) createModeMismatchDetails(sourceFile *ast.SourceFile, errorNode *ast.Node) *ast.Diagnostic {
+	ext := tspath.TryGetExtensionFromPath(sourceFile.FileName())
+	targetExt := core.IfElse(ext == tspath.ExtensionTs, tspath.ExtensionMts, core.IfElse(ext == tspath.ExtensionJs, tspath.ExtensionMjs, ""))
+	meta := c.program.GetSourceFileMetaData(sourceFile.Path())
+	packageJsonType := meta.PackageJsonType
+	packageJsonDirectory := meta.PackageJsonDirectory
+	var result *ast.Diagnostic
+	if packageJsonDirectory != "" && packageJsonType == "" {
+		if targetExt != "" {
+			result = NewDiagnosticForNode(errorNode, diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Colon_module_to_1, targetExt, tspath.CombinePaths(packageJsonDirectory, "package.json"))
+		} else {
+			result = NewDiagnosticForNode(errorNode, diagnostics.To_convert_this_file_to_an_ECMAScript_module_add_the_field_type_Colon_module_to_0, tspath.CombinePaths(packageJsonDirectory, "package.json"))
+		}
+	} else if targetExt != "" {
+		result = NewDiagnosticForNode(errorNode, diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_create_a_local_package_json_file_with_type_Colon_module, targetExt)
+	} else {
+		result = NewDiagnosticForNode(errorNode, diagnostics.To_convert_this_file_to_an_ECMAScript_module_create_a_local_package_json_file_with_type_Colon_module)
+	}
+	return result
+}
+
 func (c *Checker) tryFindAmbientModule(moduleName string, withAugmentations bool) *ast.Symbol {
 	if tspath.IsExternalModuleNameRelative(moduleName) {
 		return nil
diff --git a/internal/checker/utilities.go b/internal/checker/utilities.go
index ca8704fc60..f15061ab3b 100644
--- a/internal/checker/utilities.go
+++ b/internal/checker/utilities.go
@@ -12,7 +12,9 @@ import (
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/diagnostics"
 	"github.com/microsoft/typescript-go/internal/jsnum"
+	"github.com/microsoft/typescript-go/internal/module"
 	"github.com/microsoft/typescript-go/internal/scanner"
+	"github.com/microsoft/typescript-go/internal/tspath"
 )
 
 func NewDiagnosticForNode(node *ast.Node, message *diagnostics.Message, args ...any) *ast.Diagnostic {
@@ -2002,3 +2004,30 @@ func (c *Checker) checkNotCanceled() {
 		panic("Checker was previously cancelled")
 	}
 }
+
+func (c *Checker) getPackagesMap() map[string]bool {
+	if c.packagesMap == nil {
+		c.packagesMap = make(map[string]bool)
+		resolvedModules := c.program.GetResolvedModules()
+		for _, resolvedModulesInFile := range resolvedModules {
+			for _, module := range resolvedModulesInFile {
+				if module.PackageId.Name != "" {
+					c.packagesMap[module.PackageId.Name] = c.packagesMap[module.PackageId.Name] || module.Extension == tspath.ExtensionDts
+				}
+			}
+		}
+	}
+	return c.packagesMap
+}
+
+func (c *Checker) typesPackageExists(packageName string) bool {
+	packagesMap := c.getPackagesMap()
+	_, ok := packagesMap[module.GetTypesPackageName(packageName)]
+	return ok
+}
+
+func (c *Checker) packageBundlesTypes(packageName string) bool {
+	packagesMap := c.getPackagesMap()
+	hasTypes, _ := packagesMap[packageName]
+	return hasTypes
+}
diff --git a/internal/compiler/fileloader.go b/internal/compiler/fileloader.go
index 8e37feb164..7b874676ec 100644
--- a/internal/compiler/fileloader.go
+++ b/internal/compiler/fileloader.go
@@ -254,12 +254,7 @@ func (t *parseTask) start(loader *fileLoader) {
 		}
 
 		t.file = file
-		t.metadata = loader.loadSourceFileMetaData(file.Path())
-
-		fileWithMetadata := &fileWithMetadata{
-			file: file,
-			meta: t.metadata,
-		}
+		t.metadata = loader.loadSourceFileMetaData(file.FileName())
 
 		// !!! if noResolve, skip all of this
 		t.subTasks = make([]*parseTask, 0, len(file.ReferencedFiles)+len(file.Imports)+len(file.ModuleAugmentations))
@@ -270,7 +265,7 @@ func (t *parseTask) start(loader *fileLoader) {
 		}
 
 		for _, ref := range file.TypeReferenceDirectives {
-			resolutionMode := getModeForTypeReferenceDirectiveInFile(ref, fileWithMetadata, loader.compilerOptions)
+			resolutionMode := getModeForTypeReferenceDirectiveInFile(ref, file, t.metadata, loader.compilerOptions)
 			resolved := loader.resolver.ResolveTypeReferenceDirective(ref.FileName, file.FileName(), resolutionMode, nil)
 			if resolved.IsResolved() {
 				t.addSubTask(resolved.ResolvedFileName, false)
@@ -287,7 +282,7 @@ func (t *parseTask) start(loader *fileLoader) {
 			}
 		}
 
-		toParse, resolutionsInFile, importHelpersImportSpecifier, jsxRuntimeImportSpecifier := loader.resolveImportsAndModuleAugmentations(fileWithMetadata)
+		toParse, resolutionsInFile, importHelpersImportSpecifier, jsxRuntimeImportSpecifier := loader.resolveImportsAndModuleAugmentations(file, t.metadata)
 		for _, imp := range toParse {
 			t.addSubTask(imp, false)
 		}
@@ -300,12 +295,20 @@ func (t *parseTask) start(loader *fileLoader) {
 	})
 }
 
-func (p *fileLoader) loadSourceFileMetaData(path tspath.Path) *ast.SourceFileMetaData {
-	packageJsonType := p.resolver.GetPackageJsonTypeIfApplicable(string(path))
-	impliedNodeFormat := ast.GetImpliedNodeFormatForFile(string(path), packageJsonType)
+func (p *fileLoader) loadSourceFileMetaData(fileName string) *ast.SourceFileMetaData {
+	packageJsonScope := p.resolver.GetPackageJsonScopeIfApplicable(fileName)
+	var packageJsonType, packageJsonDirectory string
+	if packageJsonScope.Exists() {
+		packageJsonDirectory = packageJsonScope.PackageDirectory
+		if value, ok := packageJsonScope.Contents.Type.GetValue(); ok {
+			packageJsonType = value
+		}
+	}
+	impliedNodeFormat := ast.GetImpliedNodeFormatForFile(fileName, packageJsonType)
 	return &ast.SourceFileMetaData{
-		PackageJsonType:   packageJsonType,
-		ImpliedNodeFormat: impliedNodeFormat,
+		PackageJsonType:      packageJsonType,
+		PackageJsonDirectory: packageJsonDirectory,
+		ImpliedNodeFormat:    impliedNodeFormat,
 	}
 }
 
@@ -332,13 +335,12 @@ func (p *fileLoader) resolveTripleslashPathReference(moduleName string, containi
 
 const externalHelpersModuleNameText = "tslib" // TODO(jakebailey): dedupe
 
-func (p *fileLoader) resolveImportsAndModuleAugmentations(item *fileWithMetadata) (
+func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile, meta *ast.SourceFileMetaData) (
 	toParse []string,
 	resolutionsInFile module.ModeAwareCache[*module.ResolvedModule],
 	importHelpersImportSpecifier *ast.Node,
 	jsxRuntimeImportSpecifier_ *jsxRuntimeImportSpecifier,
 ) {
-	file := item.file
 	moduleNames := make([]*ast.Node, 0, len(file.Imports)+len(file.ModuleAugmentations)+2)
 	moduleNames = append(moduleNames, file.Imports...)
 	for _, imp := range file.ModuleAugmentations {
@@ -372,7 +374,7 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(item *fileWithMetadata
 	if len(moduleNames) != 0 {
 		toParse = make([]string, 0, len(moduleNames))
 
-		resolutions := p.resolveModuleNames(moduleNames, item)
+		resolutions := p.resolveModuleNames(moduleNames, file, meta)
 		optionsForFile := p.getCompilerOptionsForFile(file)
 
 		resolutionsInFile = make(module.ModeAwareCache[*module.ResolvedModule], len(resolutions))
@@ -381,7 +383,7 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(item *fileWithMetadata
 			resolvedFileName := resolution.resolvedModule.ResolvedFileName
 			// TODO(ercornel): !!!: check if from node modules
 
-			mode := getModeForUsageLocation(item, resolution.node, optionsForFile)
+			mode := getModeForUsageLocation(file, meta, resolution.node, optionsForFile)
 			resolutionsInFile[module.ModeAwareCacheKey{Name: resolution.node.Text(), Mode: mode}] = resolution.resolvedModule
 
 			// add file to program only if:
@@ -415,7 +417,7 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(item *fileWithMetadata
 	return toParse, resolutionsInFile, importHelpersImportSpecifier, jsxRuntimeImportSpecifier_
 }
 
-func (p *fileLoader) resolveModuleNames(entries []*ast.Node, item *fileWithMetadata) []*resolution {
+func (p *fileLoader) resolveModuleNames(entries []*ast.Node, file *ast.SourceFile, meta *ast.SourceFileMetaData) []*resolution {
 	if len(entries) == 0 {
 		return nil
 	}
@@ -427,7 +429,7 @@ func (p *fileLoader) resolveModuleNames(entries []*ast.Node, item *fileWithMetad
 		if moduleName == "" {
 			continue
 		}
-		resolvedModule := p.resolver.ResolveModuleName(moduleName, item.file.FileName(), item.meta.ImpliedNodeFormat, nil)
+		resolvedModule := p.resolver.ResolveModuleName(moduleName, file.FileName(), getModeForUsageLocation(file, meta, entry, p.compilerOptions), nil)
 		resolvedModules = append(resolvedModules, &resolution{node: entry, resolvedModule: resolvedModule})
 	}
 
@@ -447,11 +449,6 @@ func (p *fileLoader) createSyntheticImport(text string, file *ast.SourceFile) *a
 	return externalHelpersModuleReference
 }
 
-type fileWithMetadata struct {
-	file *ast.SourceFile
-	meta *ast.SourceFileMetaData
-}
-
 type resolution struct {
 	node           *ast.Node
 	resolvedModule *module.ResolvedModule
@@ -462,23 +459,23 @@ func (p *fileLoader) getCompilerOptionsForFile(file *ast.SourceFile) *core.Compi
 	return p.compilerOptions
 }
 
-func getModeForTypeReferenceDirectiveInFile(ref *ast.FileReference, item *fileWithMetadata, options *core.CompilerOptions) core.ResolutionMode {
+func getModeForTypeReferenceDirectiveInFile(ref *ast.FileReference, file *ast.SourceFile, meta *ast.SourceFileMetaData, options *core.CompilerOptions) core.ResolutionMode {
 	if ref.ResolutionMode != core.ResolutionModeNone {
 		return ref.ResolutionMode
 	} else {
-		return getDefaultResolutionModeForFile(item, options)
+		return getDefaultResolutionModeForFile(file, meta, options)
 	}
 }
 
-func getDefaultResolutionModeForFile(item *fileWithMetadata, options *core.CompilerOptions) core.ResolutionMode {
+func getDefaultResolutionModeForFile(file *ast.SourceFile, meta *ast.SourceFileMetaData, options *core.CompilerOptions) core.ResolutionMode {
 	if importSyntaxAffectsModuleResolution(options) {
-		return ast.GetImpliedNodeFormatForEmitWorker(item.file.FileName(), options, item.meta)
+		return ast.GetImpliedNodeFormatForEmitWorker(file.FileName(), options, meta)
 	} else {
 		return core.ResolutionModeNone
 	}
 }
 
-func getModeForUsageLocation(item *fileWithMetadata, usage *ast.Node, options *core.CompilerOptions) core.ResolutionMode {
+func getModeForUsageLocation(file *ast.SourceFile, meta *ast.SourceFileMetaData, usage *ast.Node, options *core.CompilerOptions) core.ResolutionMode {
 	if ast.IsImportDeclaration(usage.Parent) || ast.IsExportDeclaration(usage.Parent) || ast.IsJSDocImportTag(usage.Parent) {
 		isTypeOnly := ast.IsExclusivelyTypeOnlyImportOrExport(usage.Parent)
 		if isTypeOnly {
@@ -504,19 +501,19 @@ func getModeForUsageLocation(item *fileWithMetadata, usage *ast.Node, options *c
 	}
 
 	if options != nil && importSyntaxAffectsModuleResolution(options) {
-		return getEmitSyntaxForUsageLocationWorker(item, usage, options)
+		return getEmitSyntaxForUsageLocationWorker(file, meta, usage, options)
 	}
 
 	return core.ResolutionModeNone
 }
 
 func importSyntaxAffectsModuleResolution(options *core.CompilerOptions) bool {
-	moduleResolution := options.ModuleResolution
+	moduleResolution := options.GetModuleResolutionKind()
 	return core.ModuleResolutionKindNode16 <= moduleResolution && moduleResolution <= core.ModuleResolutionKindNodeNext ||
-		options.ResolvePackageJsonExports.IsTrue() || options.ResolvePackageJsonImports.IsTrue()
+		options.GetResolvePackageJsonExports() || options.GetResolvePackageJsonImports()
 }
 
-func getEmitSyntaxForUsageLocationWorker(item *fileWithMetadata, usage *ast.Node, options *core.CompilerOptions) core.ResolutionMode {
+func getEmitSyntaxForUsageLocationWorker(file *ast.SourceFile, meta *ast.SourceFileMetaData, usage *ast.Node, options *core.CompilerOptions) core.ResolutionMode {
 	if options == nil {
 		// This should always be provided, but we try to fail somewhat
 		// gracefully to allow projects like ts-node time to update.
@@ -528,7 +525,7 @@ func getEmitSyntaxForUsageLocationWorker(item *fileWithMetadata, usage *ast.Node
 		return core.ModuleKindCommonJS
 	}
 	if ast.IsImportCall(ast.WalkUpParenthesizedExpressions(usage.Parent)) {
-		if shouldTransformImportCallWorker(item, options) {
+		if shouldTransformImportCallWorker(file, meta, options) {
 			return core.ModuleKindCommonJS
 		} else {
 			return core.ModuleKindESNext
@@ -541,7 +538,7 @@ func getEmitSyntaxForUsageLocationWorker(item *fileWithMetadata, usage *ast.Node
 	// file, until/unless declaration emit can indicate a true ESM import. On the
 	// other hand, writing CJS syntax in a definitely-ESM file is fine, since declaration
 	// emit preserves the CJS syntax.
-	fileEmitMode := ast.GetEmitModuleFormatOfFileWorker(item.file, options, item.meta)
+	fileEmitMode := ast.GetEmitModuleFormatOfFileWorker(file, options, meta)
 	if fileEmitMode == core.ModuleKindCommonJS {
 		return core.ModuleKindCommonJS
 	} else {
@@ -552,10 +549,10 @@ func getEmitSyntaxForUsageLocationWorker(item *fileWithMetadata, usage *ast.Node
 	return core.ModuleKindNone
 }
 
-func shouldTransformImportCallWorker(item *fileWithMetadata, options *core.CompilerOptions) bool {
+func shouldTransformImportCallWorker(file *ast.SourceFile, meta *ast.SourceFileMetaData, options *core.CompilerOptions) bool {
 	moduleKind := options.GetEmitModuleKind()
 	if core.ModuleKindNode16 <= moduleKind && moduleKind <= core.ModuleKindNodeNext || moduleKind == core.ModuleKindPreserve {
 		return false
 	}
-	return ast.GetImpliedNodeFormatForEmitWorker(item.file.FileName(), options, item.meta) < core.ModuleKindES2015
+	return ast.GetImpliedNodeFormatForEmitWorker(file.FileName(), options, meta) < core.ModuleKindES2015
 }
diff --git a/internal/compiler/program.go b/internal/compiler/program.go
index 995d26e8da..90e0197a72 100644
--- a/internal/compiler/program.go
+++ b/internal/compiler/program.go
@@ -318,10 +318,10 @@ func (p *Program) GetTypeCheckerForFile(ctx context.Context, file *ast.SourceFil
 	return p.checkerPool.GetCheckerForFile(ctx, file)
 }
 
-func (p *Program) GetResolvedModule(file *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile {
+func (p *Program) GetResolvedModule(file *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule {
 	if resolutions, ok := p.resolvedModules[file.Path()]; ok {
 		if resolved, ok := resolutions[module.ModeAwareCacheKey{Name: moduleReference, Mode: mode}]; ok {
-			return p.findSourceFile(resolved.ResolvedFileName, FileIncludeReason{FileIncludeKindImport, 0})
+			return resolved
 		}
 	}
 	return nil
@@ -588,6 +588,18 @@ func (p *Program) GetImpliedNodeFormatForEmit(sourceFile *ast.SourceFile) core.R
 	return ast.GetImpliedNodeFormatForEmitWorker(sourceFile.FileName(), p.compilerOptions, p.GetSourceFileMetaData(sourceFile.Path()))
 }
 
+func (p *Program) GetModeForUsageLocation(sourceFile *ast.SourceFile, location *ast.Node) core.ResolutionMode {
+	return getModeForUsageLocation(sourceFile, p.sourceFileMetaDatas[sourceFile.Path()], location, p.compilerOptions)
+}
+
+func (p *Program) GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode {
+	return getDefaultResolutionModeForFile(sourceFile, p.sourceFileMetaDatas[sourceFile.Path()], p.compilerOptions)
+}
+
+func (p *Program) FileExists(fileName string) bool {
+	return p.host.FS().FileExists(fileName)
+}
+
 func (p *Program) CommonSourceDirectory() string {
 	p.commonSourceDirectoryOnce.Do(func() {
 		var files []string
diff --git a/internal/core/compileroptions.go b/internal/core/compileroptions.go
index 7f7cb2dc03..d83c28a9a1 100644
--- a/internal/core/compileroptions.go
+++ b/internal/core/compileroptions.go
@@ -180,15 +180,20 @@ func (options *CompilerOptions) GetModuleResolutionKind() ModuleResolutionKind {
 	}
 }
 
-func (options *CompilerOptions) GetResolutionMode() ResolutionMode {
-	switch options.GetEmitModuleKind() {
-	case ModuleKindCommonJS:
-		return ResolutionModeCommonJS
-	case ModuleKindESNext:
-		return ResolutionModeESM
-	default:
-		return ResolutionModeNone
-	}
+func (options *CompilerOptions) GetResolvePackageJsonExports() bool {
+	return options.ResolvePackageJsonExports.IsTrueOrUnknown()
+}
+
+func (options *CompilerOptions) GetResolvePackageJsonImports() bool {
+	return options.ResolvePackageJsonImports.IsTrueOrUnknown()
+}
+
+func (options *CompilerOptions) GetAllowImportingTsExtensions() bool {
+	return options.AllowImportingTsExtensions.IsTrue() || options.RewriteRelativeImportExtensions.IsTrue()
+}
+
+func (options *CompilerOptions) AllowImportingTsExtensionsFrom(fileName string) bool {
+	return options.GetAllowImportingTsExtensions() || tspath.IsDeclarationFileName(fileName)
 }
 
 func (options *CompilerOptions) GetESModuleInterop() bool {
diff --git a/internal/module/resolver.go b/internal/module/resolver.go
index 741e08860b..beccec03db 100644
--- a/internal/module/resolver.go
+++ b/internal/module/resolver.go
@@ -131,26 +131,17 @@ func (r *Resolver) GetPackageScopeForPath(directory string) *packagejson.InfoCac
 	return (&resolutionState{compilerOptions: r.compilerOptions, resolver: r}).getPackageScopeForPath(directory)
 }
 
-func (r *Resolver) GetPackageJsonTypeIfApplicable(path string) string {
+func (r *Resolver) GetPackageJsonScopeIfApplicable(path string) *packagejson.InfoCacheEntry {
 	if tspath.FileExtensionIsOneOf(path, []string{tspath.ExtensionMts, tspath.ExtensionCts, tspath.ExtensionMjs, tspath.ExtensionCjs}) {
-		return ""
-	}
-
-	var moduleResolutionKind core.ModuleResolutionKind
-	if r.compilerOptions != nil {
-		moduleResolutionKind = r.compilerOptions.GetModuleResolutionKind()
+		return nil
 	}
 
-	var packageJsonType string
-	shouldLookupFromPackageJson := core.ModuleResolutionKindNode16 <= moduleResolutionKind && moduleResolutionKind <= core.ModuleResolutionKindNodeNext || strings.Contains(path, "/node_modules/")
-	if shouldLookupFromPackageJson {
-		packageJsonScope := r.GetPackageScopeForPath(tspath.GetDirectoryPath(path))
-		if packageJsonScope.Exists() {
-			packageJsonType, _ = packageJsonScope.Contents.Type.GetValue()
-		}
+	moduleResolutionKind := r.compilerOptions.GetModuleResolutionKind()
+	if core.ModuleResolutionKindNode16 <= moduleResolutionKind && moduleResolutionKind <= core.ModuleResolutionKindNodeNext || strings.Contains(path, "/node_modules/") {
+		return r.GetPackageScopeForPath(tspath.GetDirectoryPath(path))
 	}
 
-	return packageJsonType
+	return nil
 }
 
 func (r *Resolver) ResolveTypeReferenceDirective(typeReferenceDirectiveName string, containingFile string, resolutionMode core.ResolutionMode, redirectedReference *ResolvedProjectReference) *ResolvedTypeReferenceDirective {
@@ -835,7 +826,7 @@ func (r *resolutionState) loadModuleFromSpecificNodeModulesDirectory(ext extensi
 			r.esmMode {
 			// EsmMode disables index lookup in `loadNodeModuleFromDirectoryWorker` generally, however non-relative package resolutions still assume
 			// a default `index.js` entrypoint if no `main` or `exports` are present
-			if indexResult := r.loadModuleFromFile(extensions, tspath.CombinePaths(candidate, "index"), onlyRecordFailures); !indexResult.shouldContinueSearching() {
+			if indexResult := r.loadModuleFromFile(extensions, tspath.CombinePaths(candidate, "index.js"), onlyRecordFailures); !indexResult.shouldContinueSearching() {
 				indexResult.packageId = r.getPackageId(packageDirectory, packageInfo)
 				return indexResult
 			}
diff --git a/internal/module/util.go b/internal/module/util.go
index 7a5cf4b552..7de9bca7b4 100644
--- a/internal/module/util.go
+++ b/internal/module/util.go
@@ -61,6 +61,10 @@ func UnmangleScopedPackageName(packageName string) string {
 	return packageName
 }
 
+func GetTypesPackageName(packageName string) string {
+	return "@types/" + MangleScopedPackageName(packageName)
+}
+
 func ComparePatternKeys(a, b string) int {
 	aPatternIndex := strings.Index(a, "*")
 	bPatternIndex := strings.Index(b, "*")
diff --git a/internal/transformers/importelision_test.go b/internal/transformers/importelision_test.go
index 9eac8c78f8..869f35eaff 100644
--- a/internal/transformers/importelision_test.go
+++ b/internal/transformers/importelision_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/binder"
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/module"
 	"github.com/microsoft/typescript-go/internal/printer"
 	"github.com/microsoft/typescript-go/internal/testutil/emittestutil"
 	"github.com/microsoft/typescript-go/internal/testutil/parsetestutil"
@@ -19,7 +20,8 @@ type fakeProgram struct {
 	files                       []*ast.SourceFile
 	getEmitModuleFormatOfFile   func(sourceFile *ast.SourceFile) core.ModuleKind
 	getImpliedNodeFormatForEmit func(sourceFile *ast.SourceFile) core.ModuleKind
-	getResolvedModule           func(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile
+	getResolvedModule           func(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule
+	getSourceFile               func(FileName string) *ast.SourceFile
 }
 
 func (p *fakeProgram) Options() *core.CompilerOptions {
@@ -50,10 +52,22 @@ func (p *fakeProgram) GetImpliedNodeFormatForEmit(sourceFile *ast.SourceFile) co
 	return p.getImpliedNodeFormatForEmit(sourceFile)
 }
 
-func (p *fakeProgram) GetResolvedModule(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile {
+func (p *fakeProgram) GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode {
+	return p.getEmitModuleFormatOfFile(sourceFile)
+}
+
+func (p *fakeProgram) GetModeForUsageLocation(sourceFile *ast.SourceFile, location *ast.Node) core.ResolutionMode {
+	return p.getEmitModuleFormatOfFile(sourceFile)
+}
+
+func (p *fakeProgram) GetResolvedModule(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule {
 	return p.getResolvedModule(currentSourceFile, moduleReference, mode)
 }
 
+func (p *fakeProgram) GetSourceFile(FileName string) *ast.SourceFile {
+	return p.getSourceFile(FileName)
+}
+
 func (p *fakeProgram) GetSourceFileMetaData(path tspath.Path) *ast.SourceFileMetaData {
 	return nil
 }
@@ -66,6 +80,14 @@ func (p *fakeProgram) GetJSXRuntimeImportSpecifier(path tspath.Path) (moduleRefe
 	return "", nil
 }
 
+func (p *fakeProgram) FileExists(fileName string) bool {
+	panic("unimplemented")
+}
+
+func (p *fakeProgram) GetResolvedModules() map[tspath.Path]module.ModeAwareCache[*module.ResolvedModule] {
+	panic("unimplemented")
+}
+
 func TestImportElision(t *testing.T) {
 	t.Parallel()
 	data := []struct {
@@ -124,12 +146,21 @@ func TestImportElision(t *testing.T) {
 				getImpliedNodeFormatForEmit: func(sourceFile *ast.SourceFile) core.ModuleKind {
 					return core.ModuleKindESNext
 				},
-				getResolvedModule: func(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *ast.SourceFile {
-					if currentSourceFile == file && moduleReference == "other" {
+				getSourceFile: func(fileName string) *ast.SourceFile {
+					if fileName == "other.ts" {
 						return other
 					}
 					return nil
 				},
+				getResolvedModule: func(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule {
+					if currentSourceFile == file && moduleReference == "other" {
+						return &module.ResolvedModule{
+							ResolvedFileName: "other.ts",
+							Extension:        tspath.ExtensionTs,
+						}
+					}
+					return nil
+				},
 			})
 
 			emitResolver := c.GetEmitResolver(file, false /*skipDiagnostics*/)

From 646a75abf60e74c779a677fd2b8bd9b65534fd73 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Thu, 22 May 2025 15:34:39 -0700
Subject: [PATCH 3/7] Commit baselines

---
 .../allowJsCrossMonorepoPackage.errors.txt    |   6 +-
 ...llowJsCrossMonorepoPackage.errors.txt.diff |   6 +-
 ...eclarationEmitBundlerConditions.errors.txt |  35 -
 ...ationEmitBundlerConditions.errors.txt.diff |  40 -
 .../declarationEmitMonorepoBaseUrl.js         |  12 +-
 .../declarationEmitMonorepoBaseUrl.js.diff    |  20 +-
 ...clarationEmitReusesLambdaParameterNodes.js |   9 +-
 ...tionEmitReusesLambdaParameterNodes.js.diff |  17 +-
 ...ngAlternativeContainingModules1.errors.txt | 242 ------
 ...ernativeContainingModules1.errors.txt.diff | 247 -------
 ...UsingAlternativeContainingModules1.symbols |   2 +
 ...AlternativeContainingModules1.symbols.diff |   2 +
 ...itUsingAlternativeContainingModules1.types |  26 +-
 ...ngAlternativeContainingModules1.types.diff |  37 +-
 ...ngAlternativeContainingModules2.errors.txt | 242 ------
 ...ernativeContainingModules2.errors.txt.diff | 247 -------
 ...UsingAlternativeContainingModules2.symbols |   2 +
 ...AlternativeContainingModules2.symbols.diff |   2 +
 ...itUsingAlternativeContainingModules2.types |  26 +-
 ...ngAlternativeContainingModules2.types.diff |  37 +-
 .../declarationEmitUsingTypeAlias1.js         |   9 +-
 .../declarationEmitUsingTypeAlias1.js.diff    |  19 -
 .../declarationEmitUsingTypeAlias2.js         |   7 +-
 .../declarationEmitUsingTypeAlias2.js.diff    |  15 +-
 .../compiler/dynamicImportsDeclaration.js     |  17 +-
 .../dynamicImportsDeclaration.js.diff         |  29 +-
 ...lpersWithLocalCollisions(module=node16).js |   6 +-
 ...WithLocalCollisions(module=node16).js.diff |   6 +-
 ...ersWithLocalCollisions(module=nodenext).js |   6 +-
 ...thLocalCollisions(module=nodenext).js.diff |   6 +-
 .../compiler/extendsUntypedModule.errors.txt  |   8 +-
 .../extendsUntypedModule.errors.txt.diff      |  10 +-
 .../compiler/jsxClassAttributeResolution.js   |   5 +-
 .../jsxClassAttributeResolution.js.diff       |  13 +-
 .../compiler/modulePreserve2.errors.txt       |  29 -
 .../compiler/modulePreserve2.symbols          |   4 +
 .../compiler/modulePreserve2.symbols.diff     |  13 -
 .../submodule/compiler/modulePreserve2.types  |   6 +-
 .../moduleResolutionNoTsCJS.errors.txt        |  31 +
 .../moduleResolutionNoTsCJS.errors.txt.diff   |  36 -
 .../moduleResolutionNoTsESM.errors.txt        |  31 +
 .../moduleResolutionNoTsESM.errors.txt.diff   |  36 -
 ...tionWithExtensions_notSupported.errors.txt |   8 +-
 ...ithExtensions_notSupported.errors.txt.diff |   9 +-
 ...ionWithExtensions_notSupported3.errors.txt |   8 -
 ...thExtensions_notSupported3.errors.txt.diff |  13 -
 ...(module=node16,moduleresolution=node16).js |  27 +-
 ...le=node16,moduleresolution=node16).js.diff |  34 -
 ...odule=node16,moduleresolution=nodenext).js |  27 +-
 ...=node16,moduleresolution=nodenext).js.diff |  34 -
 ...odule=nodenext,moduleresolution=node16).js |  27 +-
 ...=nodenext,moduleresolution=node16).js.diff |  34 -
 ...ule=nodenext,moduleresolution=nodenext).js |  27 +-
 ...odenext,moduleresolution=nodenext).js.diff |  34 -
 ...on_packageJson_yesAtPackageRoot.errors.txt |  17 -
 ...ckageJson_yesAtPackageRoot.errors.txt.diff |  22 -
 ...AtPackageRoot_fakeScopedPackage.errors.txt |  17 -
 ...kageRoot_fakeScopedPackage.errors.txt.diff |  22 -
 ...Resolution_relativeImportJsFile.errors.txt |  11 -
 ...ution_relativeImportJsFile.errors.txt.diff |  16 -
 ...ativeImportJsFile_noImplicitAny.errors.txt |   4 +-
 ...ImportJsFile_noImplicitAny.errors.txt.diff |  15 -
 ...portModeImplicitIndexResolution.errors.txt |  31 +
 ...odeImplicitIndexResolution.errors.txt.diff |  36 -
 ...tImportModeImplicitIndexResolution.symbols |   2 -
 ...rtModeImplicitIndexResolution.symbols.diff |  13 -
 ...extImportModeImplicitIndexResolution.types |   8 +-
 ...portModeImplicitIndexResolution.types.diff |  17 -
 .../nodeNextModuleResolution1.errors.txt      |  18 +
 .../nodeNextModuleResolution1.errors.txt.diff |  28 +-
 .../compiler/nodeNextModuleResolution1.types  |   2 +-
 .../nodeNextModuleResolution1.types.diff      |  10 -
 .../parseAssertEntriesError.errors.txt        |   4 +-
 .../parseAssertEntriesError.errors.txt.diff   |  20 -
 .../compiler/parseAssertEntriesError.js       |   7 +-
 .../compiler/parseAssertEntriesError.js.diff  |  21 +-
 .../compiler/parseAssertEntriesError.symbols  |   4 +
 .../parseAssertEntriesError.symbols.diff      |  11 -
 .../compiler/parseAssertEntriesError.types    |   5 +-
 .../parseAssertEntriesError.types.diff        |  21 -
 .../parseImportAttributesError.errors.txt     |   4 +-
 ...parseImportAttributesError.errors.txt.diff |  20 -
 .../compiler/parseImportAttributesError.js    |   7 +-
 .../parseImportAttributesError.js.diff        |  21 +-
 .../parseImportAttributesError.symbols        |   4 +
 .../parseImportAttributesError.symbols.diff   |  11 -
 .../compiler/parseImportAttributesError.types |   6 +-
 .../parseImportAttributesError.types.diff     |  22 -
 .../compiler/reactJsxReactResolvedNodeNext.js |   5 +-
 .../reactJsxReactResolvedNodeNext.js.diff     |  13 +-
 .../requireOfJsonFileInJsFile.errors.txt      |   4 +-
 ...ResolveJsonModuleAndPathMapping.errors.txt |   4 +-
 ...ield2(moduleresolution=bundler).errors.txt |  25 +
 ...(moduleresolution=bundler).errors.txt.diff |  37 +-
 ...Field2(moduleresolution=node10).errors.txt |  25 +
 ...2(moduleresolution=node10).errors.txt.diff |  30 -
 ...ext,nouncheckedsideeffectimports=false).js |   8 +-
 ...ouncheckedsideeffectimports=false).js.diff |  14 -
 ...next,nouncheckedsideeffectimports=true).js |   8 +-
 ...nouncheckedsideeffectimports=true).js.diff |  14 -
 ...ncheckedsideeffectimports=true).errors.txt |  16 -
 ...kedsideeffectimports=true).errors.txt.diff |  21 -
 ...ncheckedsideeffectimports=true).errors.txt |  16 -
 ...kedsideeffectimports=true).errors.txt.diff |  21 -
 ...uto,nouncheckedsideeffectimports=false).js |   4 +-
 ...ouncheckedsideeffectimports=false).js.diff |  10 -
 ...auto,nouncheckedsideeffectimports=true).js |   4 +-
 ...nouncheckedsideeffectimports=true).js.diff |  10 -
 ...rce,nouncheckedsideeffectimports=false).js |   4 +-
 ...ouncheckedsideeffectimports=false).js.diff |   5 +-
 ...orce,nouncheckedsideeffectimports=true).js |   4 +-
 ...nouncheckedsideeffectimports=true).js.diff |   5 +-
 ...acy,nouncheckedsideeffectimports=false).js |   4 +-
 ...ouncheckedsideeffectimports=false).js.diff |  10 -
 ...gacy,nouncheckedsideeffectimports=true).js |   4 +-
 ...nouncheckedsideeffectimports=true).js.diff |  10 -
 ...oDirectLinkGeneratesDeepNonrelativeName.js |  30 +-
 ...ctLinkGeneratesDeepNonrelativeName.js.diff |  38 +-
 ...dModuleImport_withAugmentation2.errors.txt |  17 +
 ...leImport_withAugmentation2.errors.txt.diff |  22 -
 .../allowsImportingTsExtension.errors.txt     |  40 +
 ...allowsImportingTsExtension.errors.txt.diff |  45 --
 ...espaceIdentifiers_module(module=node16).js |  49 +-
 ...eIdentifiers_module(module=node16).js.diff |  65 +-
 ...paceIdentifiers_module(module=nodenext).js |  49 +-
 ...dentifiers_module(module=nodenext).js.diff |  65 +-
 ...sextensions=false,noemit=false).errors.txt |  87 +++
 ...tsextensions=false,noemit=true).errors.txt |  87 +++
 ...tsextensions=true,noemit=false).errors.txt |  72 ++
 ...gtsextensions=true,noemit=true).errors.txt |  72 ++
 ...dlerNodeModules1(module=esnext).errors.txt |  12 +-
 ...odeModules1(module=esnext).errors.txt.diff |  17 +-
 .../bundlerNodeModules1(module=esnext).types  |   8 +-
 ...dlerNodeModules1(module=esnext).types.diff |  20 -
 ...erNodeModules1(module=preserve).errors.txt |  12 +-
 ...eModules1(module=preserve).errors.txt.diff |  17 +-
 ...bundlerNodeModules1(module=preserve).types |   8 +-
 ...erNodeModules1(module=preserve).types.diff |  20 -
 ...bundlerRelative1(module=esnext).errors.txt |   5 +-
 ...erRelative1(module=esnext).errors.txt.diff |  22 -
 ...ndlerRelative1(module=preserve).errors.txt |   5 +-
 ...Relative1(module=preserve).errors.txt.diff |  22 -
 .../commonJSAliasedExport.errors.txt          |  21 -
 .../declarationFileForTsJsImport.errors.txt   |  11 +-
 ...clarationFileForTsJsImport.errors.txt.diff |  34 -
 .../declarationFileForTsJsImport.types        |   6 +-
 .../declarationFileForTsJsImport.types.diff   |  19 -
 ...tionNotFoundPackageBundlesTypes.errors.txt |   6 +-
 ...otFoundPackageBundlesTypes.errors.txt.diff |  18 -
 .../decoratorOnClassConstructor2.errors.txt   |  20 +
 ...coratorOnClassConstructor2.errors.txt.diff |  25 -
 .../moduleExportDuplicateAlias.errors.txt     |   4 +-
 .../moduleExportDuplicateAlias2.errors.txt    |   4 +-
 .../moduleExportDuplicateAlias3.errors.txt    |   4 +-
 ...duleResolutionWithoutExtension1.errors.txt |   8 +-
 ...esolutionWithoutExtension1.errors.txt.diff |  21 -
 ...duleResolutionWithoutExtension3.errors.txt |  14 +
 ...esolutionWithoutExtension3.errors.txt.diff |  19 -
 .../moduleResolutionWithoutExtension3.js      |   5 +-
 .../moduleResolutionWithoutExtension3.js.diff |  14 -
 .../moduleResolutionWithoutExtension3.types   |   2 +-
 ...duleResolutionWithoutExtension3.types.diff |   9 -
 ...duleResolutionWithoutExtension4.errors.txt |  14 +
 ...esolutionWithoutExtension4.errors.txt.diff |  19 -
 .../moduleResolutionWithoutExtension4.js      |   5 +-
 .../moduleResolutionWithoutExtension4.js.diff |  14 -
 .../moduleResolutionWithoutExtension4.types   |   2 +-
 ...duleResolutionWithoutExtension4.types.diff |   9 -
 ...duleResolutionWithoutExtension5.errors.txt |   4 +-
 ...esolutionWithoutExtension5.errors.txt.diff |  13 -
 ...duleResolutionWithoutExtension8.errors.txt |   4 +-
 ...esolutionWithoutExtension8.errors.txt.diff |  13 -
 ...sPackageSelfName(module=node16).errors.txt |  24 +
 ...ackageSelfName(module=nodenext).errors.txt |  24 +
 .../nodeModules1(module=node16).errors.txt    | 564 ++++++++++++++
 ...odeModules1(module=node16).errors.txt.diff | 569 --------------
 .../nodeModules1(module=node16).js            |   5 +-
 .../nodeModules1(module=node16).js.diff       |  16 +-
 .../nodeModules1(module=node16).types         | 220 +++---
 .../nodeModules1(module=node16).types.diff    | 425 +----------
 .../nodeModules1(module=nodenext).errors.txt  | 564 ++++++++++++++
 ...eModules1(module=nodenext).errors.txt.diff | 569 --------------
 .../nodeModules1(module=nodenext).js          |   5 +-
 .../nodeModules1(module=nodenext).js.diff     |  16 +-
 .../nodeModules1(module=nodenext).types       | 220 +++---
 .../nodeModules1(module=nodenext).types.diff  | 425 +----------
 ...eModulesAllowJs1(module=node16).errors.txt | 564 ++++++++++++++
 .../nodeModulesAllowJs1(module=node16).types  | 220 +++---
 ...odulesAllowJs1(module=nodenext).errors.txt | 564 ++++++++++++++
 ...nodeModulesAllowJs1(module=nodenext).types | 220 +++---
 ...alPackageExports(module=node16).errors.txt |   8 +-
 ...PackageExports(module=nodenext).errors.txt |   8 +-
 ...JsPackageExports(module=node16).errors.txt | 104 +++
 ...PackageExports(module=nodenext).errors.txt | 104 +++
 ...JsPackageImports(module=node16).errors.txt |  44 ++
 ...PackageImports(module=nodenext).errors.txt |  44 ++
 ...gePatternExports(module=node16).errors.txt |  75 ++
 ...PatternExports(module=nodenext).errors.txt |  75 ++
 ...nExportsTrailers(module=node16).errors.txt |  75 ++
 ...xportsTrailers(module=nodenext).errors.txt |  75 ++
 ...ronousCallErrors(module=node16).errors.txt |  45 ++
 ...nousCallErrors(module=nodenext).errors.txt |  45 ++
 ...esolvingToESM1_emptyPackageJson.errors.txt |  38 +
 ...SResolvingToESM2_cjsPackageJson.errors.txt |  38 +
 ...solvingToESM3_modulePackageJson.errors.txt |  23 +
 ...JSResolvingToESM4_noPackageJson.errors.txt |  35 +
 ...alPackageExports(module=node16).errors.txt |   8 +-
 ...kageExports(module=node16).errors.txt.diff |  15 +-
 ...PackageExports(module=nodenext).errors.txt |   8 +-
 ...geExports(module=nodenext).errors.txt.diff |  15 +-
 ...thPackageExports(module=node16).errors.txt |  21 +-
 ...kageExports(module=node16).errors.txt.diff |  60 +-
 ...PackageExports(module=nodenext).errors.txt |  21 +-
 ...geExports(module=nodenext).errors.txt.diff |  60 +-
 ...cksTypesVersions(module=node16).errors.txt |  12 +-
 ...pesVersions(module=node16).errors.txt.diff |  31 +-
 ...sTypesVersions(module=nodenext).errors.txt |  12 +-
 ...sVersions(module=nodenext).errors.txt.diff |  31 +-
 ...odeModulesForbidenSyntax(module=node16).js |   5 +-
 ...dulesForbidenSyntax(module=node16).js.diff |  16 +-
 ...eModulesForbidenSyntax(module=nodenext).js |   5 +-
 ...lesForbidenSyntax(module=nodenext).js.diff |  16 +-
 ...DeclarationEmit1(module=node16).errors.txt |   8 +-
 ...rationEmit1(module=node16).errors.txt.diff |  15 +-
 ...utesModeDeclarationEmit1(module=node16).js |   3 +-
 ...odeDeclarationEmit1(module=node16).js.diff |   9 +-
 ...odeDeclarationEmit1(module=node16).symbols |   4 +
 ...clarationEmit1(module=node16).symbols.diff |  13 -
 ...sModeDeclarationEmit1(module=node16).types |   7 +-
 ...DeclarationEmit1(module=node16).types.diff |  24 -
 ...clarationEmit1(module=nodenext).errors.txt |   8 +-
 ...tionEmit1(module=nodenext).errors.txt.diff |  15 +-
 ...esModeDeclarationEmit1(module=nodenext).js |   3 +-
 ...eDeclarationEmit1(module=nodenext).js.diff |   9 +-
 ...eDeclarationEmit1(module=nodenext).symbols |   4 +
 ...arationEmit1(module=nodenext).symbols.diff |  13 -
 ...odeDeclarationEmit1(module=nodenext).types |   7 +-
 ...clarationEmit1(module=nodenext).types.diff |  24 -
 ...DeclarationEmit2(module=node16).errors.txt |  14 +-
 ...rationEmit2(module=node16).errors.txt.diff |  22 +-
 ...odeDeclarationEmit2(module=node16).symbols |   6 +-
 ...clarationEmit2(module=node16).symbols.diff |  25 -
 ...sModeDeclarationEmit2(module=node16).types |   7 +-
 ...DeclarationEmit2(module=node16).types.diff |  24 -
 ...clarationEmit2(module=nodenext).errors.txt |  14 +-
 ...tionEmit2(module=nodenext).errors.txt.diff |  21 +-
 ...eDeclarationEmit2(module=nodenext).symbols |   6 +-
 ...arationEmit2(module=nodenext).symbols.diff |  25 -
 ...odeDeclarationEmit2(module=nodenext).types |   7 +-
 ...clarationEmit2(module=nodenext).types.diff |  24 -
 ...odeDeclarationEmitErrors(module=node16).js |   4 +-
 ...clarationEmitErrors(module=node16).js.diff |  10 +-
 ...eDeclarationEmitErrors(module=nodenext).js |   4 +-
 ...arationEmitErrors(module=nodenext).js.diff |  10 +-
 ...eDeclarationEmit(module=node16).errors.txt |  29 -
 ...arationEmit(module=node16).errors.txt.diff |  34 -
 ...sTypeModeDeclarationEmit(module=node16).js |   7 +-
 ...ModeDeclarationEmit(module=node16).js.diff |  15 +-
 ...ModeDeclarationEmit(module=node16).symbols |   6 +
 ...eclarationEmit(module=node16).symbols.diff |  23 -
 ...peModeDeclarationEmit(module=node16).types |  11 +-
 ...eDeclarationEmit(module=node16).types.diff |  22 +-
 ...eclarationEmit(module=nodenext).errors.txt |  29 -
 ...ationEmit(module=nodenext).errors.txt.diff |  34 -
 ...ypeModeDeclarationEmit(module=nodenext).js |   7 +-
 ...deDeclarationEmit(module=nodenext).js.diff |  15 +-
 ...deDeclarationEmit(module=nodenext).symbols |   6 +
 ...larationEmit(module=nodenext).symbols.diff |  23 -
 ...ModeDeclarationEmit(module=nodenext).types |  11 +-
 ...eclarationEmit(module=nodenext).types.diff |  22 +-
 ...rationEmitErrors(module=node16).errors.txt |  20 +-
 ...nEmitErrors(module=node16).errors.txt.diff |  87 ---
 ...odeDeclarationEmitErrors(module=node16).js |  48 +-
 ...clarationEmitErrors(module=node16).js.diff |  75 +-
 ...clarationEmitErrors(module=node16).symbols |   2 +
 ...tionEmitErrors(module=node16).symbols.diff |  18 +-
 ...DeclarationEmitErrors(module=node16).types |  14 +-
 ...rationEmitErrors(module=node16).types.diff |  46 +-
 ...tionEmitErrors(module=nodenext).errors.txt |  20 +-
 ...mitErrors(module=nodenext).errors.txt.diff |  87 ---
 ...eDeclarationEmitErrors(module=nodenext).js |  48 +-
 ...arationEmitErrors(module=nodenext).js.diff |  75 +-
 ...arationEmitErrors(module=nodenext).symbols |   2 +
 ...onEmitErrors(module=nodenext).symbols.diff |  18 +-
 ...clarationEmitErrors(module=nodenext).types |  14 +-
 ...tionEmitErrors(module=nodenext).types.diff |  46 +-
 ...DeclarationEmit1(module=node16).errors.txt |   8 +-
 ...rationEmit1(module=node16).errors.txt.diff |  15 +-
 ...portModeDeclarationEmit1(module=node16).js |   3 +-
 ...odeDeclarationEmit1(module=node16).js.diff |   9 +-
 ...odeDeclarationEmit1(module=node16).symbols |   4 +
 ...clarationEmit1(module=node16).symbols.diff |  13 -
 ...tModeDeclarationEmit1(module=node16).types |   7 +-
 ...DeclarationEmit1(module=node16).types.diff |  24 -
 ...clarationEmit1(module=nodenext).errors.txt |   8 +-
 ...tionEmit1(module=nodenext).errors.txt.diff |  15 +-
 ...rtModeDeclarationEmit1(module=nodenext).js |   3 +-
 ...eDeclarationEmit1(module=nodenext).js.diff |   9 +-
 ...eDeclarationEmit1(module=nodenext).symbols |   4 +
 ...arationEmit1(module=nodenext).symbols.diff |  13 -
 ...odeDeclarationEmit1(module=nodenext).types |   7 +-
 ...clarationEmit1(module=nodenext).types.diff |  24 -
 ...DeclarationEmit2(module=node16).errors.txt |  14 +-
 ...rationEmit2(module=node16).errors.txt.diff |  22 +-
 ...odeDeclarationEmit2(module=node16).symbols |   6 +-
 ...clarationEmit2(module=node16).symbols.diff |  25 -
 ...tModeDeclarationEmit2(module=node16).types |   7 +-
 ...DeclarationEmit2(module=node16).types.diff |  24 -
 ...clarationEmit2(module=nodenext).errors.txt |  14 +-
 ...tionEmit2(module=nodenext).errors.txt.diff |  21 +-
 ...eDeclarationEmit2(module=nodenext).symbols |   6 +-
 ...arationEmit2(module=nodenext).symbols.diff |  25 -
 ...odeDeclarationEmit2(module=nodenext).types |   7 +-
 ...clarationEmit2(module=nodenext).types.diff |  24 -
 ...deDeclarationEmitErrors1(module=node16).js |   4 +-
 ...larationEmitErrors1(module=node16).js.diff |  10 +-
 ...DeclarationEmitErrors1(module=nodenext).js |   4 +-
 ...rationEmitErrors1(module=nodenext).js.diff |  10 +-
 ...DeclarationEmit1(module=node16).errors.txt |  29 -
 ...rationEmit1(module=node16).errors.txt.diff |  34 -
 ...TypeModeDeclarationEmit1(module=node16).js |   7 +-
 ...odeDeclarationEmit1(module=node16).js.diff |  15 +-
 ...odeDeclarationEmit1(module=node16).symbols |   6 +
 ...clarationEmit1(module=node16).symbols.diff |  23 -
 ...eModeDeclarationEmit1(module=node16).types |  11 +-
 ...DeclarationEmit1(module=node16).types.diff |  22 +-
 ...clarationEmit1(module=nodenext).errors.txt |  29 -
 ...tionEmit1(module=nodenext).errors.txt.diff |  34 -
 ...peModeDeclarationEmit1(module=nodenext).js |   7 +-
 ...eDeclarationEmit1(module=nodenext).js.diff |  15 +-
 ...eDeclarationEmit1(module=nodenext).symbols |   6 +
 ...arationEmit1(module=nodenext).symbols.diff |  23 -
 ...odeDeclarationEmit1(module=nodenext).types |  11 +-
 ...clarationEmit1(module=nodenext).types.diff |  22 +-
 ...ationEmitErrors1(module=node16).errors.txt |  20 +-
 ...EmitErrors1(module=node16).errors.txt.diff |  87 ---
 ...deDeclarationEmitErrors1(module=node16).js |  48 +-
 ...larationEmitErrors1(module=node16).js.diff |  75 +-
 ...larationEmitErrors1(module=node16).symbols |   2 +
 ...ionEmitErrors1(module=node16).symbols.diff |  18 +-
 ...eclarationEmitErrors1(module=node16).types |  14 +-
 ...ationEmitErrors1(module=node16).types.diff |  46 +-
 ...ionEmitErrors1(module=nodenext).errors.txt |  20 +-
 ...itErrors1(module=nodenext).errors.txt.diff |  87 ---
 ...DeclarationEmitErrors1(module=nodenext).js |  48 +-
 ...rationEmitErrors1(module=nodenext).js.diff |  75 +-
 ...rationEmitErrors1(module=nodenext).symbols |   2 +
 ...nEmitErrors1(module=nodenext).symbols.diff |  18 +-
 ...larationEmitErrors1(module=nodenext).types |  14 +-
 ...ionEmitErrors1(module=nodenext).types.diff |  46 +-
 ...esPackageExports(module=node16).errors.txt | 104 +++
 ...kageExports(module=node16).errors.txt.diff | 127 +---
 ...PackageExports(module=nodenext).errors.txt | 104 +++
 ...geExports(module=nodenext).errors.txt.diff | 127 +---
 ...esPackageImports(module=node16).errors.txt |  44 ++
 ...kageImports(module=node16).errors.txt.diff |  49 --
 ...PackageImports(module=nodenext).errors.txt |  44 ++
 ...geImports(module=nodenext).errors.txt.diff |  49 --
 ...gePatternExports(module=node16).errors.txt |  75 ++
 ...ternExports(module=node16).errors.txt.diff |  93 +--
 ...PatternExports(module=nodenext).errors.txt |  75 ++
 ...rnExports(module=nodenext).errors.txt.diff |  93 +--
 ...rnExportsExclude(module=node16).errors.txt |  15 +-
 ...ortsExclude(module=node16).errors.txt.diff |  59 +-
 ...ExportsExclude(module=nodenext).errors.txt |  15 +-
 ...tsExclude(module=nodenext).errors.txt.diff |  59 +-
 ...nExportsTrailers(module=node16).errors.txt |  75 ++
 ...rtsTrailers(module=node16).errors.txt.diff |  93 +--
 ...xportsTrailers(module=nodenext).errors.txt |  75 ++
 ...sTrailers(module=nodenext).errors.txt.diff |  93 +--
 ...ronousCallErrors(module=node16).errors.txt |  45 ++
 ...sCallErrors(module=node16).errors.txt.diff |  50 --
 ...nousCallErrors(module=nodenext).errors.txt |  45 ++
 ...allErrors(module=nodenext).errors.txt.diff |  50 --
 ...enceModeDeclarationEmit1(module=node16).js |   3 +-
 ...odeDeclarationEmit1(module=node16).js.diff |  10 +-
 ...ceModeDeclarationEmit1(module=nodenext).js |   3 +-
 ...eDeclarationEmit1(module=nodenext).js.diff |  10 +-
 ...DeclarationEmit2(module=node16).errors.txt |  32 -
 ...rationEmit2(module=node16).errors.txt.diff |  37 -
 ...odeDeclarationEmit2(module=node16).symbols |   9 +-
 ...clarationEmit2(module=node16).symbols.diff |  19 +-
 ...eModeDeclarationEmit2(module=node16).types |   4 +-
 ...DeclarationEmit2(module=node16).types.diff |  15 -
 ...clarationEmit2(module=nodenext).errors.txt |  32 -
 ...tionEmit2(module=nodenext).errors.txt.diff |  37 -
 ...eDeclarationEmit2(module=nodenext).symbols |   9 +-
 ...arationEmit2(module=nodenext).symbols.diff |  19 +-
 ...odeDeclarationEmit2(module=nodenext).types |   4 +-
 ...clarationEmit2(module=nodenext).types.diff |  15 -
 ...DeclarationEmit4(module=node16).errors.txt |  27 -
 ...rationEmit4(module=node16).errors.txt.diff |  32 -
 ...enceModeDeclarationEmit4(module=node16).js |   3 +-
 ...odeDeclarationEmit4(module=node16).js.diff |  10 +-
 ...odeDeclarationEmit4(module=node16).symbols |   9 +-
 ...clarationEmit4(module=node16).symbols.diff |  19 +-
 ...eModeDeclarationEmit4(module=node16).types |   4 +-
 ...DeclarationEmit4(module=node16).types.diff |  15 -
 ...clarationEmit4(module=nodenext).errors.txt |  27 -
 ...tionEmit4(module=nodenext).errors.txt.diff |  32 -
 ...ceModeDeclarationEmit4(module=nodenext).js |   3 +-
 ...eDeclarationEmit4(module=nodenext).js.diff |  10 +-
 ...eDeclarationEmit4(module=nodenext).symbols |   9 +-
 ...arationEmit4(module=nodenext).symbols.diff |  19 +-
 ...odeDeclarationEmit4(module=nodenext).types |   4 +-
 ...clarationEmit4(module=nodenext).types.diff |  15 -
 ...DeclarationEmit5(module=node16).errors.txt |  28 -
 ...rationEmit5(module=node16).errors.txt.diff |  33 -
 ...enceModeDeclarationEmit5(module=node16).js |   3 +-
 ...odeDeclarationEmit5(module=node16).js.diff |   9 +-
 ...odeDeclarationEmit5(module=node16).symbols |   9 +
 ...clarationEmit5(module=node16).symbols.diff |  23 +-
 ...eModeDeclarationEmit5(module=node16).types |   7 +
 ...DeclarationEmit5(module=node16).types.diff |  16 -
 ...clarationEmit5(module=nodenext).errors.txt |  28 -
 ...tionEmit5(module=nodenext).errors.txt.diff |  33 -
 ...ceModeDeclarationEmit5(module=nodenext).js |   3 +-
 ...eDeclarationEmit5(module=nodenext).js.diff |   9 +-
 ...eDeclarationEmit5(module=nodenext).symbols |   9 +
 ...arationEmit5(module=nodenext).symbols.diff |  23 +-
 ...odeDeclarationEmit5(module=nodenext).types |   7 +
 ...clarationEmit5(module=nodenext).types.diff |  16 -
 ...enceModeDeclarationEmit6(module=node16).js |  13 +-
 ...odeDeclarationEmit6(module=node16).js.diff |  23 +-
 ...ceModeDeclarationEmit6(module=nodenext).js |  13 +-
 ...eDeclarationEmit6(module=nodenext).js.diff |  23 +-
 ...DeclarationEmit7(module=node16).errors.txt |   6 +-
 ...rationEmit7(module=node16).errors.txt.diff |   6 +-
 ...odeDeclarationEmit7(module=node16).symbols |  16 +-
 ...clarationEmit7(module=node16).symbols.diff |  37 +-
 ...eModeDeclarationEmit7(module=node16).types |  23 +-
 ...DeclarationEmit7(module=node16).types.diff |  40 +-
 ...clarationEmit7(module=nodenext).errors.txt |   6 +-
 ...tionEmit7(module=nodenext).errors.txt.diff |   6 +-
 ...eDeclarationEmit7(module=nodenext).symbols |  16 +-
 ...arationEmit7(module=nodenext).symbols.diff |  37 +-
 ...odeDeclarationEmit7(module=nodenext).types |  23 +-
 ...clarationEmit7(module=nodenext).types.diff |  40 +-
 ...shReferenceModeOverride1(module=node16).js |   3 +-
 ...erenceModeOverride1(module=node16).js.diff |  12 -
 ...ReferenceModeOverride1(module=nodenext).js |   3 +-
 ...enceModeOverride1(module=nodenext).js.diff |  12 -
 ...nceModeOverride2(module=node16).errors.txt |   6 +-
 ...deOverride2(module=node16).errors.txt.diff |  18 -
 ...erenceModeOverride2(module=node16).symbols |  12 +-
 ...eModeOverride2(module=node16).symbols.diff |  24 -
 ...eferenceModeOverride2(module=node16).types |  10 +-
 ...nceModeOverride2(module=node16).types.diff |  25 -
 ...eModeOverride2(module=nodenext).errors.txt |   6 +-
 ...Override2(module=nodenext).errors.txt.diff |  18 -
 ...enceModeOverride2(module=nodenext).symbols |  12 +-
 ...odeOverride2(module=nodenext).symbols.diff |  24 -
 ...erenceModeOverride2(module=nodenext).types |  10 +-
 ...eModeOverride2(module=nodenext).types.diff |  25 -
 ...nceModeOverride4(module=node16).errors.txt |   6 +-
 ...deOverride4(module=node16).errors.txt.diff |  18 -
 ...shReferenceModeOverride4(module=node16).js |   3 +-
 ...erenceModeOverride4(module=node16).js.diff |  12 -
 ...erenceModeOverride4(module=node16).symbols |  12 +-
 ...eModeOverride4(module=node16).symbols.diff |  24 -
 ...eferenceModeOverride4(module=node16).types |  10 +-
 ...nceModeOverride4(module=node16).types.diff |  25 -
 ...eModeOverride4(module=nodenext).errors.txt |   6 +-
 ...Override4(module=nodenext).errors.txt.diff |  18 -
 ...ReferenceModeOverride4(module=nodenext).js |   3 +-
 ...enceModeOverride4(module=nodenext).js.diff |  12 -
 ...enceModeOverride4(module=nodenext).symbols |  12 +-
 ...odeOverride4(module=nodenext).symbols.diff |  24 -
 ...erenceModeOverride4(module=nodenext).types |  10 +-
 ...eModeOverride4(module=nodenext).types.diff |  25 -
 ...nceModeOverride5(module=node16).errors.txt |  32 -
 ...deOverride5(module=node16).errors.txt.diff |  37 -
 ...shReferenceModeOverride5(module=node16).js |   3 +-
 ...erenceModeOverride5(module=node16).js.diff |  15 -
 ...erenceModeOverride5(module=node16).symbols |  10 +
 ...eModeOverride5(module=node16).symbols.diff |  23 -
 ...eferenceModeOverride5(module=node16).types |  10 +-
 ...nceModeOverride5(module=node16).types.diff |  24 -
 ...eModeOverride5(module=nodenext).errors.txt |  32 -
 ...Override5(module=nodenext).errors.txt.diff |  37 -
 ...ReferenceModeOverride5(module=nodenext).js |   3 +-
 ...enceModeOverride5(module=nodenext).js.diff |  15 -
 ...enceModeOverride5(module=nodenext).symbols |  10 +
 ...odeOverride5(module=nodenext).symbols.diff |  23 -
 ...erenceModeOverride5(module=nodenext).types |  10 +-
 ...eModeOverride5(module=nodenext).types.diff |  24 -
 ...nceModeOverrideModeError(module=node16).js |   3 +-
 ...deOverrideModeError(module=node16).js.diff |  12 -
 ...eModeOverrideModeError(module=nodenext).js |   3 +-
 ...OverrideModeError(module=nodenext).js.diff |  12 -
 ...eModeOverrideOldResolutionError.errors.txt |  30 -
 ...OverrideOldResolutionError.errors.txt.diff |  35 -
 ...enceModeOverrideOldResolutionError.symbols |  10 +
 ...odeOverrideOldResolutionError.symbols.diff |  23 -
 ...erenceModeOverrideOldResolutionError.types |  10 +-
 ...eModeOverrideOldResolutionError.types.diff |  24 -
 ...ePackageSelfName(module=node16).errors.txt |  24 +
 ...ageSelfName(module=node16).errors.txt.diff |  29 -
 ...ackageSelfName(module=nodenext).errors.txt |  24 +
 ...eSelfName(module=nodenext).errors.txt.diff |  29 -
 ...geSelfNameScoped(module=node16).errors.txt |  24 +
 ...fNameScoped(module=node16).errors.txt.diff |  29 -
 ...SelfNameScoped(module=nodenext).errors.txt |  24 +
 ...ameScoped(module=nodenext).errors.txt.diff |  29 -
 .../conformance/packageJsonMain.errors.txt    |  35 -
 .../packageJsonMain.errors.txt.diff           |  40 -
 ...ortType1(moduleresolution=bundler).symbols |   4 +-
 ...pe1(moduleresolution=bundler).symbols.diff |  16 -
 ...mportType1(moduleresolution=bundler).types |   4 +-
 ...Type1(moduleresolution=bundler).types.diff |   9 +-
 ...ortType1(moduleresolution=classic).symbols |   4 +-
 ...pe1(moduleresolution=classic).symbols.diff |   4 +-
 ...mportType1(moduleresolution=classic).types |   4 +-
 ...Type1(moduleresolution=classic).types.diff |   4 +-
 ...portType1(moduleresolution=node10).symbols |   4 +-
 ...ype1(moduleresolution=node10).symbols.diff |   7 +-
 ...ImportType1(moduleresolution=node10).types |   4 +-
 ...tType1(moduleresolution=node10).types.diff |   7 +-
 .../resolutionModeTripleSlash1.errors.txt     |   7 +-
 ...resolutionModeTripleSlash1.errors.txt.diff |  21 -
 .../resolutionModeTripleSlash3.errors.txt     |   7 +-
 ...resolutionModeTripleSlash3.errors.txt.diff |  21 -
 .../resolutionModeTripleSlash4.errors.txt     |   7 +-
 ...resolutionModeTripleSlash4.errors.txt.diff |  17 +-
 .../resolutionModeTripleSlash5.errors.txt     |   7 +-
 ...resolutionModeTripleSlash5.errors.txt.diff |  21 -
 ...yImport1(moduleresolution=bundler).symbols |   4 +-
 ...rt1(moduleresolution=bundler).symbols.diff |   4 +-
 ...nlyImport1(moduleresolution=bundler).types |  12 +-
 ...port1(moduleresolution=bundler).types.diff |  33 -
 ...yImport1(moduleresolution=classic).symbols |   4 +-
 ...rt1(moduleresolution=classic).symbols.diff |   4 +-
 ...nlyImport1(moduleresolution=classic).types |  12 +-
 ...port1(moduleresolution=classic).types.diff |  12 +-
 ...lyImport1(moduleresolution=node10).symbols |   4 +-
 ...ort1(moduleresolution=node10).symbols.diff |   4 +-
 ...OnlyImport1(moduleresolution=node10).types |  12 +-
 ...mport1(moduleresolution=node10).types.diff |  19 +-
 ...stic1(moduleresolution=bundler).errors.txt |  72 ++
 ...(moduleresolution=bundler).errors.txt.diff |  85 +--
 ...ostic1(moduleresolution=node16).errors.txt |  72 ++
 ...1(moduleresolution=node16).errors.txt.diff |  85 +--
 .../typeOnlyESMImportFromCJS.errors.txt       |  19 +
 .../typeOnlyESMImportFromCJS.errors.txt.diff  |  24 -
 .../untypedModuleImport.errors.txt            |  28 -
 .../untypedModuleImport.errors.txt.diff       |  33 -
 ...typedModuleImport_noImplicitAny.errors.txt |   6 +-
 ...ModuleImport_noImplicitAny.errors.txt.diff |  17 -
 ...port_noImplicitAny_relativePath.errors.txt |   4 +-
 ...noImplicitAny_relativePath.errors.txt.diff |  15 -
 ...duleImport_noImplicitAny_scoped.errors.txt |   6 +-
 ...mport_noImplicitAny_scoped.errors.txt.diff |  17 -
 ...mplicitAny_typesForPackageExist.errors.txt |  24 +-
 ...itAny_typesForPackageExist.errors.txt.diff |  43 --
 ...edModuleImport_withAugmentation.errors.txt |   9 +-
 ...uleImport_withAugmentation.errors.txt.diff |  22 -
 .../compiler/modulePreserve2.errors.txt.diff  |  34 -
 .../compiler/modulePreserve2.types.diff       |  22 -
 .../requireOfJsonFileInJsFile.errors.txt.diff |   4 +-
 ...veJsonModuleAndPathMapping.errors.txt.diff |  17 -
 ...nsions=false,noemit=false).errors.txt.diff | 117 +--
 ...ensions=false,noemit=true).errors.txt.diff | 117 +--
 ...ensions=true,noemit=false).errors.txt.diff |  97 +--
 ...tensions=true,noemit=true).errors.txt.diff |  97 +--
 .../commonJSAliasedExport.errors.txt.diff     |  26 -
 ...moduleExportDuplicateAlias.errors.txt.diff |   4 +-
 ...oduleExportDuplicateAlias2.errors.txt.diff |   4 +-
 ...oduleExportDuplicateAlias3.errors.txt.diff |   4 +-
 ...ageSelfName(module=node16).errors.txt.diff |  34 +-
 ...eSelfName(module=nodenext).errors.txt.diff |  34 +-
 ...lesAllowJs1(module=node16).errors.txt.diff | 696 ++++--------------
 ...eModulesAllowJs1(module=node16).types.diff | 425 +----------
 ...sAllowJs1(module=nodenext).errors.txt.diff | 696 ++++--------------
 ...odulesAllowJs1(module=nodenext).types.diff | 425 +----------
 ...kageExports(module=node16).errors.txt.diff |  15 +-
 ...geExports(module=nodenext).errors.txt.diff |  15 +-
 ...kageExports(module=node16).errors.txt.diff | 127 +---
 ...geExports(module=nodenext).errors.txt.diff | 127 +---
 ...kageImports(module=node16).errors.txt.diff |  55 +-
 ...geImports(module=nodenext).errors.txt.diff |  55 +-
 ...ternExports(module=node16).errors.txt.diff |  93 +--
 ...rnExports(module=nodenext).errors.txt.diff |  93 +--
 ...rtsTrailers(module=node16).errors.txt.diff |  93 +--
 ...sTrailers(module=nodenext).errors.txt.diff |  93 +--
 ...sCallErrors(module=node16).errors.txt.diff |  80 +-
 ...allErrors(module=nodenext).errors.txt.diff |  80 +-
 ...ingToESM1_emptyPackageJson.errors.txt.diff |  43 --
 ...lvingToESM2_cjsPackageJson.errors.txt.diff |  43 --
 ...ngToESM3_modulePackageJson.errors.txt.diff |  28 -
 ...olvingToESM4_noPackageJson.errors.txt.diff |  40 -
 590 files changed, 7579 insertions(+), 14125 deletions(-)
 delete mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/modulePreserve2.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsCJS.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsCJS.errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsESM.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsESM.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported3.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported3.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=node16).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.types.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/parseImportAttributesError.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js.diff
 create mode 100644 testdata/baselines/reference/submodule/compiler/untypedModuleImport_withAugmentation2.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/untypedModuleImport_withAugmentation2.errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=esnext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=preserve).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/declarationNotFoundPackageBundlesTypes.errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/decoratorOnClassConstructor2.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/decoratorOnClassConstructor2.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension1.errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension5.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension8.errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node16).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=nodenext).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node16).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=node16).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node16).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=nodenext).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node16).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node16).errors.txt.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=nodenext).errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/packageJsonMain.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/packageJsonMain.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash1.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash3.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).types.diff
 create mode 100644 testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt
 create mode 100644 testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/untypedModuleImport.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/untypedModuleImport.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_relativePath.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_scoped.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/untypedModuleImport_withAugmentation.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve2.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve2.types.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/commonJSAliasedExport.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt.diff

diff --git a/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.errors.txt b/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.errors.txt
index c65aa2ff7c..aa8d24f0dc 100644
--- a/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.errors.txt
@@ -1,4 +1,5 @@
-/packages/main/index.ts(1,19): error TS2307: Cannot find module 'shared' or its corresponding type declarations.
+/packages/main/index.ts(1,19): error TS7016: Could not find a declaration file for module 'shared'. '/packages/shared/index.js' implicitly has an 'any' type.
+  Try `npm i --save-dev @types/shared` if it exists or add a new declaration (.d.ts) file containing `declare module 'shared';`
 
 
 ==== /packages/main/tsconfig.json (0 errors) ====
@@ -17,7 +18,8 @@
 ==== /packages/main/index.ts (1 errors) ====
     import { x } from "shared";
                       ~~~~~~~~
-!!! error TS2307: Cannot find module 'shared' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'shared'. '/packages/shared/index.js' implicitly has an 'any' type.
+!!! error TS7016:   Try `npm i --save-dev @types/shared` if it exists or add a new declaration (.d.ts) file containing `declare module 'shared';`
     
 ==== /node_modules/pkg/index.d.ts (0 errors) ====
     export declare function pkg(): "pkg";
diff --git a/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.errors.txt.diff
index 64e06adc39..17e59805d1 100644
--- a/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.errors.txt.diff
@@ -3,7 +3,8 @@
 @@= skipped -0, +-1 lines =@@
 -<no content>
 @@= skipped --1, +1 lines =@@
-+/packages/main/index.ts(1,19): error TS2307: Cannot find module 'shared' or its corresponding type declarations.
++/packages/main/index.ts(1,19): error TS7016: Could not find a declaration file for module 'shared'. '/packages/shared/index.js' implicitly has an 'any' type.
++  Try `npm i --save-dev @types/shared` if it exists or add a new declaration (.d.ts) file containing `declare module 'shared';`
 +
 +
 +==== /packages/main/tsconfig.json (0 errors) ====
@@ -22,7 +23,8 @@
 +==== /packages/main/index.ts (1 errors) ====
 +    import { x } from "shared";
 +                      ~~~~~~~~
-+!!! error TS2307: Cannot find module 'shared' or its corresponding type declarations.
++!!! error TS7016: Could not find a declaration file for module 'shared'. '/packages/shared/index.js' implicitly has an 'any' type.
++!!! error TS7016:   Try `npm i --save-dev @types/shared` if it exists or add a new declaration (.d.ts) file containing `declare module 'shared';`
 +    
 +==== /node_modules/pkg/index.d.ts (0 errors) ====
 +    export declare function pkg(): "pkg";
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt
deleted file mode 100644
index 5b318a29fa..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-/makeC.ts(1,10): error TS2305: Module '"/node_modules/pkg/index"' has no exported member 'C'.
-
-
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-      "name": "pkg",
-      "type": "module",
-      "exports": {
-        ".": {
-          "import": "./index.js",
-          "require": "./index.cjs"
-        }
-      }
-    }
-    
-==== /node_modules/pkg/index.d.ts (0 errors) ====
-    export declare class C {
-      private p;
-    }
-    
-==== /node_modules/pkg/index.d.cts (0 errors) ====
-    export {};
-    
-==== /makeC.ts (1 errors) ====
-    import { C } from "pkg";
-             ~
-!!! error TS2305: Module '"/node_modules/pkg/index"' has no exported member 'C'.
-    export function makeC() {
-      return new C();
-    }
-    
-==== /index.ts (0 errors) ====
-    import { makeC } from "./makeC";
-    export const c = makeC();
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff
deleted file mode 100644
index c563a98e47..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- old.declarationEmitBundlerConditions.errors.txt
-+++ new.declarationEmitBundlerConditions.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/makeC.ts(1,10): error TS2305: Module '"/node_modules/pkg/index"' has no exported member 'C'.
-+
-+
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+      "name": "pkg",
-+      "type": "module",
-+      "exports": {
-+        ".": {
-+          "import": "./index.js",
-+          "require": "./index.cjs"
-+        }
-+      }
-+    }
-+    
-+==== /node_modules/pkg/index.d.ts (0 errors) ====
-+    export declare class C {
-+      private p;
-+    }
-+    
-+==== /node_modules/pkg/index.d.cts (0 errors) ====
-+    export {};
-+    
-+==== /makeC.ts (1 errors) ====
-+    import { C } from "pkg";
-+             ~
-+!!! error TS2305: Module '"/node_modules/pkg/index"' has no exported member 'C'.
-+    export function makeC() {
-+      return new C();
-+    }
-+    
-+==== /index.ts (0 errors) ====
-+    import { makeC } from "./makeC";
-+    export const c = makeC();
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js b/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js
index 04f584e43b..79772f880b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js
@@ -44,9 +44,13 @@ export function resolveParserPlugins() {
 
 
 //// [index.js]
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
-import { createPlugin } from "@babel/parser";
-export function resolveParserPlugins() {
-    return [createPlugin()];
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveParserPlugins = resolveParserPlugins;
+const parser_1 = require("@babel/parser");
+function resolveParserPlugins() {
+    return [(0, parser_1.createPlugin)()];
 }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js.diff
index 4c4ee41a72..9e23ba48b9 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js.diff
@@ -1,22 +1,8 @@
 --- old.declarationEmitMonorepoBaseUrl.js
 +++ new.declarationEmitMonorepoBaseUrl.js
-@@= skipped -43, +43 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
-+export {};
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.resolveParserPlugins = resolveParserPlugins;
--const parser_1 = require("@babel/parser");
--function resolveParserPlugins() {
--    return [(0, parser_1.createPlugin)()];
-+import { createPlugin } from "@babel/parser";
-+export function resolveParserPlugins() {
-+    return [createPlugin()];
+@@= skipped -53, +53 lines =@@
+ function resolveParserPlugins() {
+     return [(0, parser_1.createPlugin)()];
  }
 -
 -
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.js b/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.js
index 2e6846e9f2..15bcfc1772 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.js
@@ -12,5 +12,10 @@ export function CustomSelect2<Option,>(x: Props<Option> & {}) {}
 
 
 //// [index.js]
-export const CustomSelect1 = (x) => { };
-export function CustomSelect2(x) { }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomSelect1 = void 0;
+exports.CustomSelect2 = CustomSelect2;
+const CustomSelect1 = (x) => { };
+exports.CustomSelect1 = CustomSelect1;
+function CustomSelect2(x) { }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.js.diff
index dcd636ffbd..a69a574dec 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReusesLambdaParameterNodes.js.diff
@@ -1,21 +1,12 @@
 --- old.declarationEmitReusesLambdaParameterNodes.js
 +++ new.declarationEmitReusesLambdaParameterNodes.js
-@@= skipped -11, +11 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.CustomSelect1 = void 0;
--exports.CustomSelect2 = CustomSelect2;
--const CustomSelect1 = (x) => { };
--exports.CustomSelect1 = CustomSelect1;
--function CustomSelect2(x) { }
+@@= skipped -18, +18 lines =@@
+ const CustomSelect1 = (x) => { };
+ exports.CustomSelect1 = CustomSelect1;
+ function CustomSelect2(x) { }
 -
 -
 -//// [index.d.ts]
 -import { Props } from "react-select";
 -export declare const CustomSelect1: <Option>(x: Props<Option> & {}) => void;
 -export declare function CustomSelect2<Option>(x: Props<Option> & {}): void;
-+export const CustomSelect1 = (x) => { };
-+export function CustomSelect2(x) { }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt
deleted file mode 100644
index 99bd75b978..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-src/index.mts(1,26): error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-src/index.mts(33,14): error TS7006: Parameter 'data' implicitly has an 'any' type.
-
-
-==== node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.d.ts (0 errors) ====
-    type QueryKey = ReadonlyArray<unknown>;
-    
-    interface Register {}
-    
-    type DefaultError = Register extends {
-      defaultError: infer TError;
-    }
-      ? TError
-      : Error;
-    
-    type ShouldRetryFunction<TError = DefaultError> = (
-      failureCount: number,
-      error: TError,
-    ) => boolean;
-    type RetryValue<TError> = boolean | number | ShouldRetryFunction<TError>;
-    
-    type QueryFunctionContext<
-      TQueryKey extends QueryKey = QueryKey,
-      TPageParam = never,
-    > = [TPageParam] extends [never]
-      ? {
-          queryKey: TQueryKey;
-        }
-      : {
-          queryKey: TQueryKey;
-          pageParam: TPageParam;
-        };
-    
-    type QueryFunction<
-      T = unknown,
-      TQueryKey extends QueryKey = QueryKey,
-      TPageParam = never,
-    > = (context: QueryFunctionContext<TQueryKey, TPageParam>) => T | Promise<T>;
-    
-    interface QueryOptions<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-      TPageParam = never,
-    > {
-      retry?: RetryValue<TError>;
-      queryFn?: QueryFunction<TQueryFnData, TQueryKey, TPageParam>;
-      queryKey?: TQueryKey;
-      initialData?: TData;
-      initialDataUpdatedAt?: number | (() => number | undefined);
-    }
-    
-    interface QueryObserverOptions<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-      TPageParam = never,
-    > extends QueryOptions<
-        TQueryFnData,
-        TError,
-        TQueryData,
-        TQueryKey,
-        TPageParam
-      > {
-      enabled?: boolean;
-      refetchInterval?: number;
-      select?: (data: TQueryData) => TData;
-    }
-    
-    type UseQueryOptions<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-    > = {
-      [Property in keyof QueryObserverOptions<
-        TQueryFnData,
-        TError,
-        TData,
-        TQueryData,
-        TQueryKey
-      >]: QueryObserverOptions<
-        TQueryFnData,
-        TError,
-        TData,
-        TQueryData,
-        TQueryKey
-      >[Property];
-    };
-    
-    type UndefinedInitialQueryOptions<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-    > = UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
-      initialData?: undefined;
-    };
-    
-    interface QueryObserverBaseResult<TData = unknown, TError = DefaultError> {
-      data: TData | undefined;
-      dataUpdatedAt: number;
-      error: TError | null;
-      errorUpdatedAt: number;
-      failureCount: number;
-      failureReason: TError | null;
-      errorUpdateCount: number;
-      isError: boolean;
-      isFetched: boolean;
-      isFetchedAfterMount: boolean;
-      isFetching: boolean;
-      isLoading: boolean;
-      isPending: boolean;
-      isLoadingError: boolean;
-      isInitialLoading: boolean;
-      isPaused: boolean;
-      isPlaceholderData: boolean;
-      isRefetchError: boolean;
-      isRefetching: boolean;
-      isStale: boolean;
-      isSuccess: boolean;
-    }
-    
-    interface QueryObserverSuccessResult<TData = unknown, TError = DefaultError>
-      extends QueryObserverBaseResult<TData, TError> {
-      data: TData;
-      error: null;
-      isError: false;
-      isPending: false;
-      isLoadingError: false;
-      isRefetchError: false;
-      isSuccess: true;
-      status: "success";
-    }
-    
-    type DefinedQueryObserverResult<
-      TData = unknown,
-      TError = DefaultError,
-    > = QueryObserverSuccessResult<TData, TError>;
-    type QueryObserverResult<
-      TData = unknown,
-      TError = DefaultError,
-    > = DefinedQueryObserverResult<TData, TError>;
-    
-    type ToRef<T> = {
-      value: T;
-    };
-    
-    type UseBaseQueryReturnType<
-      TData,
-      TError,
-      Result = QueryObserverResult<TData, TError>,
-    > = {
-      [K in keyof Result]: K extends
-        | "fetchNextPage"
-        | "fetchPreviousPage"
-        | "refetch"
-        ? Result[K]
-        : ToRef<Readonly<Result>[K]>;
-    } & {
-      suspense: () => Promise<Result>;
-    };
-    
-    type UseQueryReturnType<TData, TError> = UseBaseQueryReturnType<TData, TError>;
-    
-    declare function useQuery<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-    >(
-      options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-    ): UseQueryReturnType<TData, TError>;
-    
-    export { type UseQueryReturnType, useQuery };
-    
-==== node_modules/@tanstack/vue-query/build/modern/index.d.ts (0 errors) ====
-    export { UseQueryReturnType, useQuery } from './useQuery-CPqkvEsh.js';
-    
-==== node_modules/@tanstack/vue-query/package.json (0 errors) ====
-    {
-      "name": "@tanstack/vue-query",
-      "type": "module",
-      "exports": {
-        ".": {
-          "import": {
-            "types": "./build/modern/index.d.ts",
-            "default": "./build/modern/index.js"
-          },
-          "require": {
-            "types": "./build/modern/index.d.cts",
-            "default": "./build/modern/index.cjs"
-          }
-        }
-      }
-    }
-    
-==== src/index.mts (2 errors) ====
-    import { useQuery } from '@tanstack/vue-query'
-                             ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-    
-    const baseUrl = 'https://api.publicapis.org/'
-    
-    interface IEntry {
-      API: string
-      Description: string
-      Auth: string
-      HTTPS: boolean
-      Cors: string
-      Link: string
-      Category: string
-    }
-    
-    const testApi = {
-      getEntries: (): Promise<IEntry[]> => {
-        return fetch(baseUrl + 'entries')
-          .then((res) => res.json())
-          .then((data) => data.entries)
-          .catch((err) => console.log(err))
-      }
-    }
-    
-    const entryKeys = {
-      all: ['entries'] as const,
-      list: () => [...entryKeys.all, 'list'] as const
-    }
-    
-    export const useEntries = () => {
-      return useQuery({
-        queryKey: entryKeys.list(),
-        queryFn: testApi.getEntries,
-        select: (data) => data.slice(0, 10)
-                 ~~~~
-!!! error TS7006: Parameter 'data' implicitly has an 'any' type.
-      })
-    }
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt.diff
deleted file mode 100644
index ddcdbd75a2..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt.diff
+++ /dev/null
@@ -1,247 +0,0 @@
---- old.declarationEmitUsingAlternativeContainingModules1.errors.txt
-+++ new.declarationEmitUsingAlternativeContainingModules1.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+src/index.mts(1,26): error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-+src/index.mts(33,14): error TS7006: Parameter 'data' implicitly has an 'any' type.
-+
-+
-+==== node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.d.ts (0 errors) ====
-+    type QueryKey = ReadonlyArray<unknown>;
-+    
-+    interface Register {}
-+    
-+    type DefaultError = Register extends {
-+      defaultError: infer TError;
-+    }
-+      ? TError
-+      : Error;
-+    
-+    type ShouldRetryFunction<TError = DefaultError> = (
-+      failureCount: number,
-+      error: TError,
-+    ) => boolean;
-+    type RetryValue<TError> = boolean | number | ShouldRetryFunction<TError>;
-+    
-+    type QueryFunctionContext<
-+      TQueryKey extends QueryKey = QueryKey,
-+      TPageParam = never,
-+    > = [TPageParam] extends [never]
-+      ? {
-+          queryKey: TQueryKey;
-+        }
-+      : {
-+          queryKey: TQueryKey;
-+          pageParam: TPageParam;
-+        };
-+    
-+    type QueryFunction<
-+      T = unknown,
-+      TQueryKey extends QueryKey = QueryKey,
-+      TPageParam = never,
-+    > = (context: QueryFunctionContext<TQueryKey, TPageParam>) => T | Promise<T>;
-+    
-+    interface QueryOptions<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+      TPageParam = never,
-+    > {
-+      retry?: RetryValue<TError>;
-+      queryFn?: QueryFunction<TQueryFnData, TQueryKey, TPageParam>;
-+      queryKey?: TQueryKey;
-+      initialData?: TData;
-+      initialDataUpdatedAt?: number | (() => number | undefined);
-+    }
-+    
-+    interface QueryObserverOptions<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+      TPageParam = never,
-+    > extends QueryOptions<
-+        TQueryFnData,
-+        TError,
-+        TQueryData,
-+        TQueryKey,
-+        TPageParam
-+      > {
-+      enabled?: boolean;
-+      refetchInterval?: number;
-+      select?: (data: TQueryData) => TData;
-+    }
-+    
-+    type UseQueryOptions<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+    > = {
-+      [Property in keyof QueryObserverOptions<
-+        TQueryFnData,
-+        TError,
-+        TData,
-+        TQueryData,
-+        TQueryKey
-+      >]: QueryObserverOptions<
-+        TQueryFnData,
-+        TError,
-+        TData,
-+        TQueryData,
-+        TQueryKey
-+      >[Property];
-+    };
-+    
-+    type UndefinedInitialQueryOptions<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+    > = UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
-+      initialData?: undefined;
-+    };
-+    
-+    interface QueryObserverBaseResult<TData = unknown, TError = DefaultError> {
-+      data: TData | undefined;
-+      dataUpdatedAt: number;
-+      error: TError | null;
-+      errorUpdatedAt: number;
-+      failureCount: number;
-+      failureReason: TError | null;
-+      errorUpdateCount: number;
-+      isError: boolean;
-+      isFetched: boolean;
-+      isFetchedAfterMount: boolean;
-+      isFetching: boolean;
-+      isLoading: boolean;
-+      isPending: boolean;
-+      isLoadingError: boolean;
-+      isInitialLoading: boolean;
-+      isPaused: boolean;
-+      isPlaceholderData: boolean;
-+      isRefetchError: boolean;
-+      isRefetching: boolean;
-+      isStale: boolean;
-+      isSuccess: boolean;
-+    }
-+    
-+    interface QueryObserverSuccessResult<TData = unknown, TError = DefaultError>
-+      extends QueryObserverBaseResult<TData, TError> {
-+      data: TData;
-+      error: null;
-+      isError: false;
-+      isPending: false;
-+      isLoadingError: false;
-+      isRefetchError: false;
-+      isSuccess: true;
-+      status: "success";
-+    }
-+    
-+    type DefinedQueryObserverResult<
-+      TData = unknown,
-+      TError = DefaultError,
-+    > = QueryObserverSuccessResult<TData, TError>;
-+    type QueryObserverResult<
-+      TData = unknown,
-+      TError = DefaultError,
-+    > = DefinedQueryObserverResult<TData, TError>;
-+    
-+    type ToRef<T> = {
-+      value: T;
-+    };
-+    
-+    type UseBaseQueryReturnType<
-+      TData,
-+      TError,
-+      Result = QueryObserverResult<TData, TError>,
-+    > = {
-+      [K in keyof Result]: K extends
-+        | "fetchNextPage"
-+        | "fetchPreviousPage"
-+        | "refetch"
-+        ? Result[K]
-+        : ToRef<Readonly<Result>[K]>;
-+    } & {
-+      suspense: () => Promise<Result>;
-+    };
-+    
-+    type UseQueryReturnType<TData, TError> = UseBaseQueryReturnType<TData, TError>;
-+    
-+    declare function useQuery<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+    >(
-+      options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-+    ): UseQueryReturnType<TData, TError>;
-+    
-+    export { type UseQueryReturnType, useQuery };
-+    
-+==== node_modules/@tanstack/vue-query/build/modern/index.d.ts (0 errors) ====
-+    export { UseQueryReturnType, useQuery } from './useQuery-CPqkvEsh.js';
-+    
-+==== node_modules/@tanstack/vue-query/package.json (0 errors) ====
-+    {
-+      "name": "@tanstack/vue-query",
-+      "type": "module",
-+      "exports": {
-+        ".": {
-+          "import": {
-+            "types": "./build/modern/index.d.ts",
-+            "default": "./build/modern/index.js"
-+          },
-+          "require": {
-+            "types": "./build/modern/index.d.cts",
-+            "default": "./build/modern/index.cjs"
-+          }
-+        }
-+      }
-+    }
-+    
-+==== src/index.mts (2 errors) ====
-+    import { useQuery } from '@tanstack/vue-query'
-+                             ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-+    
-+    const baseUrl = 'https://api.publicapis.org/'
-+    
-+    interface IEntry {
-+      API: string
-+      Description: string
-+      Auth: string
-+      HTTPS: boolean
-+      Cors: string
-+      Link: string
-+      Category: string
-+    }
-+    
-+    const testApi = {
-+      getEntries: (): Promise<IEntry[]> => {
-+        return fetch(baseUrl + 'entries')
-+          .then((res) => res.json())
-+          .then((data) => data.entries)
-+          .catch((err) => console.log(err))
-+      }
-+    }
-+    
-+    const entryKeys = {
-+      all: ['entries'] as const,
-+      list: () => [...entryKeys.all, 'list'] as const
-+    }
-+    
-+    export const useEntries = () => {
-+      return useQuery({
-+        queryKey: entryKeys.list(),
-+        queryFn: testApi.getEntries,
-+        select: (data) => data.slice(0, 10)
-+                 ~~~~
-+!!! error TS7006: Parameter 'data' implicitly has an 'any' type.
-+      })
-+    }
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols
index 71c34222c4..a6d924867b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols
@@ -644,7 +644,9 @@ export const useEntries = () => {
     select: (data) => data.slice(0, 10)
 >select : Symbol(select, Decl(index.mts, 31, 32))
 >data : Symbol(data, Decl(index.mts, 32, 13))
+>data.slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
 >data : Symbol(data, Decl(index.mts, 32, 13))
+>slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
 
   })
 }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols.diff
index f4da44d590..ce96136dc7 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols.diff
@@ -259,8 +259,10 @@
  >select : Symbol(select, Decl(index.mts, 31, 32))
  >data : Symbol(data, Decl(index.mts, 32, 13))
 ->data.slice : Symbol(Array.slice, Decl(lib.es5.d.ts, --, --))
++>data.slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
  >data : Symbol(data, Decl(index.mts, 32, 13))
 ->slice : Symbol(Array.slice, Decl(lib.es5.d.ts, --, --))
++>slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
  
    })
  }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
index 2195c6403a..76cb08c7f6 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
@@ -305,7 +305,7 @@ export { UseQueryReturnType, useQuery } from './useQuery-CPqkvEsh.js';
 
 === src/index.mts ===
 import { useQuery } from '@tanstack/vue-query'
->useQuery : any
+>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
 
 const baseUrl = 'https://api.publicapis.org/'
 >baseUrl : "https://api.publicapis.org/"
@@ -407,13 +407,13 @@ const entryKeys = {
 }
 
 export const useEntries = () => {
->useEntries : () => any
->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => any
+>useEntries : () => UseQueryReturnType<IEntry[], Error>
+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => UseQueryReturnType<IEntry[], Error>
 
   return useQuery({
->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : any
->useQuery : any
->{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: any) => any; }
+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : UseQueryReturnType<IEntry[], Error>
+>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
+>{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
 
     queryKey: entryKeys.list(),
 >queryKey : readonly ["entries", "list"]
@@ -429,13 +429,13 @@ export const useEntries = () => {
 >getEntries : () => Promise<IEntry[]>
 
     select: (data) => data.slice(0, 10)
->select : (data: any) => any
->(data) => data.slice(0, 10) : (data: any) => any
->data : any
->data.slice(0, 10) : any
->data.slice : any
->data : any
->slice : any
+>select : (data: IEntry[]) => IEntry[]
+>(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
+>data : IEntry[]
+>data.slice(0, 10) : IEntry[]
+>data.slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
+>data : IEntry[]
+>slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
 >0 : 0
 >10 : 10
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
index 9d35f16a59..7d365aa03a 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
@@ -25,7 +25,7 @@
  === src/index.mts ===
  import { useQuery } from '@tanstack/vue-query'
 ->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: (number | (() => number | undefined)) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
-+>useQuery : any
++>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
  
  const baseUrl = 'https://api.publicapis.org/'
  >baseUrl : "https://api.publicapis.org/"
@@ -78,37 +78,26 @@
  export const useEntries = () => {
 ->useEntries : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
 ->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
-+>useEntries : () => any
-+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => any
++>useEntries : () => UseQueryReturnType<IEntry[], Error>
++>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => UseQueryReturnType<IEntry[], Error>
  
    return useQuery({
 ->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
 ->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: (number | (() => number | undefined)) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
-->{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
-+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : any
-+>useQuery : any
-+>{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: any) => any; }
++>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : UseQueryReturnType<IEntry[], Error>
++>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
+ >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
  
      queryKey: entryKeys.list(),
- >queryKey : readonly ["entries", "list"]
-@@= skipped -22, +22 lines =@@
- >getEntries : () => Promise<IEntry[]>
- 
-     select: (data) => data.slice(0, 10)
-->select : (data: IEntry[]) => IEntry[]
-->(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
-->data : IEntry[]
-->data.slice(0, 10) : IEntry[]
+@@= skipped -26, +26 lines =@@
+ >(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
+ >data : IEntry[]
+ >data.slice(0, 10) : IEntry[]
 ->data.slice : (start?: number, end?: number) => IEntry[]
-->data : IEntry[]
++>data.slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
+ >data : IEntry[]
 ->slice : (start?: number, end?: number) => IEntry[]
-+>select : (data: any) => any
-+>(data) => data.slice(0, 10) : (data: any) => any
-+>data : any
-+>data.slice(0, 10) : any
-+>data.slice : any
-+>data : any
-+>slice : any
++>slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
  >0 : 0
  >10 : 10
  
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt
deleted file mode 100644
index 635ce664a2..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-src/index.mts(1,26): error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-src/index.mts(33,14): error TS7006: Parameter 'data' implicitly has an 'any' type.
-
-
-==== node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.d.ts (0 errors) ====
-    type QueryKey = ReadonlyArray<unknown>;
-    
-    interface Register {}
-    
-    type DefaultError = Register extends {
-      defaultError: infer TError;
-    }
-      ? TError
-      : Error;
-    
-    type ShouldRetryFunction<TError = DefaultError> = (
-      failureCount: number,
-      error: TError,
-    ) => boolean;
-    type RetryValue<TError> = boolean | number | ShouldRetryFunction<TError>;
-    
-    type QueryFunctionContext<
-      TQueryKey extends QueryKey = QueryKey,
-      TPageParam = never,
-    > = [TPageParam] extends [never]
-      ? {
-          queryKey: TQueryKey;
-        }
-      : {
-          queryKey: TQueryKey;
-          pageParam: TPageParam;
-        };
-    
-    type QueryFunction<
-      T = unknown,
-      TQueryKey extends QueryKey = QueryKey,
-      TPageParam = never,
-    > = (context: QueryFunctionContext<TQueryKey, TPageParam>) => T | Promise<T>;
-    
-    interface QueryOptions<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-      TPageParam = never,
-    > {
-      retry?: RetryValue<TError>;
-      queryFn?: QueryFunction<TQueryFnData, TQueryKey, TPageParam>;
-      queryKey?: TQueryKey;
-      initialData?: TData;
-      initialDataUpdatedAt?: number | (() => number | undefined);
-    }
-    
-    interface QueryObserverOptions<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-      TPageParam = never,
-    > extends QueryOptions<
-        TQueryFnData,
-        TError,
-        TQueryData,
-        TQueryKey,
-        TPageParam
-      > {
-      enabled?: boolean;
-      refetchInterval?: number;
-      select?: (data: TQueryData) => TData;
-    }
-    
-    type UseQueryOptions<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-    > = {
-      [Property in keyof QueryObserverOptions<
-        TQueryFnData,
-        TError,
-        TData,
-        TQueryData,
-        TQueryKey
-      >]: QueryObserverOptions<
-        TQueryFnData,
-        TError,
-        TData,
-        TQueryData,
-        TQueryKey
-      >[Property];
-    };
-    
-    type UndefinedInitialQueryOptions<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-    > = UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
-      initialData?: undefined;
-    };
-    
-    interface QueryObserverBaseResult<TData = unknown, TError = DefaultError> {
-      data: TData | undefined;
-      dataUpdatedAt: number;
-      error: TError | null;
-      errorUpdatedAt: number;
-      failureCount: number;
-      failureReason: TError | null;
-      errorUpdateCount: number;
-      isError: boolean;
-      isFetched: boolean;
-      isFetchedAfterMount: boolean;
-      isFetching: boolean;
-      isLoading: boolean;
-      isPending: boolean;
-      isLoadingError: boolean;
-      isInitialLoading: boolean;
-      isPaused: boolean;
-      isPlaceholderData: boolean;
-      isRefetchError: boolean;
-      isRefetching: boolean;
-      isStale: boolean;
-      isSuccess: boolean;
-    }
-    
-    interface QueryObserverSuccessResult<TData = unknown, TError = DefaultError>
-      extends QueryObserverBaseResult<TData, TError> {
-      data: TData;
-      error: null;
-      isError: false;
-      isPending: false;
-      isLoadingError: false;
-      isRefetchError: false;
-      isSuccess: true;
-      status: "success";
-    }
-    
-    type DefinedQueryObserverResult<
-      TData = unknown,
-      TError = DefaultError,
-    > = QueryObserverSuccessResult<TData, TError>;
-    type QueryObserverResult<
-      TData = unknown,
-      TError = DefaultError,
-    > = DefinedQueryObserverResult<TData, TError>;
-    
-    type ToRef<T> = {
-      value: T;
-    };
-    
-    type UseBaseQueryReturnType<
-      TData,
-      TError,
-      Result = QueryObserverResult<TData, TError>,
-    > = {
-      [K in keyof Result]: K extends
-        | "fetchNextPage"
-        | "fetchPreviousPage"
-        | "refetch"
-        ? Result[K]
-        : ToRef<Readonly<Result>[K]>;
-    } & {
-      suspense: () => Promise<Result>;
-    };
-    
-    type UseQueryReturnType<TData, TError> = UseBaseQueryReturnType<TData, TError>;
-    
-    declare function useQuery<
-      TQueryFnData = unknown,
-      TError = DefaultError,
-      TData = TQueryFnData,
-      TQueryKey extends QueryKey = QueryKey,
-    >(
-      options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-    ): UseQueryReturnType<TData, TError>;
-    
-    export { type UseQueryReturnType as b, useQuery as u };
-    
-==== node_modules/@tanstack/vue-query/build/modern/index.d.ts (0 errors) ====
-    export { b as UseQueryReturnType, u as useQuery } from './useQuery-CPqkvEsh.js';
-    
-==== node_modules/@tanstack/vue-query/package.json (0 errors) ====
-    {
-      "name": "@tanstack/vue-query",
-      "type": "module",
-      "exports": {
-        ".": {
-          "import": {
-            "types": "./build/modern/index.d.ts",
-            "default": "./build/modern/index.js"
-          },
-          "require": {
-            "types": "./build/modern/index.d.cts",
-            "default": "./build/modern/index.cjs"
-          }
-        }
-      }
-    }
-    
-==== src/index.mts (2 errors) ====
-    import { useQuery } from '@tanstack/vue-query'
-                             ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-    
-    const baseUrl = 'https://api.publicapis.org/'
-    
-    interface IEntry {
-      API: string
-      Description: string
-      Auth: string
-      HTTPS: boolean
-      Cors: string
-      Link: string
-      Category: string
-    }
-    
-    const testApi = {
-      getEntries: (): Promise<IEntry[]> => {
-        return fetch(baseUrl + 'entries')
-          .then((res) => res.json())
-          .then((data) => data.entries)
-          .catch((err) => console.log(err))
-      }
-    }
-    
-    const entryKeys = {
-      all: ['entries'] as const,
-      list: () => [...entryKeys.all, 'list'] as const
-    }
-    
-    export const useEntries = () => {
-      return useQuery({
-        queryKey: entryKeys.list(),
-        queryFn: testApi.getEntries,
-        select: (data) => data.slice(0, 10)
-                 ~~~~
-!!! error TS7006: Parameter 'data' implicitly has an 'any' type.
-      })
-    }
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt.diff
deleted file mode 100644
index e28bfc0240..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt.diff
+++ /dev/null
@@ -1,247 +0,0 @@
---- old.declarationEmitUsingAlternativeContainingModules2.errors.txt
-+++ new.declarationEmitUsingAlternativeContainingModules2.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+src/index.mts(1,26): error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-+src/index.mts(33,14): error TS7006: Parameter 'data' implicitly has an 'any' type.
-+
-+
-+==== node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.d.ts (0 errors) ====
-+    type QueryKey = ReadonlyArray<unknown>;
-+    
-+    interface Register {}
-+    
-+    type DefaultError = Register extends {
-+      defaultError: infer TError;
-+    }
-+      ? TError
-+      : Error;
-+    
-+    type ShouldRetryFunction<TError = DefaultError> = (
-+      failureCount: number,
-+      error: TError,
-+    ) => boolean;
-+    type RetryValue<TError> = boolean | number | ShouldRetryFunction<TError>;
-+    
-+    type QueryFunctionContext<
-+      TQueryKey extends QueryKey = QueryKey,
-+      TPageParam = never,
-+    > = [TPageParam] extends [never]
-+      ? {
-+          queryKey: TQueryKey;
-+        }
-+      : {
-+          queryKey: TQueryKey;
-+          pageParam: TPageParam;
-+        };
-+    
-+    type QueryFunction<
-+      T = unknown,
-+      TQueryKey extends QueryKey = QueryKey,
-+      TPageParam = never,
-+    > = (context: QueryFunctionContext<TQueryKey, TPageParam>) => T | Promise<T>;
-+    
-+    interface QueryOptions<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+      TPageParam = never,
-+    > {
-+      retry?: RetryValue<TError>;
-+      queryFn?: QueryFunction<TQueryFnData, TQueryKey, TPageParam>;
-+      queryKey?: TQueryKey;
-+      initialData?: TData;
-+      initialDataUpdatedAt?: number | (() => number | undefined);
-+    }
-+    
-+    interface QueryObserverOptions<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+      TPageParam = never,
-+    > extends QueryOptions<
-+        TQueryFnData,
-+        TError,
-+        TQueryData,
-+        TQueryKey,
-+        TPageParam
-+      > {
-+      enabled?: boolean;
-+      refetchInterval?: number;
-+      select?: (data: TQueryData) => TData;
-+    }
-+    
-+    type UseQueryOptions<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+    > = {
-+      [Property in keyof QueryObserverOptions<
-+        TQueryFnData,
-+        TError,
-+        TData,
-+        TQueryData,
-+        TQueryKey
-+      >]: QueryObserverOptions<
-+        TQueryFnData,
-+        TError,
-+        TData,
-+        TQueryData,
-+        TQueryKey
-+      >[Property];
-+    };
-+    
-+    type UndefinedInitialQueryOptions<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+    > = UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
-+      initialData?: undefined;
-+    };
-+    
-+    interface QueryObserverBaseResult<TData = unknown, TError = DefaultError> {
-+      data: TData | undefined;
-+      dataUpdatedAt: number;
-+      error: TError | null;
-+      errorUpdatedAt: number;
-+      failureCount: number;
-+      failureReason: TError | null;
-+      errorUpdateCount: number;
-+      isError: boolean;
-+      isFetched: boolean;
-+      isFetchedAfterMount: boolean;
-+      isFetching: boolean;
-+      isLoading: boolean;
-+      isPending: boolean;
-+      isLoadingError: boolean;
-+      isInitialLoading: boolean;
-+      isPaused: boolean;
-+      isPlaceholderData: boolean;
-+      isRefetchError: boolean;
-+      isRefetching: boolean;
-+      isStale: boolean;
-+      isSuccess: boolean;
-+    }
-+    
-+    interface QueryObserverSuccessResult<TData = unknown, TError = DefaultError>
-+      extends QueryObserverBaseResult<TData, TError> {
-+      data: TData;
-+      error: null;
-+      isError: false;
-+      isPending: false;
-+      isLoadingError: false;
-+      isRefetchError: false;
-+      isSuccess: true;
-+      status: "success";
-+    }
-+    
-+    type DefinedQueryObserverResult<
-+      TData = unknown,
-+      TError = DefaultError,
-+    > = QueryObserverSuccessResult<TData, TError>;
-+    type QueryObserverResult<
-+      TData = unknown,
-+      TError = DefaultError,
-+    > = DefinedQueryObserverResult<TData, TError>;
-+    
-+    type ToRef<T> = {
-+      value: T;
-+    };
-+    
-+    type UseBaseQueryReturnType<
-+      TData,
-+      TError,
-+      Result = QueryObserverResult<TData, TError>,
-+    > = {
-+      [K in keyof Result]: K extends
-+        | "fetchNextPage"
-+        | "fetchPreviousPage"
-+        | "refetch"
-+        ? Result[K]
-+        : ToRef<Readonly<Result>[K]>;
-+    } & {
-+      suspense: () => Promise<Result>;
-+    };
-+    
-+    type UseQueryReturnType<TData, TError> = UseBaseQueryReturnType<TData, TError>;
-+    
-+    declare function useQuery<
-+      TQueryFnData = unknown,
-+      TError = DefaultError,
-+      TData = TQueryFnData,
-+      TQueryKey extends QueryKey = QueryKey,
-+    >(
-+      options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-+    ): UseQueryReturnType<TData, TError>;
-+    
-+    export { type UseQueryReturnType as b, useQuery as u };
-+    
-+==== node_modules/@tanstack/vue-query/build/modern/index.d.ts (0 errors) ====
-+    export { b as UseQueryReturnType, u as useQuery } from './useQuery-CPqkvEsh.js';
-+    
-+==== node_modules/@tanstack/vue-query/package.json (0 errors) ====
-+    {
-+      "name": "@tanstack/vue-query",
-+      "type": "module",
-+      "exports": {
-+        ".": {
-+          "import": {
-+            "types": "./build/modern/index.d.ts",
-+            "default": "./build/modern/index.js"
-+          },
-+          "require": {
-+            "types": "./build/modern/index.d.cts",
-+            "default": "./build/modern/index.cjs"
-+          }
-+        }
-+      }
-+    }
-+    
-+==== src/index.mts (2 errors) ====
-+    import { useQuery } from '@tanstack/vue-query'
-+                             ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-+    
-+    const baseUrl = 'https://api.publicapis.org/'
-+    
-+    interface IEntry {
-+      API: string
-+      Description: string
-+      Auth: string
-+      HTTPS: boolean
-+      Cors: string
-+      Link: string
-+      Category: string
-+    }
-+    
-+    const testApi = {
-+      getEntries: (): Promise<IEntry[]> => {
-+        return fetch(baseUrl + 'entries')
-+          .then((res) => res.json())
-+          .then((data) => data.entries)
-+          .catch((err) => console.log(err))
-+      }
-+    }
-+    
-+    const entryKeys = {
-+      all: ['entries'] as const,
-+      list: () => [...entryKeys.all, 'list'] as const
-+    }
-+    
-+    export const useEntries = () => {
-+      return useQuery({
-+        queryKey: entryKeys.list(),
-+        queryFn: testApi.getEntries,
-+        select: (data) => data.slice(0, 10)
-+                 ~~~~
-+!!! error TS7006: Parameter 'data' implicitly has an 'any' type.
-+      })
-+    }
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols
index 4022c4abd9..038ae5de85 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols
@@ -648,7 +648,9 @@ export const useEntries = () => {
     select: (data) => data.slice(0, 10)
 >select : Symbol(select, Decl(index.mts, 31, 32))
 >data : Symbol(data, Decl(index.mts, 32, 13))
+>data.slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
 >data : Symbol(data, Decl(index.mts, 32, 13))
+>slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
 
   })
 }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols.diff
index 52e9cd2d67..edf3a631ed 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols.diff
@@ -259,8 +259,10 @@
  >select : Symbol(select, Decl(index.mts, 31, 32))
  >data : Symbol(data, Decl(index.mts, 32, 13))
 ->data.slice : Symbol(Array.slice, Decl(lib.es5.d.ts, --, --))
++>data.slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
  >data : Symbol(data, Decl(index.mts, 32, 13))
 ->slice : Symbol(Array.slice, Decl(lib.es5.d.ts, --, --))
++>slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
  
    })
  }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
index 2accc8cf13..e36518908b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
@@ -309,7 +309,7 @@ export { b as UseQueryReturnType, u as useQuery } from './useQuery-CPqkvEsh.js';
 
 === src/index.mts ===
 import { useQuery } from '@tanstack/vue-query'
->useQuery : any
+>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
 
 const baseUrl = 'https://api.publicapis.org/'
 >baseUrl : "https://api.publicapis.org/"
@@ -411,13 +411,13 @@ const entryKeys = {
 }
 
 export const useEntries = () => {
->useEntries : () => any
->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => any
+>useEntries : () => UseQueryReturnType<IEntry[], Error>
+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => UseQueryReturnType<IEntry[], Error>
 
   return useQuery({
->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : any
->useQuery : any
->{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: any) => any; }
+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : UseQueryReturnType<IEntry[], Error>
+>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
+>{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
 
     queryKey: entryKeys.list(),
 >queryKey : readonly ["entries", "list"]
@@ -433,13 +433,13 @@ export const useEntries = () => {
 >getEntries : () => Promise<IEntry[]>
 
     select: (data) => data.slice(0, 10)
->select : (data: any) => any
->(data) => data.slice(0, 10) : (data: any) => any
->data : any
->data.slice(0, 10) : any
->data.slice : any
->data : any
->slice : any
+>select : (data: IEntry[]) => IEntry[]
+>(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
+>data : IEntry[]
+>data.slice(0, 10) : IEntry[]
+>data.slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
+>data : IEntry[]
+>slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
 >0 : 0
 >10 : 10
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
index f1d19737ad..e338cdeadf 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
@@ -30,7 +30,7 @@
  === src/index.mts ===
  import { useQuery } from '@tanstack/vue-query'
 ->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: (number | (() => number | undefined)) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
-+>useQuery : any
++>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
  
  const baseUrl = 'https://api.publicapis.org/'
  >baseUrl : "https://api.publicapis.org/"
@@ -83,37 +83,26 @@
  export const useEntries = () => {
 ->useEntries : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
 ->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
-+>useEntries : () => any
-+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => any
++>useEntries : () => UseQueryReturnType<IEntry[], Error>
++>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => UseQueryReturnType<IEntry[], Error>
  
    return useQuery({
 ->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
 ->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: (number | (() => number | undefined)) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
-->{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
-+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : any
-+>useQuery : any
-+>{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: any) => any; }
++>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : UseQueryReturnType<IEntry[], Error>
++>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
+ >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
  
      queryKey: entryKeys.list(),
- >queryKey : readonly ["entries", "list"]
-@@= skipped -22, +22 lines =@@
- >getEntries : () => Promise<IEntry[]>
- 
-     select: (data) => data.slice(0, 10)
-->select : (data: IEntry[]) => IEntry[]
-->(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
-->data : IEntry[]
-->data.slice(0, 10) : IEntry[]
+@@= skipped -26, +26 lines =@@
+ >(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
+ >data : IEntry[]
+ >data.slice(0, 10) : IEntry[]
 ->data.slice : (start?: number, end?: number) => IEntry[]
-->data : IEntry[]
++>data.slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
+ >data : IEntry[]
 ->slice : (start?: number, end?: number) => IEntry[]
-+>select : (data: any) => any
-+>(data) => data.slice(0, 10) : (data: any) => any
-+>data : any
-+>data.slice(0, 10) : any
-+>data.slice : any
-+>data : any
-+>slice : any
++>slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
  >0 : 0
  >10 : 10
  
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.js b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.js
index 8c1d246791..c243d425a0 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.js
@@ -28,9 +28,14 @@ export const bar = (thing: SomeType) => {
 };
 
 //// [index.js]
-export const foo = (thing) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bar = exports.foo = void 0;
+const foo = (thing) => {
     return thing;
 };
-export const bar = (thing) => {
+exports.foo = foo;
+const bar = (thing) => {
     return thing.arg;
 };
+exports.bar = bar;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.js.diff
deleted file mode 100644
index 033beedc08..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.js.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- old.declarationEmitUsingTypeAlias1.js
-+++ new.declarationEmitUsingTypeAlias1.js
-@@= skipped -27, +27 lines =@@
- };
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.bar = exports.foo = void 0;
--const foo = (thing) => {
-+export const foo = (thing) => {
-     return thing;
- };
--exports.foo = foo;
--const bar = (thing) => {
-+export const bar = (thing) => {
-     return thing.arg;
- };
--exports.bar = bar;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js
index 758add4e10..c6b9561140 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js
@@ -43,5 +43,8 @@ export const bar = goodDeclaration<{}>;
 
 
 //// [index.js]
-import { goodDeclaration } from "some-dep";
-export const bar = goodDeclaration;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bar = void 0;
+const some_dep_1 = require("some-dep");
+exports.bar = some_dep_1.goodDeclaration;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js.diff
index cb1323985b..5558be646e 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js.diff
@@ -1,13 +1,9 @@
 --- old.declarationEmitUsingTypeAlias2.js
 +++ new.declarationEmitUsingTypeAlias2.js
-@@= skipped -42, +42 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.bar = void 0;
--const some_dep_1 = require("some-dep");
+@@= skipped -46, +46 lines =@@
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.bar = void 0;
+ const some_dep_1 = require("some-dep");
 -exports.bar = (some_dep_1.goodDeclaration);
 -
 -
@@ -20,5 +16,4 @@
 -    shouldReuseLocalName: typeof shouldReuseLocalName;
 -    reuseDepName: typeof import("some-dep").reuseDepName;
 -};
-+import { goodDeclaration } from "some-dep";
-+export const bar = goodDeclaration;
++exports.bar = some_dep_1.goodDeclaration;
diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.js b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.js
index 2aa76b1d2b..67a1a59aa9 100644
--- a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.js
+++ b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.js
@@ -23,13 +23,22 @@ export const mod = await (async () => {
 })();
 
 //// [case0.js]
-export default 0;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = 0;
 //// [case1.js]
-export default 1;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = 1;
 //// [caseFallback.js]
-export default 'fallback';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = 'fallback';
 //// [index.js]
-export const mod = await (async () => {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mod = void 0;
+exports.mod = await (async () => {
     const x = 0;
     switch (x) {
         case 0:
diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.js.diff b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.js.diff
index 0a29bfbb78..75570b2426 100644
--- a/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/dynamicImportsDeclaration.js.diff
@@ -1,33 +1,6 @@
 --- old.dynamicImportsDeclaration.js
 +++ new.dynamicImportsDeclaration.js
-@@= skipped -22, +22 lines =@@
- })();
- 
- //// [case0.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.default = 0;
-+export default 0;
- //// [case1.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.default = 1;
-+export default 1;
- //// [caseFallback.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.default = 'fallback';
-+export default 'fallback';
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.mod = void 0;
--exports.mod = await (async () => {
-+export const mod = await (async () => {
-     const x = 0;
-     switch (x) {
-         case 0:
-@@= skipped -26, +17 lines =@@
+@@= skipped -48, +48 lines =@@
              return await import("./caseFallback.js");
      }
  })();
diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js
index d03c41d64d..dc23860f00 100644
--- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js
+++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js
@@ -10,8 +10,12 @@ const y = { ...o };
 
 
 //// [a.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.A = void 0;
 @dec
-export class A {
+class A {
 }
+exports.A = A;
 const o = { a: 1 };
 const y = { ...o };
diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js.diff
index 24343bae57..b3ac928f23 100644
--- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js.diff
@@ -16,9 +16,13 @@
 -    dec
 -], A);
 -export { A };
++"use strict";
++Object.defineProperty(exports, "__esModule", { value: true });
++exports.A = void 0;
 +@dec
-+export class A {
++class A {
 +}
++exports.A = A;
  const o = { a: 1 };
 -const y = Object.assign({}, o);
 +const y = { ...o };
diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js
index d03c41d64d..dc23860f00 100644
--- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js
@@ -10,8 +10,12 @@ const y = { ...o };
 
 
 //// [a.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.A = void 0;
 @dec
-export class A {
+class A {
 }
+exports.A = A;
 const o = { a: 1 };
 const y = { ...o };
diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js.diff
index 66b81ff61b..0c21479f7c 100644
--- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js.diff
@@ -16,9 +16,13 @@
 -    dec
 -], A);
 -export { A };
++"use strict";
++Object.defineProperty(exports, "__esModule", { value: true });
++exports.A = void 0;
 +@dec
-+export class A {
++class A {
 +}
++exports.A = A;
  const o = { a: 1 };
 -const y = Object.assign({}, o);
 +const y = { ...o };
diff --git a/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.errors.txt b/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.errors.txt
index 5c6b72d894..e99f8b2d1c 100644
--- a/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.errors.txt
@@ -1,17 +1,11 @@
-/a.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
 /a.ts(2,8): error TS6133: 'Bar' is declared but its value is never read.
-/a.ts(2,17): error TS2307: Cannot find module 'bar' or its corresponding type declarations.
 
 
-==== /a.ts (3 errors) ====
+==== /a.ts (1 errors) ====
     import Foo from "foo";
-                    ~~~~~
-!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
     import Bar from "bar"; // error: unused
            ~~~
 !!! error TS6133: 'Bar' is declared but its value is never read.
-                    ~~~~~
-!!! error TS2307: Cannot find module 'bar' or its corresponding type declarations.
     export class A extends Foo { }
     
 ==== /node_modules/foo/index.js (0 errors) ====
diff --git a/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.errors.txt.diff
index e25a9a6f17..d1326661e6 100644
--- a/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.errors.txt.diff
@@ -2,22 +2,14 @@
 +++ new.extendsUntypedModule.errors.txt
 @@= skipped -0, +0 lines =@@
 -/a.ts(2,1): error TS6133: 'Bar' is declared but its value is never read.
-+/a.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
 +/a.ts(2,8): error TS6133: 'Bar' is declared but its value is never read.
-+/a.ts(2,17): error TS2307: Cannot find module 'bar' or its corresponding type declarations.
  
  
--==== /a.ts (1 errors) ====
-+==== /a.ts (3 errors) ====
+ ==== /a.ts (1 errors) ====
      import Foo from "foo";
-+                    ~~~~~
-+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
      import Bar from "bar"; // error: unused
 -    ~~~~~~~~~~~~~~~~~~~~~~
 +           ~~~
  !!! error TS6133: 'Bar' is declared but its value is never read.
-+                    ~~~~~
-+!!! error TS2307: Cannot find module 'bar' or its corresponding type declarations.
      export class A extends Foo { }
      
- ==== /node_modules/foo/index.js (0 errors) ====
diff --git a/testdata/baselines/reference/submodule/compiler/jsxClassAttributeResolution.js b/testdata/baselines/reference/submodule/compiler/jsxClassAttributeResolution.js
index 2e48c06e9b..faa91763bc 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxClassAttributeResolution.js
+++ b/testdata/baselines/reference/submodule/compiler/jsxClassAttributeResolution.js
@@ -24,6 +24,9 @@ import './';
 
 
 //// [file.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = void 0;
 class App {
 }
-export const a = <App></App>;
+exports.a = <App></App>;
diff --git a/testdata/baselines/reference/submodule/compiler/jsxClassAttributeResolution.js.diff b/testdata/baselines/reference/submodule/compiler/jsxClassAttributeResolution.js.diff
index 83eb5dd149..a2b3aad2b8 100644
--- a/testdata/baselines/reference/submodule/compiler/jsxClassAttributeResolution.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/jsxClassAttributeResolution.js.diff
@@ -1,14 +1,11 @@
 --- old.jsxClassAttributeResolution.js
 +++ new.jsxClassAttributeResolution.js
-@@= skipped -23, +23 lines =@@
- 
- 
- //// [file.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.a = void 0;
+@@= skipped -26, +26 lines =@@
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.a = void 0;
 -const jsx_runtime_1 = require("react/jsx-runtime");
  class App {
  }
 -exports.a = (0, jsx_runtime_1.jsx)(App, {});
-+export const a = <App></App>;
++exports.a = <App></App>;
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve2.errors.txt b/testdata/baselines/reference/submodule/compiler/modulePreserve2.errors.txt
deleted file mode 100644
index 0e9ddf06da..0000000000
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve2.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/main.js(1,10): error TS2305: Module '"/node_modules/dep/require"' has no exported member 'esm'.
-
-
-==== /main.js (1 errors) ====
-    import { esm } from "dep";
-             ~~~
-!!! error TS2305: Module '"/node_modules/dep/require"' has no exported member 'esm'.
-    const cjs = require("dep");
-    
-==== /node_modules/dep/package.json (0 errors) ====
-    {
-      "name": "dep",
-      "exports": {
-        "import": "./import.mjs",
-        "require": "./require.js"
-      }
-    }
-    
-==== /node_modules/dep/import.d.mts (0 errors) ====
-    export const esm: "esm";
-    
-==== /node_modules/dep/require.d.ts (0 errors) ====
-    declare const cjs: "cjs";
-    export = cjs;
-    
-==== /index.ts (0 errors) ====
-    import { esm } from "dep";
-    import cjs = require("dep");
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols b/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols
index dbf47a96fe..57e9232fef 100644
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols
@@ -9,6 +9,10 @@ const cjs = require("dep");
 >require : Symbol(require)
 >"dep" : Symbol("/node_modules/dep/require", Decl(require.d.ts, 0, 0))
 
+=== /node_modules/dep/import.d.mts ===
+export const esm: "esm";
+>esm : Symbol(esm, Decl(import.d.mts, 0, 12))
+
 === /node_modules/dep/require.d.ts ===
 declare const cjs: "cjs";
 >cjs : Symbol(cjs, Decl(require.d.ts, 0, 13))
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols.diff b/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols.diff
deleted file mode 100644
index aaebb392d8..0000000000
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve2.symbols.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.modulePreserve2.symbols
-+++ new.modulePreserve2.symbols
-@@= skipped -8, +8 lines =@@
- >require : Symbol(require)
- >"dep" : Symbol("/node_modules/dep/require", Decl(require.d.ts, 0, 0))
- 
--=== /node_modules/dep/import.d.mts ===
--export const esm: "esm";
-->esm : Symbol(esm, Decl(import.d.mts, 0, 12))
--
- === /node_modules/dep/require.d.ts ===
- declare const cjs: "cjs";
- >cjs : Symbol(cjs, Decl(require.d.ts, 0, 13))
diff --git a/testdata/baselines/reference/submodule/compiler/modulePreserve2.types b/testdata/baselines/reference/submodule/compiler/modulePreserve2.types
index fdb9060a3e..50d0cfeb38 100644
--- a/testdata/baselines/reference/submodule/compiler/modulePreserve2.types
+++ b/testdata/baselines/reference/submodule/compiler/modulePreserve2.types
@@ -2,7 +2,7 @@
 
 === /main.js ===
 import { esm } from "dep";
->esm : any
+>esm : "esm"
 
 const cjs = require("dep");
 >cjs : "cjs"
@@ -10,6 +10,10 @@ const cjs = require("dep");
 >require : any
 >"dep" : "dep"
 
+=== /node_modules/dep/import.d.mts ===
+export const esm: "esm";
+>esm : "esm"
+
 === /node_modules/dep/require.d.ts ===
 declare const cjs: "cjs";
 >cjs : "cjs"
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsCJS.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsCJS.errors.txt
new file mode 100644
index 0000000000..16de5545b2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsCJS.errors.txt
@@ -0,0 +1,31 @@
+user.ts(1,15): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+user.ts(2,15): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+user.ts(3,15): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './z' instead?
+
+
+==== x.ts (0 errors) ====
+    export default 0;
+    
+==== y.tsx (0 errors) ====
+    export default 0;
+    
+==== z.d.ts (0 errors) ====
+    declare const x: number;
+    export default x;
+    
+==== user.ts (3 errors) ====
+    import x from "./x.ts";
+                  ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import y from "./y.tsx";
+                  ~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+    import z from "./z.d.ts";
+                  ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './z' instead?
+    
+    // Making sure the suggested fixes are valid:
+    import x2 from "./x";
+    import y2 from "./y";
+    import z2 from "./z";
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsCJS.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsCJS.errors.txt.diff
deleted file mode 100644
index 2457053a3c..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsCJS.errors.txt.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- old.moduleResolutionNoTsCJS.errors.txt
-+++ new.moduleResolutionNoTsCJS.errors.txt
-@@= skipped -0, +-1 lines =@@
--user.ts(1,15): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--user.ts(2,15): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
--user.ts(3,15): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './z' instead?
--
--
--==== x.ts (0 errors) ====
--    export default 0;
--    
--==== y.tsx (0 errors) ====
--    export default 0;
--    
--==== z.d.ts (0 errors) ====
--    declare const x: number;
--    export default x;
--    
--==== user.ts (3 errors) ====
--    import x from "./x.ts";
--                  ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import y from "./y.tsx";
--                  ~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
--    import z from "./z.d.ts";
--                  ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './z' instead?
--    
--    // Making sure the suggested fixes are valid:
--    import x2 from "./x";
--    import y2 from "./y";
--    import z2 from "./z";
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsESM.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsESM.errors.txt
new file mode 100644
index 0000000000..ff42e6bbd2
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsESM.errors.txt
@@ -0,0 +1,31 @@
+user.ts(1,15): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+user.ts(2,15): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+user.ts(3,15): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './z.js' instead?
+
+
+==== x.ts (0 errors) ====
+    export default 0;
+    
+==== y.tsx (0 errors) ====
+    export default 0;
+    
+==== z.d.ts (0 errors) ====
+    declare const x: number;
+    export default x;
+    
+==== user.ts (3 errors) ====
+    import x from "./x.ts";
+                  ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import y from "./y.tsx";
+                  ~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+    import z from "./z.d.ts";
+                  ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './z.js' instead?
+    
+    // Making sure the suggested fixes are valid:
+    import x2 from "./x";
+    import y2 from "./y";
+    import z2 from "./z";
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsESM.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsESM.errors.txt.diff
deleted file mode 100644
index 2a18262585..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionNoTsESM.errors.txt.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- old.moduleResolutionNoTsESM.errors.txt
-+++ new.moduleResolutionNoTsESM.errors.txt
-@@= skipped -0, +-1 lines =@@
--user.ts(1,15): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--user.ts(2,15): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
--user.ts(3,15): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './z.js' instead?
--
--
--==== x.ts (0 errors) ====
--    export default 0;
--    
--==== y.tsx (0 errors) ====
--    export default 0;
--    
--==== z.d.ts (0 errors) ====
--    declare const x: number;
--    export default x;
--    
--==== user.ts (3 errors) ====
--    import x from "./x.ts";
--                  ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import y from "./y.tsx";
--                  ~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
--    import z from "./z.d.ts";
--                  ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './z.js' instead?
--    
--    // Making sure the suggested fixes are valid:
--    import x2 from "./x";
--    import y2 from "./y";
--    import z2 from "./z";
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported.errors.txt
index 27398197fb..4bf1239ec2 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported.errors.txt
@@ -1,16 +1,10 @@
 /a.ts(1,17): error TS2306: File '/tsx.tsx' is not a module.
-/a.ts(2,17): error TS2307: Cannot find module './jsx' or its corresponding type declarations.
-/a.ts(3,16): error TS2307: Cannot find module './js' or its corresponding type declarations.
 
 
-==== /a.ts (3 errors) ====
+==== /a.ts (1 errors) ====
     import tsx from "./tsx"; // Not allowed.
                     ~~~~~~~
 !!! error TS2306: File '/tsx.tsx' is not a module.
     import jsx from "./jsx"; // Not allowed.
-                    ~~~~~~~
-!!! error TS2307: Cannot find module './jsx' or its corresponding type declarations.
     import js from "./js"; // OK because it's an untyped module.
-                   ~~~~~~
-!!! error TS2307: Cannot find module './js' or its corresponding type declarations.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported.errors.txt.diff
index dc5b7ab329..d86bdc608a 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported.errors.txt.diff
@@ -4,23 +4,18 @@
 -/a.ts(1,17): error TS6142: Module './tsx' was resolved to '/tsx.tsx', but '--jsx' is not set.
 -/a.ts(2,17): error TS6142: Module './jsx' was resolved to '/jsx.jsx', but '--jsx' is not set.
 +/a.ts(1,17): error TS2306: File '/tsx.tsx' is not a module.
-+/a.ts(2,17): error TS2307: Cannot find module './jsx' or its corresponding type declarations.
-+/a.ts(3,16): error TS2307: Cannot find module './js' or its corresponding type declarations.
  
  
 -==== /a.ts (2 errors) ====
-+==== /a.ts (3 errors) ====
++==== /a.ts (1 errors) ====
      import tsx from "./tsx"; // Not allowed.
                      ~~~~~~~
 -!!! error TS6142: Module './tsx' was resolved to '/tsx.tsx', but '--jsx' is not set.
 +!!! error TS2306: File '/tsx.tsx' is not a module.
      import jsx from "./jsx"; // Not allowed.
-                     ~~~~~~~
+-                    ~~~~~~~
 -!!! error TS6142: Module './jsx' was resolved to '/jsx.jsx', but '--jsx' is not set.
-+!!! error TS2307: Cannot find module './jsx' or its corresponding type declarations.
      import js from "./js"; // OK because it's an untyped module.
-+                   ~~~~~~
-+!!! error TS2307: Cannot find module './js' or its corresponding type declarations.
      
 -==== /tsx.tsx (0 errors) ====
 -    
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported3.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported3.errors.txt
deleted file mode 100644
index 427246e857..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported3.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-/a.ts(1,17): error TS2307: Cannot find module './jsx' or its corresponding type declarations.
-
-
-==== /a.ts (1 errors) ====
-    import jsx from "./jsx";
-                    ~~~~~~~
-!!! error TS2307: Cannot find module './jsx' or its corresponding type declarations.
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported3.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported3.errors.txt.diff
deleted file mode 100644
index 53ad1262d7..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_notSupported3.errors.txt.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.moduleResolutionWithExtensions_notSupported3.errors.txt
-+++ new.moduleResolutionWithExtensions_notSupported3.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/a.ts(1,17): error TS2307: Cannot find module './jsx' or its corresponding type declarations.
-+
-+
-+==== /a.ts (1 errors) ====
-+    import jsx from "./jsx";
-+                    ~~~~~~~
-+!!! error TS2307: Cannot find module './jsx' or its corresponding type declarations.
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=node16).js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=node16).js
index 2f93fd1fb7..23844cf6ba 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=node16).js
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=node16).js
@@ -13,5 +13,30 @@ import * as p from "pkg";
 p.thing();
 
 //// [index.js]
-import * as p from "pkg";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const p = __importStar(require("pkg"));
 p.thing();
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=node16).js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=node16).js.diff
deleted file mode 100644
index c455dc5261..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=node16).js.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.moduleResolutionWithModule(module=node16,moduleresolution=node16).js
-+++ new.moduleResolutionWithModule(module=node16,moduleresolution=node16).js
-@@= skipped -12, +12 lines =@@
- p.thing();
- 
- //// [index.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--const p = __importStar(require("pkg"));
-+import * as p from "pkg";
- p.thing();
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js
index 2f93fd1fb7..23844cf6ba 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js
@@ -13,5 +13,30 @@ import * as p from "pkg";
 p.thing();
 
 //// [index.js]
-import * as p from "pkg";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const p = __importStar(require("pkg"));
 p.thing();
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js.diff
deleted file mode 100644
index e052284397..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js
-+++ new.moduleResolutionWithModule(module=node16,moduleresolution=nodenext).js
-@@= skipped -12, +12 lines =@@
- p.thing();
- 
- //// [index.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--const p = __importStar(require("pkg"));
-+import * as p from "pkg";
- p.thing();
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js
index 2f93fd1fb7..23844cf6ba 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js
@@ -13,5 +13,30 @@ import * as p from "pkg";
 p.thing();
 
 //// [index.js]
-import * as p from "pkg";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const p = __importStar(require("pkg"));
 p.thing();
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js.diff
deleted file mode 100644
index 63ac01f47c..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js
-+++ new.moduleResolutionWithModule(module=nodenext,moduleresolution=node16).js
-@@= skipped -12, +12 lines =@@
- p.thing();
- 
- //// [index.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--const p = __importStar(require("pkg"));
-+import * as p from "pkg";
- p.thing();
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js
index 2f93fd1fb7..23844cf6ba 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js
@@ -13,5 +13,30 @@ import * as p from "pkg";
 p.thing();
 
 //// [index.js]
-import * as p from "pkg";
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const p = __importStar(require("pkg"));
 p.thing();
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js.diff
deleted file mode 100644
index 5f28516c43..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js
-+++ new.moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js
-@@= skipped -12, +12 lines =@@
- p.thing();
- 
- //// [index.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--const p = __importStar(require("pkg"));
-+import * as p from "pkg";
- p.thing();
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot.errors.txt
deleted file mode 100644
index 6bbbfee6bb..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/a.ts(1,19): error TS2307: Cannot find module 'foo/bar' or its corresponding type declarations.
-
-
-==== /a.ts (1 errors) ====
-    import { x } from "foo/bar";
-                      ~~~~~~~~~
-!!! error TS2307: Cannot find module 'foo/bar' or its corresponding type declarations.
-    
-==== /node_modules/foo/bar/index.js (0 errors) ====
-    not read
-    
-==== /node_modules/foo/package.json (0 errors) ====
-    { "name": "foo", "version": "1.2.3", "types": "types.d.ts" }
-    
-==== /node_modules/foo/types.d.ts (0 errors) ====
-    export const x = 0;
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot.errors.txt.diff
deleted file mode 100644
index 17c86c323c..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot.errors.txt.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.moduleResolution_packageJson_yesAtPackageRoot.errors.txt
-+++ new.moduleResolution_packageJson_yesAtPackageRoot.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/a.ts(1,19): error TS2307: Cannot find module 'foo/bar' or its corresponding type declarations.
-+
-+
-+==== /a.ts (1 errors) ====
-+    import { x } from "foo/bar";
-+                      ~~~~~~~~~
-+!!! error TS2307: Cannot find module 'foo/bar' or its corresponding type declarations.
-+    
-+==== /node_modules/foo/bar/index.js (0 errors) ====
-+    not read
-+    
-+==== /node_modules/foo/package.json (0 errors) ====
-+    { "name": "foo", "version": "1.2.3", "types": "types.d.ts" }
-+    
-+==== /node_modules/foo/types.d.ts (0 errors) ====
-+    export const x = 0;
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt
deleted file mode 100644
index e7cad134c6..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/a.ts(1,19): error TS2307: Cannot find module 'foo/@bar' or its corresponding type declarations.
-
-
-==== /a.ts (1 errors) ====
-    import { x } from "foo/@bar";
-                      ~~~~~~~~~~
-!!! error TS2307: Cannot find module 'foo/@bar' or its corresponding type declarations.
-    
-==== /node_modules/foo/@bar/index.js (0 errors) ====
-    not read
-    
-==== /node_modules/foo/package.json (0 errors) ====
-    { "name": "foo", "version": "1.2.3", "types": "types.d.ts" }
-    
-==== /node_modules/foo/types.d.ts (0 errors) ====
-    export const x = 0;
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt.diff
deleted file mode 100644
index d486829158..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt
-+++ new.moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/a.ts(1,19): error TS2307: Cannot find module 'foo/@bar' or its corresponding type declarations.
-+
-+
-+==== /a.ts (1 errors) ====
-+    import { x } from "foo/@bar";
-+                      ~~~~~~~~~~
-+!!! error TS2307: Cannot find module 'foo/@bar' or its corresponding type declarations.
-+    
-+==== /node_modules/foo/@bar/index.js (0 errors) ====
-+    not read
-+    
-+==== /node_modules/foo/package.json (0 errors) ====
-+    { "name": "foo", "version": "1.2.3", "types": "types.d.ts" }
-+    
-+==== /node_modules/foo/types.d.ts (0 errors) ====
-+    export const x = 0;
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile.errors.txt
deleted file mode 100644
index 790b7faebd..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/src/a.ts(1,20): error TS2307: Cannot find module './b' or its corresponding type declarations.
-
-
-==== /src/a.ts (1 errors) ====
-    import * as b from "./b";
-                       ~~~~~
-!!! error TS2307: Cannot find module './b' or its corresponding type declarations.
-    
-==== /src/b.js (0 errors) ====
-    export const x = 0;
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile.errors.txt.diff
deleted file mode 100644
index a6e04b7aa0..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.moduleResolution_relativeImportJsFile.errors.txt
-+++ new.moduleResolution_relativeImportJsFile.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/src/a.ts(1,20): error TS2307: Cannot find module './b' or its corresponding type declarations.
-+
-+
-+==== /src/a.ts (1 errors) ====
-+    import * as b from "./b";
-+                       ~~~~~
-+!!! error TS2307: Cannot find module './b' or its corresponding type declarations.
-+    
-+==== /src/b.js (0 errors) ====
-+    export const x = 0;
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt
index 790b7faebd..e3d36d4334 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt
@@ -1,10 +1,10 @@
-/src/a.ts(1,20): error TS2307: Cannot find module './b' or its corresponding type declarations.
+/src/a.ts(1,20): error TS7016: Could not find a declaration file for module './b'. '/src/b.js' implicitly has an 'any' type.
 
 
 ==== /src/a.ts (1 errors) ====
     import * as b from "./b";
                        ~~~~~
-!!! error TS2307: Cannot find module './b' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module './b'. '/src/b.js' implicitly has an 'any' type.
     
 ==== /src/b.js (0 errors) ====
     export const x = 0;
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt.diff
deleted file mode 100644
index b4c7f3e7a1..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt
-+++ new.moduleResolution_relativeImportJsFile_noImplicitAny.errors.txt
-@@= skipped -0, +0 lines =@@
--/src/a.ts(1,20): error TS7016: Could not find a declaration file for module './b'. '/src/b.js' implicitly has an 'any' type.
-+/src/a.ts(1,20): error TS2307: Cannot find module './b' or its corresponding type declarations.
- 
- 
- ==== /src/a.ts (1 errors) ====
-     import * as b from "./b";
-                        ~~~~~
--!!! error TS7016: Could not find a declaration file for module './b'. '/src/b.js' implicitly has an 'any' type.
-+!!! error TS2307: Cannot find module './b' or its corresponding type declarations.
-     
- ==== /src/b.js (0 errors) ====
-     export const x = 0;
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.errors.txt b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.errors.txt
new file mode 100644
index 0000000000..9e203e02e3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.errors.txt
@@ -0,0 +1,31 @@
+index.ts(2,31): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(3,31): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+
+
+==== node_modules/pkg/package.json (0 errors) ====
+    {
+        "name": "pkg",
+        "version": "0.0.1"
+    }
+==== node_modules/pkg/index.d.ts (0 errors) ====
+    export const item = 4;
+==== pkg/package.json (0 errors) ====
+    {
+        "private": true
+    }
+==== pkg/index.d.ts (0 errors) ====
+    export const item = 4;
+==== package.json (0 errors) ====
+    {
+        "type": "module",
+        "private": true
+    }
+==== index.ts (2 errors) ====
+    import { item } from "pkg"; // should work (`index.js` is assumed to be the entrypoint for packages found via nonrelative import)
+    import { item as item2 } from "./pkg";  // shouldn't work (`index.js` is _not_ assumed to be the entrypoint for packages found via relative import)
+                                  ~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import { item as item3 } from "./node_modules/pkg" // _even if they're in a node_modules folder_
+                                  ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.errors.txt.diff
deleted file mode 100644
index 242bb07dff..0000000000
--- a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.errors.txt.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- old.nodeNextImportModeImplicitIndexResolution.errors.txt
-+++ new.nodeNextImportModeImplicitIndexResolution.errors.txt
-@@= skipped -0, +-1 lines =@@
--index.ts(2,31): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(3,31): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--
--
--==== node_modules/pkg/package.json (0 errors) ====
--    {
--        "name": "pkg",
--        "version": "0.0.1"
--    }
--==== node_modules/pkg/index.d.ts (0 errors) ====
--    export const item = 4;
--==== pkg/package.json (0 errors) ====
--    {
--        "private": true
--    }
--==== pkg/index.d.ts (0 errors) ====
--    export const item = 4;
--==== package.json (0 errors) ====
--    {
--        "type": "module",
--        "private": true
--    }
--==== index.ts (2 errors) ====
--    import { item } from "pkg"; // should work (`index.js` is assumed to be the entrypoint for packages found via nonrelative import)
--    import { item as item2 } from "./pkg";  // shouldn't work (`index.js` is _not_ assumed to be the entrypoint for packages found via relative import)
--                                  ~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import { item as item3 } from "./node_modules/pkg" // _even if they're in a node_modules folder_
--                                  ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.symbols b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.symbols
index e0aee34a76..4a61fb6070 100644
--- a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.symbols
+++ b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.symbols
@@ -13,10 +13,8 @@ import { item } from "pkg"; // should work (`index.js` is assumed to be the entr
 >item : Symbol(item, Decl(index.ts, 0, 8))
 
 import { item as item2 } from "./pkg";  // shouldn't work (`index.js` is _not_ assumed to be the entrypoint for packages found via relative import)
->item : Symbol(item, Decl(index.d.ts, 0, 12))
 >item2 : Symbol(item2, Decl(index.ts, 1, 8))
 
 import { item as item3 } from "./node_modules/pkg" // _even if they're in a node_modules folder_
->item : Symbol(item, Decl(index.d.ts, 0, 12))
 >item3 : Symbol(item3, Decl(index.ts, 2, 8))
 
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.symbols.diff b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.symbols.diff
deleted file mode 100644
index baa99df3b6..0000000000
--- a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.symbols.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.nodeNextImportModeImplicitIndexResolution.symbols
-+++ new.nodeNextImportModeImplicitIndexResolution.symbols
-@@= skipped -12, +12 lines =@@
- >item : Symbol(item, Decl(index.ts, 0, 8))
- 
- import { item as item2 } from "./pkg";  // shouldn't work (`index.js` is _not_ assumed to be the entrypoint for packages found via relative import)
-+>item : Symbol(item, Decl(index.d.ts, 0, 12))
- >item2 : Symbol(item2, Decl(index.ts, 1, 8))
- 
- import { item as item3 } from "./node_modules/pkg" // _even if they're in a node_modules folder_
-+>item : Symbol(item, Decl(index.d.ts, 0, 12))
- >item3 : Symbol(item3, Decl(index.ts, 2, 8))
- 
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.types b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.types
index dc56e13fca..0b1e3f1a71 100644
--- a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.types
+++ b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.types
@@ -15,10 +15,10 @@ import { item } from "pkg"; // should work (`index.js` is assumed to be the entr
 >item : 4
 
 import { item as item2 } from "./pkg";  // shouldn't work (`index.js` is _not_ assumed to be the entrypoint for packages found via relative import)
->item : 4
->item2 : 4
+>item : any
+>item2 : any
 
 import { item as item3 } from "./node_modules/pkg" // _even if they're in a node_modules folder_
->item : 4
->item3 : 4
+>item : any
+>item3 : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.types.diff b/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.types.diff
deleted file mode 100644
index 4e9f3e90f4..0000000000
--- a/testdata/baselines/reference/submodule/compiler/nodeNextImportModeImplicitIndexResolution.types.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- old.nodeNextImportModeImplicitIndexResolution.types
-+++ new.nodeNextImportModeImplicitIndexResolution.types
-@@= skipped -14, +14 lines =@@
- >item : 4
- 
- import { item as item2 } from "./pkg";  // shouldn't work (`index.js` is _not_ assumed to be the entrypoint for packages found via relative import)
-->item : any
-->item2 : any
-+>item : 4
-+>item2 : 4
- 
- import { item as item3 } from "./node_modules/pkg" // _even if they're in a node_modules folder_
-->item : any
-->item3 : any
-+>item : 4
-+>item3 : 4
- 
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.errors.txt b/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.errors.txt
new file mode 100644
index 0000000000..00bab93c4a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.errors.txt
@@ -0,0 +1,18 @@
+/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
+
+
+==== /a/node_modules/foo.d.ts (0 errors) ====
+    export declare let x: number
+    
+==== /a/b/c/d/e/package.json (0 errors) ====
+    {
+        "name": "e",
+        "version": "1.0.0",
+        "type": "module"
+    }
+==== /a/b/c/d/e/app.ts (1 errors) ====
+    import {x} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
+    
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.errors.txt.diff
index 3f866e2a82..8c8fe9ea1e 100644
--- a/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.errors.txt.diff
@@ -1,25 +1,11 @@
 --- old.nodeNextModuleResolution1.errors.txt
 +++ new.nodeNextModuleResolution1.errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
--/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
--
--
+ /a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
+ 
+ 
 -!!! error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
--==== /a/node_modules/foo.d.ts (0 errors) ====
--    export declare let x: number
--    
--==== /a/b/c/d/e/package.json (0 errors) ====
--    {
--        "name": "e",
--        "version": "1.0.0",
--        "type": "module"
--    }
--==== /a/b/c/d/e/app.ts (1 errors) ====
--    import {x} from "foo";
--                    ~~~~~
--!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
--    
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
+ ==== /a/node_modules/foo.d.ts (0 errors) ====
+     export declare let x: number
+     
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.types b/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.types
index 2d6478f0a4..a09e0fd991 100644
--- a/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.types
+++ b/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.types
@@ -6,6 +6,6 @@ export declare let x: number
 
 === /a/b/c/d/e/app.ts ===
 import {x} from "foo";
->x : number
+>x : any
 
 
diff --git a/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.types.diff b/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.types.diff
deleted file mode 100644
index 9aaf80c1be..0000000000
--- a/testdata/baselines/reference/submodule/compiler/nodeNextModuleResolution1.types.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.nodeNextModuleResolution1.types
-+++ new.nodeNextModuleResolution1.types
-@@= skipped -5, +5 lines =@@
- 
- === /a/b/c/d/e/app.ts ===
- import {x} from "foo";
-->x : any
-+>x : number
- 
- 
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.errors.txt b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.errors.txt
index 3e32d854b6..b0784172a9 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.errors.txt
@@ -8,7 +8,7 @@
 /index.ts(2,70): error TS1128: Declaration or statement expected.
 /index.ts(2,71): error TS2304: Cannot find name 'RequireInterface'.
 /index.ts(3,36): error TS1005: ':' expected.
-/index.ts(3,70): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/index.ts(3,70): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /index.ts(5,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /index.ts(5,59): error TS1478: Identifier or string literal expected.
 /index.ts(5,59): error TS2695: Left side of comma operator is unused and has no side effects.
@@ -58,7 +58,7 @@
                                        ~
 !!! error TS1005: ':' expected.
                                                                          ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", { assert: {1234, "resolution-mode": "require"} }).RequireInterface);
                                      ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.errors.txt.diff
deleted file mode 100644
index 8a9ba05d6c..0000000000
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.errors.txt.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.parseAssertEntriesError.errors.txt
-+++ new.parseAssertEntriesError.errors.txt
-@@= skipped -7, +7 lines =@@
- /index.ts(2,70): error TS1128: Declaration or statement expected.
- /index.ts(2,71): error TS2304: Cannot find name 'RequireInterface'.
- /index.ts(3,36): error TS1005: ':' expected.
--/index.ts(3,70): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/index.ts(3,70): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /index.ts(5,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /index.ts(5,59): error TS1478: Identifier or string literal expected.
- /index.ts(5,59): error TS2695: Left side of comma operator is unused and has no side effects.
-@@= skipped -50, +50 lines =@@
-                                        ~
- !!! error TS1005: ':' expected.
-                                                                          ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", { assert: {1234, "resolution-mode": "require"} }).RequireInterface);
-                                      ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.js b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.js
index 851fae8c55..821815d6e0 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.js
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.js
@@ -23,16 +23,19 @@ export const b = (null as any as import("pkg", { assert: {1234, "resolution-mode
 
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 1234, "resolution-mode";
 "require";
 RequireInterface
     & import("pkg", { assert: { 1234: , "resolution-mode": "import" } }).ImportInterface;
-export const a = null;
+exports.a = null;
 1234, "resolution-mode";
 "require";
 RequireInterface;
 ;
-export const b = null;
+exports.b = null;
 1234, "resolution-mode";
 "import";
 ImportInterface;
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.js.diff b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.js.diff
index 565f0cca35..f53f5ebe60 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.js.diff
@@ -1,25 +1,6 @@
 --- old.parseAssertEntriesError.js
 +++ new.parseAssertEntriesError.js
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- 1234, "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { assert: { 1234: , "resolution-mode": "import" } }).ImportInterface;
--exports.a = null;
-+export const a = null;
- 1234, "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- 1234, "resolution-mode";
+@@= skipped -39, +39 lines =@@
  "import";
  ImportInterface;
  ;
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols
index e1bd68fc20..bef3c1ef2d 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols
@@ -16,6 +16,10 @@ export const a = (null as any as import("pkg", { assert: {1234, "resolution-mode
 export const b = (null as any as import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols.diff b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols.diff
index d886ffbd74..192041d42b 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.symbols.diff
@@ -8,14 +8,3 @@
  >assert : Symbol(assert, Decl(index.ts, 2, 21))
  >1234 : Symbol(1234, Decl(index.ts, 2, 31))
  >"resolution-mode" : Symbol("resolution-mode", Decl(index.ts, 2, 36))
-@@= skipped -11, +10 lines =@@
- export const b = (null as any as import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
index 96b3a1352e..88bc0595d0 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
@@ -14,7 +14,7 @@ export type LocalInterface =
 
     & import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface;
 >import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface : any
->import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{ assert: {1234, "resolution-mode": "import"} } : { assert: { 1234: any; "resolution-mode": string; }; }
 >assert : { 1234: any; "resolution-mode": string; }
@@ -47,6 +47,9 @@ export const b = (null as any as import("pkg", { assert: {1234, "resolution-mode
 >"import" : "import"
 >ImportInterface : any
 
+=== /node_modules/pkg/import.d.ts ===
+
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
deleted file mode 100644
index 081c83e428..0000000000
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- old.parseAssertEntriesError.types
-+++ new.parseAssertEntriesError.types
-@@= skipped -13, +13 lines =@@
- 
-     & import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface;
- >import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface : any
-->import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{ assert: {1234, "resolution-mode": "import"} } : { assert: { 1234: any; "resolution-mode": string; }; }
- >assert : { 1234: any; "resolution-mode": string; }
-@@= skipped -33, +33 lines =@@
- >"import" : "import"
- >ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.errors.txt b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.errors.txt
index fb694197d1..238a19f6ca 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.errors.txt
@@ -8,7 +8,7 @@
 /index.ts(2,68): error TS1128: Declaration or statement expected.
 /index.ts(2,69): error TS2304: Cannot find name 'RequireInterface'.
 /index.ts(3,34): error TS1005: ':' expected.
-/index.ts(3,68): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/index.ts(3,68): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /index.ts(5,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /index.ts(5,57): error TS1478: Identifier or string literal expected.
 /index.ts(5,57): error TS2695: Left side of comma operator is unused and has no side effects.
@@ -58,7 +58,7 @@
                                      ~
 !!! error TS1005: ':' expected.
                                                                        ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", { with: {1234, "resolution-mode": "require"} }).RequireInterface);
                                      ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.errors.txt.diff
deleted file mode 100644
index 24e8863855..0000000000
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.errors.txt.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.parseImportAttributesError.errors.txt
-+++ new.parseImportAttributesError.errors.txt
-@@= skipped -7, +7 lines =@@
- /index.ts(2,68): error TS1128: Declaration or statement expected.
- /index.ts(2,69): error TS2304: Cannot find name 'RequireInterface'.
- /index.ts(3,34): error TS1005: ':' expected.
--/index.ts(3,68): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/index.ts(3,68): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /index.ts(5,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /index.ts(5,57): error TS1478: Identifier or string literal expected.
- /index.ts(5,57): error TS2695: Left side of comma operator is unused and has no side effects.
-@@= skipped -50, +50 lines =@@
-                                      ~
- !!! error TS1005: ':' expected.
-                                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", { with: {1234, "resolution-mode": "require"} }).RequireInterface);
-                                      ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.js b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.js
index 69fe9576fc..813ee34ff0 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.js
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.js
@@ -26,16 +26,19 @@ export const b = (null as any as import("pkg", { with: {1234, "resolution-mode":
 
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 1234, "resolution-mode";
 "require";
 RequireInterface
     & import("pkg", { with: { 1234: , "resolution-mode": "import" } }).ImportInterface;
-export const a = null;
+exports.a = null;
 1234, "resolution-mode";
 "require";
 RequireInterface;
 ;
-export const b = null;
+exports.b = null;
 1234, "resolution-mode";
 "import";
 ImportInterface;
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.js.diff b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.js.diff
index 44df0dd328..a2df6ba34e 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.js.diff
@@ -1,25 +1,6 @@
 --- old.parseImportAttributesError.js
 +++ new.parseImportAttributesError.js
-@@= skipped -25, +25 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- 1234, "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { with: { 1234: , "resolution-mode": "import" } }).ImportInterface;
--exports.a = null;
-+export const a = null;
- 1234, "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- 1234, "resolution-mode";
+@@= skipped -42, +42 lines =@@
  "import";
  ImportInterface;
  ;
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols
index 31559d40a1..d6a5e807b3 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols
@@ -16,6 +16,10 @@ export const a = (null as any as import("pkg", { with: {1234, "resolution-mode":
 export const b = (null as any as import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols.diff b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols.diff
index 0ba8104dba..6fc2004c04 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.symbols.diff
@@ -8,14 +8,3 @@
  >with : Symbol(with, Decl(index.ts, 2, 21))
  >1234 : Symbol(1234, Decl(index.ts, 2, 29))
  >"resolution-mode" : Symbol("resolution-mode", Decl(index.ts, 2, 34))
-@@= skipped -11, +10 lines =@@
- export const b = (null as any as import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
index 39208c00f2..60ba390c49 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
@@ -14,7 +14,7 @@ export type LocalInterface =
 
     & import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface;
 >import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface : any
->import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{ with: {1234, "resolution-mode": "import"} } : { with: { 1234: any; "resolution-mode": string; }; }
 >with : { 1234: any; "resolution-mode": string; }
@@ -47,6 +47,10 @@ export const b = (null as any as import("pkg", { with: {1234, "resolution-mode":
 >"import" : "import"
 >ImportInterface : any
 
+=== /node_modules/pkg/import.d.ts ===
+
+export interface ImportInterface {}
+
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
deleted file mode 100644
index 0114b2ccf2..0000000000
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.parseImportAttributesError.types
-+++ new.parseImportAttributesError.types
-@@= skipped -13, +13 lines =@@
- 
-     & import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface;
- >import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface : any
-->import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{ with: {1234, "resolution-mode": "import"} } : { with: { 1234: any; "resolution-mode": string; }; }
- >with : { 1234: any; "resolution-mode": string; }
-@@= skipped -33, +33 lines =@@
- >"import" : "import"
- >ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
--
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js b/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js
index ae9b087a5c..f1f52df8fa 100644
--- a/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js
+++ b/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js
@@ -20,4 +20,7 @@ import './';
 
 
 //// [file.js]
-export const a = <div></div>;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = void 0;
+exports.a = <div></div>;
diff --git a/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js.diff b/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js.diff
index 025fe77762..f2c3c051f5 100644
--- a/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js.diff
@@ -1,12 +1,9 @@
 --- old.reactJsxReactResolvedNodeNext.js
 +++ new.reactJsxReactResolvedNodeNext.js
-@@= skipped -19, +19 lines =@@
- 
- 
- //// [file.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.a = void 0;
+@@= skipped -22, +22 lines =@@
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.a = void 0;
 -const jsx_runtime_1 = require("react/jsx-runtime");
 -exports.a = (0, jsx_runtime_1.jsx)("div", {});
-+export const a = <div></div>;
++exports.a = <div></div>;
diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.errors.txt b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.errors.txt
index 37268630c0..3ee146ee8a 100644
--- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileInJsFile.errors.txt
@@ -1,6 +1,6 @@
 /user.js(2,7): error TS2339: Property 'b' does not exist on type '{ a: number; }'.
 /user.js(5,15): error TS2580: Cannot find name 'require'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
-/user.js(8,21): error TS2307: Cannot find module './js.js' or its corresponding type declarations.
+/user.js(8,21): error TS7016: Could not find a declaration file for module './js.js'. '/js.js' implicitly has an 'any' type.
 /user.js(9,7): error TS2339: Property 'b' does not exist on type '{ a: number; }'.
 /user.js(12,13): error TS2580: Cannot find name 'require'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
 
@@ -19,7 +19,7 @@
     
     const js0 = require("./js.js");
                         ~~~~~~~~~
-!!! error TS2307: Cannot find module './js.js' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module './js.js'. '/js.js' implicitly has an 'any' type.
     json0.b; // Error (good)
           ~
 !!! error TS2339: Property 'b' does not exist on type '{ a: number; }'.
diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt
index dfaabd0ca0..de95af399d 100644
--- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt
@@ -1,4 +1,4 @@
-/a.ts(1,20): error TS2307: Cannot find module 'foo/bar/foobar.json' or its corresponding type declarations.
+/a.ts(1,20): error TS2732: Cannot find module 'foo/bar/foobar.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
 
 
 ==== /tsconfig.json (0 errors) ====
@@ -16,7 +16,7 @@
 ==== /a.ts (1 errors) ====
     import foobar from "foo/bar/foobar.json";
                        ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'foo/bar/foobar.json' or its corresponding type declarations.
+!!! error TS2732: Cannot find module 'foo/bar/foobar.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
     
 ==== /node_modules/foo/bar/foobar.json (0 errors) ====
     { "a": 10 }
diff --git a/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt b/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt
new file mode 100644
index 0000000000..40b353506a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt
@@ -0,0 +1,25 @@
+test.ts(1,19): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+
+
+==== tsconfig.json (0 errors) ====
+    {
+        "compilerOptions": {
+            "paths": {
+                "foo/*": ["./dist/*"],
+                "baz/*.ts": ["./types/*.d.ts"]
+            }
+        }
+    }
+    
+==== dist/bar.ts (0 errors) ====
+    export const a = 1234;
+    
+==== types/main.d.ts (0 errors) ====
+    export const b: string;
+    
+==== test.ts (1 errors) ====
+    import { a } from "foo/bar.ts";
+                      ~~~~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import { b } from "baz/main.ts";
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt.diff
index 80b41c9f4c..f0173e6d36 100644
--- a/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt.diff
@@ -1,33 +1,16 @@
 --- old.resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt
 +++ new.resolutionCandidateFromPackageJsonField2(moduleresolution=bundler).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -tsconfig.json(2,5): error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
--test.ts(1,19): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--
--
+ test.ts(1,19): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ 
+ 
 -==== tsconfig.json (1 errors) ====
--    {
--        "compilerOptions": {
++==== tsconfig.json (0 errors) ====
+     {
+         "compilerOptions": {
 -        ~~~~~~~~~~~~~~~~~
 -!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
--            "paths": {
--                "foo/*": ["./dist/*"],
--                "baz/*.ts": ["./types/*.d.ts"]
--            }
--        }
--    }
--    
--==== dist/bar.ts (0 errors) ====
--    export const a = 1234;
--    
--==== types/main.d.ts (0 errors) ====
--    export const b: string;
--    
--==== test.ts (1 errors) ====
--    import { a } from "foo/bar.ts";
--                      ~~~~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import { b } from "baz/main.ts";
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
+             "paths": {
+                 "foo/*": ["./dist/*"],
+                 "baz/*.ts": ["./types/*.d.ts"]
diff --git a/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt b/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt
new file mode 100644
index 0000000000..40b353506a
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt
@@ -0,0 +1,25 @@
+test.ts(1,19): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+
+
+==== tsconfig.json (0 errors) ====
+    {
+        "compilerOptions": {
+            "paths": {
+                "foo/*": ["./dist/*"],
+                "baz/*.ts": ["./types/*.d.ts"]
+            }
+        }
+    }
+    
+==== dist/bar.ts (0 errors) ====
+    export const a = 1234;
+    
+==== types/main.d.ts (0 errors) ====
+    export const b: string;
+    
+==== test.ts (1 errors) ====
+    import { a } from "foo/bar.ts";
+                      ~~~~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import { b } from "baz/main.ts";
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt.diff
deleted file mode 100644
index 80d73c46fe..0000000000
--- a/testdata/baselines/reference/submodule/compiler/resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- old.resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt
-+++ new.resolutionCandidateFromPackageJsonField2(moduleresolution=node10).errors.txt
-@@= skipped -0, +-1 lines =@@
--test.ts(1,19): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--
--
--==== tsconfig.json (0 errors) ====
--    {
--        "compilerOptions": {
--            "paths": {
--                "foo/*": ["./dist/*"],
--                "baz/*.ts": ["./types/*.d.ts"]
--            }
--        }
--    }
--    
--==== dist/bar.ts (0 errors) ====
--    export const a = 1234;
--    
--==== types/main.d.ts (0 errors) ====
--    export const b: string;
--    
--==== test.ts (1 errors) ====
--    import { a } from "foo/bar.ts";
--                      ~~~~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import { b } from "baz/main.ts";
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js b/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js
index 6885c11fb0..b9f2790a4b 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js
@@ -7,6 +7,8 @@ import "./does-not-exist-either.js";
 
 
 //// [sideEffectImports1.js]
-import "does-not-exist";
-import "./does-not-exist-either";
-import "./does-not-exist-either.js";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("does-not-exist");
+require("./does-not-exist-either");
+require("./does-not-exist-either.js");
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js.diff
deleted file mode 100644
index e8fb18dc5f..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js
-+++ new.sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=false).js
-@@= skipped -6, +6 lines =@@
- 
- 
- //// [sideEffectImports1.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--require("does-not-exist");
--require("./does-not-exist-either");
--require("./does-not-exist-either.js");
-+import "does-not-exist";
-+import "./does-not-exist-either";
-+import "./does-not-exist-either.js";
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js b/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js
index 6885c11fb0..b9f2790a4b 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js
@@ -7,6 +7,8 @@ import "./does-not-exist-either.js";
 
 
 //// [sideEffectImports1.js]
-import "does-not-exist";
-import "./does-not-exist-either";
-import "./does-not-exist-either.js";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("does-not-exist");
+require("./does-not-exist-either");
+require("./does-not-exist-either.js");
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js.diff
deleted file mode 100644
index 55e98f79fd..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js
-+++ new.sideEffectImports1(module=nodenext,nouncheckedsideeffectimports=true).js
-@@= skipped -6, +6 lines =@@
- 
- 
- //// [sideEffectImports1.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--require("does-not-exist");
--require("./does-not-exist-either");
--require("./does-not-exist-either.js");
-+import "does-not-exist";
-+import "./does-not-exist-either";
-+import "./does-not-exist-either.js";
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt b/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt
deleted file mode 100644
index 7125dd4a28..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-index.ts(1,8): error TS2307: Cannot find module 'source-map-support/register' or its corresponding type declarations.
-
-
-==== tsconfig.json (0 errors) ====
-    {
-        "include": ["index.ts"],
-    }
-    
-==== index.ts (1 errors) ====
-    import "source-map-support/register";
-           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'source-map-support/register' or its corresponding type declarations.
-    
-==== node_modules/source-map-support/register.js (0 errors) ====
-    module.exports = {};
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt.diff
deleted file mode 100644
index ea46cb5f3c..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- old.sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt
-+++ new.sideEffectImports2(noimplicitany=false,nouncheckedsideeffectimports=true).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+index.ts(1,8): error TS2307: Cannot find module 'source-map-support/register' or its corresponding type declarations.
-+
-+
-+==== tsconfig.json (0 errors) ====
-+    {
-+        "include": ["index.ts"],
-+    }
-+    
-+==== index.ts (1 errors) ====
-+    import "source-map-support/register";
-+           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module 'source-map-support/register' or its corresponding type declarations.
-+    
-+==== node_modules/source-map-support/register.js (0 errors) ====
-+    module.exports = {};
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt b/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt
deleted file mode 100644
index 7125dd4a28..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-index.ts(1,8): error TS2307: Cannot find module 'source-map-support/register' or its corresponding type declarations.
-
-
-==== tsconfig.json (0 errors) ====
-    {
-        "include": ["index.ts"],
-    }
-    
-==== index.ts (1 errors) ====
-    import "source-map-support/register";
-           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'source-map-support/register' or its corresponding type declarations.
-    
-==== node_modules/source-map-support/register.js (0 errors) ====
-    module.exports = {};
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt.diff
deleted file mode 100644
index 392483ecc3..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- old.sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt
-+++ new.sideEffectImports2(noimplicitany=true,nouncheckedsideeffectimports=true).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+index.ts(1,8): error TS2307: Cannot find module 'source-map-support/register' or its corresponding type declarations.
-+
-+
-+==== tsconfig.json (0 errors) ====
-+    {
-+        "include": ["index.ts"],
-+    }
-+    
-+==== index.ts (1 errors) ====
-+    import "source-map-support/register";
-+           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module 'source-map-support/register' or its corresponding type declarations.
-+    
-+==== node_modules/source-map-support/register.js (0 errors) ====
-+    module.exports = {};
-+    
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js
index 4d7ea3d766..f0426f699a 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js
@@ -10,4 +10,6 @@ console.log("Hello, world!");
 //// [not-a-module.js]
 console.log("Hello, world!");
 //// [index.js]
-import "./not-a-module";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./not-a-module");
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js.diff
deleted file mode 100644
index a21d14769e..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js
-+++ new.sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=false).js
-@@= skipped -9, +9 lines =@@
- //// [not-a-module.js]
- console.log("Hello, world!");
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--require("./not-a-module");
-+import "./not-a-module";
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js
index 4d7ea3d766..f0426f699a 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js
@@ -10,4 +10,6 @@ console.log("Hello, world!");
 //// [not-a-module.js]
 console.log("Hello, world!");
 //// [index.js]
-import "./not-a-module";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./not-a-module");
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js.diff
deleted file mode 100644
index aa4118a285..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js
-+++ new.sideEffectImports3(moduledetection=auto,nouncheckedsideeffectimports=true).js
-@@= skipped -9, +9 lines =@@
- //// [not-a-module.js]
- console.log("Hello, world!");
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--require("./not-a-module");
-+import "./not-a-module";
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=false).js b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=false).js
index 4d7ea3d766..f0426f699a 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=false).js
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=false).js
@@ -10,4 +10,6 @@ console.log("Hello, world!");
 //// [not-a-module.js]
 console.log("Hello, world!");
 //// [index.js]
-import "./not-a-module";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./not-a-module");
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=false).js.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=false).js.diff
index 09e00cac86..73fae6f1af 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=false).js.diff
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=false).js.diff
@@ -8,7 +8,4 @@
 -Object.defineProperty(exports, "__esModule", { value: true });
  console.log("Hello, world!");
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--require("./not-a-module");
-+import "./not-a-module";
+ "use strict";
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=true).js b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=true).js
index 4d7ea3d766..f0426f699a 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=true).js
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=true).js
@@ -10,4 +10,6 @@ console.log("Hello, world!");
 //// [not-a-module.js]
 console.log("Hello, world!");
 //// [index.js]
-import "./not-a-module";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./not-a-module");
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=true).js.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=true).js.diff
index 59f5a7a692..41638cb800 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=true).js.diff
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=force,nouncheckedsideeffectimports=true).js.diff
@@ -8,7 +8,4 @@
 -Object.defineProperty(exports, "__esModule", { value: true });
  console.log("Hello, world!");
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--require("./not-a-module");
-+import "./not-a-module";
+ "use strict";
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js
index 4d7ea3d766..f0426f699a 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js
@@ -10,4 +10,6 @@ console.log("Hello, world!");
 //// [not-a-module.js]
 console.log("Hello, world!");
 //// [index.js]
-import "./not-a-module";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./not-a-module");
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js.diff
deleted file mode 100644
index 190b2ca5cc..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js
-+++ new.sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=false).js
-@@= skipped -9, +9 lines =@@
- //// [not-a-module.js]
- console.log("Hello, world!");
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--require("./not-a-module");
-+import "./not-a-module";
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js
index 4d7ea3d766..f0426f699a 100644
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js
+++ b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js
@@ -10,4 +10,6 @@ console.log("Hello, world!");
 //// [not-a-module.js]
 console.log("Hello, world!");
 //// [index.js]
-import "./not-a-module";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./not-a-module");
diff --git a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js.diff b/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js.diff
deleted file mode 100644
index 7538be69a5..0000000000
--- a/testdata/baselines/reference/submodule/compiler/sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js
-+++ new.sideEffectImports3(moduledetection=legacy,nouncheckedsideeffectimports=true).js
-@@= skipped -9, +9 lines =@@
- //// [not-a-module.js]
- console.log("Hello, world!");
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--require("./not-a-module");
-+import "./not-a-module";
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
index 5b7957a98c..68e7ef9613 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
@@ -40,5 +40,31 @@ import * as pkg from "package-b";
 export const a = pkg.invoke();
 
 //// [index.js]
-import * as pkg from "package-b";
-export const a = pkg.invoke();
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = void 0;
+const pkg = __importStar(require("package-b"));
+exports.a = pkg.invoke();
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js.diff
index e6f3a74859..e5a9d1c7c4 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js.diff
@@ -1,40 +1,10 @@
 --- old.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
 +++ new.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
-@@= skipped -39, +39 lines =@@
- export const a = pkg.invoke();
- 
- //// [index.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.a = void 0;
--const pkg = __importStar(require("package-b"));
--exports.a = pkg.invoke();
+@@= skipped -67, +67 lines =@@
+ exports.a = void 0;
+ const pkg = __importStar(require("package-b"));
+ exports.a = pkg.invoke();
 -
 -
 -//// [index.d.ts]
 -export declare const a: import("package-a/cls").Foo;
-+import * as pkg from "package-b";
-+export const a = pkg.invoke();
diff --git a/testdata/baselines/reference/submodule/compiler/untypedModuleImport_withAugmentation2.errors.txt b/testdata/baselines/reference/submodule/compiler/untypedModuleImport_withAugmentation2.errors.txt
new file mode 100644
index 0000000000..f0c6781aba
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/untypedModuleImport_withAugmentation2.errors.txt
@@ -0,0 +1,17 @@
+/node_modules/augmenter/index.d.ts(1,16): error TS2665: Invalid module name in augmentation. Module 'js' resolves to an untyped module at '/node_modules/js/index.js', which cannot be augmented.
+
+
+==== /a.ts (0 errors) ====
+    import { } from "augmenter";
+    
+==== /node_modules/augmenter/index.d.ts (1 errors) ====
+    declare module "js" {
+                   ~~~~
+!!! error TS2665: Invalid module name in augmentation. Module 'js' resolves to an untyped module at '/node_modules/js/index.js', which cannot be augmented.
+        export const j: number;
+    }
+    export {};
+    
+==== /node_modules/js/index.js (0 errors) ====
+    This file is not processed.
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/untypedModuleImport_withAugmentation2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/untypedModuleImport_withAugmentation2.errors.txt.diff
deleted file mode 100644
index 7930e0c6a8..0000000000
--- a/testdata/baselines/reference/submodule/compiler/untypedModuleImport_withAugmentation2.errors.txt.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.untypedModuleImport_withAugmentation2.errors.txt
-+++ new.untypedModuleImport_withAugmentation2.errors.txt
-@@= skipped -0, +-1 lines =@@
--/node_modules/augmenter/index.d.ts(1,16): error TS2665: Invalid module name in augmentation. Module 'js' resolves to an untyped module at '/node_modules/js/index.js', which cannot be augmented.
--
--
--==== /a.ts (0 errors) ====
--    import { } from "augmenter";
--    
--==== /node_modules/augmenter/index.d.ts (1 errors) ====
--    declare module "js" {
--                   ~~~~
--!!! error TS2665: Invalid module name in augmentation. Module 'js' resolves to an untyped module at '/node_modules/js/index.js', which cannot be augmented.
--        export const j: number;
--    }
--    export {};
--    
--==== /node_modules/js/index.js (0 errors) ====
--    This file is not processed.
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.errors.txt b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.errors.txt
new file mode 100644
index 0000000000..d66055353d
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.errors.txt
@@ -0,0 +1,40 @@
+b.ts(2,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+b.ts(3,30): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+b.ts(5,25): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+c.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+c.ts(3,30): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+c.ts(5,25): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+
+
+==== a.ts (0 errors) ====
+    export class A {}
+    
+==== a.d.ts (0 errors) ====
+    export class A {}
+    
+==== b.ts (3 errors) ====
+    import type { A } from "./a.ts"; // ok
+    import {} from "./a.ts"; // error
+                   ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import { type A as _A } from "./a.ts"; // error
+                                 ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    type __A = import("./a.ts").A; // ok
+    const aPromise = import("./a.ts"); // error
+                            ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    
+==== c.ts (3 errors) ====
+    import type { A } from "./a.d.ts"; // ok
+    import {} from "./a.d.ts"; // error
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+    import { type A as _A } from "./a.d.ts"; // error
+                                 ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+    type __A = import("./a.d.ts").A; // ok
+    const aPromise = import("./a.d.ts"); // error
+                            ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.errors.txt.diff
deleted file mode 100644
index 92cb28067b..0000000000
--- a/testdata/baselines/reference/submodule/conformance/allowsImportingTsExtension.errors.txt.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- old.allowsImportingTsExtension.errors.txt
-+++ new.allowsImportingTsExtension.errors.txt
-@@= skipped -0, +-1 lines =@@
--b.ts(2,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--b.ts(3,30): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--b.ts(5,25): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--c.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--c.ts(3,30): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--c.ts(5,25): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--
--
--==== a.ts (0 errors) ====
--    export class A {}
--    
--==== a.d.ts (0 errors) ====
--    export class A {}
--    
--==== b.ts (3 errors) ====
--    import type { A } from "./a.ts"; // ok
--    import {} from "./a.ts"; // error
--                   ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import { type A as _A } from "./a.ts"; // error
--                                 ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    type __A = import("./a.ts").A; // ok
--    const aPromise = import("./a.ts"); // error
--                            ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    
--==== c.ts (3 errors) ====
--    import type { A } from "./a.d.ts"; // ok
--    import {} from "./a.d.ts"; // error
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--    import { type A as _A } from "./a.d.ts"; // error
--                                 ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--    type __A = import("./a.d.ts").A; // ok
--    const aPromise = import("./a.d.ts"); // error
--                            ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node16).js b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node16).js
index 98d67e8ac7..2b1830728a 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node16).js
@@ -33,22 +33,49 @@ const importStarTestA: typeC.otherType = "expect error about otherType";
 
 
 //// [arbitraryModuleNamespaceIdentifiers_module.js]
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports["<Z>"] = exports["<Y>"] = exports["<X>"] = void 0;
 const someValue = "someValue";
-export { someValue as "<X>" };
-import { "<X>" as valueX } from "./arbitraryModuleNamespaceIdentifiers_module";
-if (valueX !== "someValue")
+exports["<X>"] = someValue;
+const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module");
+if (arbitraryModuleNamespaceIdentifiers_module_1["<X>"] !== "someValue")
     throw "should be someValue";
-export { "<X>" as "<Y>" } from "./arbitraryModuleNamespaceIdentifiers_module";
-import { "<Y>" as valueY } from "./arbitraryModuleNamespaceIdentifiers_module";
-if (valueY !== "someValue")
+const arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module");
+Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2["<X>"]; } });
+const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
+if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
     throw "should be someValue";
-export * as "<Z>" from "./arbitraryModuleNamespaceIdentifiers_module";
-import { "<Z>" as valueZ } from "./arbitraryModuleNamespaceIdentifiers_module";
-if (valueZ["<X>"] !== "someValue")
+exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
+const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
+if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
     throw "should be someValue";
-if (valueZ["<Y>"] !== "someValue")
+if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<Y>"] !== "someValue")
     throw "should be someValue";
-if (valueZ["<Z>"] !== valueZ)
+if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<Z>"] !== arbitraryModuleNamespaceIdentifiers_module_4["<Z>"])
     throw "should be export namespace";
 const importTest = "expect error about someType";
 const reimportTest = "expect error about someType";
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node16).js.diff
index 49c48bfea4..18fceb66e0 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node16).js.diff
@@ -1,64 +1,15 @@
 --- old.arbitraryModuleNamespaceIdentifiers_module(module=node16).js
 +++ new.arbitraryModuleNamespaceIdentifiers_module(module=node16).js
-@@= skipped -32, +32 lines =@@
- 
- 
- //// [arbitraryModuleNamespaceIdentifiers_module.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--exports["<Z>"] = exports["<Y>"] = exports["<X>"] = void 0;
- const someValue = "someValue";
--exports["<X>"] = someValue;
--const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module");
--if (arbitraryModuleNamespaceIdentifiers_module_1["<X>"] !== "someValue")
-+export { someValue as "<X>" };
-+import { "<X>" as valueX } from "./arbitraryModuleNamespaceIdentifiers_module";
-+if (valueX !== "someValue")
+@@= skipped -63, +63 lines =@@
+ const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module");
+ if (arbitraryModuleNamespaceIdentifiers_module_1["<X>"] !== "someValue")
      throw "should be someValue";
 -var arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module");
--Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2["<X>"]; } });
--const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
--if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
-+export { "<X>" as "<Y>" } from "./arbitraryModuleNamespaceIdentifiers_module";
-+import { "<Y>" as valueY } from "./arbitraryModuleNamespaceIdentifiers_module";
-+if (valueY !== "someValue")
-     throw "should be someValue";
--exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
--const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
--if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
-+export * as "<Z>" from "./arbitraryModuleNamespaceIdentifiers_module";
-+import { "<Z>" as valueZ } from "./arbitraryModuleNamespaceIdentifiers_module";
-+if (valueZ["<X>"] !== "someValue")
-     throw "should be someValue";
--if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<Y>"] !== "someValue")
-+if (valueZ["<Y>"] !== "someValue")
-     throw "should be someValue";
--if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<Z>"] !== arbitraryModuleNamespaceIdentifiers_module_4["<Z>"])
-+if (valueZ["<Z>"] !== valueZ)
-     throw "should be export namespace";
++const arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module");
+ Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2["<X>"]; } });
+ const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
+ if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
+@@= skipped -16, +16 lines =@@
  const importTest = "expect error about someType";
  const reimportTest = "expect error about someType";
  const importStarTestA = "expect error about otherType";
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js
index 98d67e8ac7..2b1830728a 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js
@@ -33,22 +33,49 @@ const importStarTestA: typeC.otherType = "expect error about otherType";
 
 
 //// [arbitraryModuleNamespaceIdentifiers_module.js]
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports["<Z>"] = exports["<Y>"] = exports["<X>"] = void 0;
 const someValue = "someValue";
-export { someValue as "<X>" };
-import { "<X>" as valueX } from "./arbitraryModuleNamespaceIdentifiers_module";
-if (valueX !== "someValue")
+exports["<X>"] = someValue;
+const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module");
+if (arbitraryModuleNamespaceIdentifiers_module_1["<X>"] !== "someValue")
     throw "should be someValue";
-export { "<X>" as "<Y>" } from "./arbitraryModuleNamespaceIdentifiers_module";
-import { "<Y>" as valueY } from "./arbitraryModuleNamespaceIdentifiers_module";
-if (valueY !== "someValue")
+const arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module");
+Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2["<X>"]; } });
+const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
+if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
     throw "should be someValue";
-export * as "<Z>" from "./arbitraryModuleNamespaceIdentifiers_module";
-import { "<Z>" as valueZ } from "./arbitraryModuleNamespaceIdentifiers_module";
-if (valueZ["<X>"] !== "someValue")
+exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
+const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
+if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
     throw "should be someValue";
-if (valueZ["<Y>"] !== "someValue")
+if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<Y>"] !== "someValue")
     throw "should be someValue";
-if (valueZ["<Z>"] !== valueZ)
+if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<Z>"] !== arbitraryModuleNamespaceIdentifiers_module_4["<Z>"])
     throw "should be export namespace";
 const importTest = "expect error about someType";
 const reimportTest = "expect error about someType";
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js.diff
index d97fff7f66..6bc968c565 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js.diff
@@ -1,64 +1,15 @@
 --- old.arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js
 +++ new.arbitraryModuleNamespaceIdentifiers_module(module=nodenext).js
-@@= skipped -32, +32 lines =@@
- 
- 
- //// [arbitraryModuleNamespaceIdentifiers_module.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--exports["<Z>"] = exports["<Y>"] = exports["<X>"] = void 0;
- const someValue = "someValue";
--exports["<X>"] = someValue;
--const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module");
--if (arbitraryModuleNamespaceIdentifiers_module_1["<X>"] !== "someValue")
-+export { someValue as "<X>" };
-+import { "<X>" as valueX } from "./arbitraryModuleNamespaceIdentifiers_module";
-+if (valueX !== "someValue")
+@@= skipped -63, +63 lines =@@
+ const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module");
+ if (arbitraryModuleNamespaceIdentifiers_module_1["<X>"] !== "someValue")
      throw "should be someValue";
 -var arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module");
--Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2["<X>"]; } });
--const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
--if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
-+export { "<X>" as "<Y>" } from "./arbitraryModuleNamespaceIdentifiers_module";
-+import { "<Y>" as valueY } from "./arbitraryModuleNamespaceIdentifiers_module";
-+if (valueY !== "someValue")
-     throw "should be someValue";
--exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
--const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
--if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
-+export * as "<Z>" from "./arbitraryModuleNamespaceIdentifiers_module";
-+import { "<Z>" as valueZ } from "./arbitraryModuleNamespaceIdentifiers_module";
-+if (valueZ["<X>"] !== "someValue")
-     throw "should be someValue";
--if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<Y>"] !== "someValue")
-+if (valueZ["<Y>"] !== "someValue")
-     throw "should be someValue";
--if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<Z>"] !== arbitraryModuleNamespaceIdentifiers_module_4["<Z>"])
-+if (valueZ["<Z>"] !== valueZ)
-     throw "should be export namespace";
++const arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module");
+ Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2["<X>"]; } });
+ const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
+ if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
+@@= skipped -16, +16 lines =@@
  const importTest = "expect error about someType";
  const reimportTest = "expect error about someType";
  const importStarTestA = "expect error about otherType";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt
new file mode 100644
index 0000000000..0641005dbf
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt
@@ -0,0 +1,87 @@
+/project/main.ts(3,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/project/main.ts(7,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
+/project/main.ts(11,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/project/main.ts(12,16): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+/project/main.ts(16,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+
+
+==== /project/a.ts (0 errors) ====
+    export {};
+    
+==== /project/b.ts (0 errors) ====
+    export {};
+    
+==== /project/b.js (0 errors) ====
+    export {};
+    
+==== /project/b.d.ts (0 errors) ====
+    export {};
+    
+==== /project/c.ts (0 errors) ====
+    export {};
+    
+==== /project/c.tsx (0 errors) ====
+    export {};
+    
+==== /project/d/index.ts (0 errors) ====
+    export {};
+    
+==== /project/e (0 errors) ====
+    WOMP WOMP BINARY DATA
+    
+==== /project/e.ts (0 errors) ====
+    export {};
+    
+==== /project/e.txt (0 errors) ====
+    The letter e is for elephant
+    This poem is not about elephants
+    It is about the letter e
+    - Authored by GitHub Copilot, Nov 2022
+    
+==== /project/e.txt.ts (0 errors) ====
+    export {};
+    
+==== /project/main.ts (6 errors) ====
+    import {} from "./a";
+    import {} from "./a.js";
+    import {} from "./a.ts";
+                   ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    
+    import {} from "./b";
+    import {} from "./b.js";
+    import {} from "./b.ts";
+                   ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import {} from "./b.d.ts";
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
+    import type {} from "./b.d.ts";
+    
+    import {} from "./c.ts";
+                   ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import {} from "./c.tsx";
+                   ~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+    
+    import {} from "./d";
+    import {} from "./d/index";
+    import {} from "./d/index.ts";
+                   ~~~~~~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    
+    // These should not resolve, but preventing them has
+    // relatively little utility compared to the cost of
+    // the filesystem hits.
+    import {} from "./e";
+    import {} from "./e.txt";
+    
+==== /project/types.d.ts (1 errors) ====
+    import {} from "./a.ts";
+    import {} from "./a.d.ts";
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+    import type {} from "./a.d.ts";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt
new file mode 100644
index 0000000000..0641005dbf
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt
@@ -0,0 +1,87 @@
+/project/main.ts(3,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/project/main.ts(7,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
+/project/main.ts(11,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/project/main.ts(12,16): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+/project/main.ts(16,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+
+
+==== /project/a.ts (0 errors) ====
+    export {};
+    
+==== /project/b.ts (0 errors) ====
+    export {};
+    
+==== /project/b.js (0 errors) ====
+    export {};
+    
+==== /project/b.d.ts (0 errors) ====
+    export {};
+    
+==== /project/c.ts (0 errors) ====
+    export {};
+    
+==== /project/c.tsx (0 errors) ====
+    export {};
+    
+==== /project/d/index.ts (0 errors) ====
+    export {};
+    
+==== /project/e (0 errors) ====
+    WOMP WOMP BINARY DATA
+    
+==== /project/e.ts (0 errors) ====
+    export {};
+    
+==== /project/e.txt (0 errors) ====
+    The letter e is for elephant
+    This poem is not about elephants
+    It is about the letter e
+    - Authored by GitHub Copilot, Nov 2022
+    
+==== /project/e.txt.ts (0 errors) ====
+    export {};
+    
+==== /project/main.ts (6 errors) ====
+    import {} from "./a";
+    import {} from "./a.js";
+    import {} from "./a.ts";
+                   ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    
+    import {} from "./b";
+    import {} from "./b.js";
+    import {} from "./b.ts";
+                   ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import {} from "./b.d.ts";
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
+    import type {} from "./b.d.ts";
+    
+    import {} from "./c.ts";
+                   ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import {} from "./c.tsx";
+                   ~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+    
+    import {} from "./d";
+    import {} from "./d/index";
+    import {} from "./d/index.ts";
+                   ~~~~~~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    
+    // These should not resolve, but preventing them has
+    // relatively little utility compared to the cost of
+    // the filesystem hits.
+    import {} from "./e";
+    import {} from "./e.txt";
+    
+==== /project/types.d.ts (1 errors) ====
+    import {} from "./a.ts";
+    import {} from "./a.d.ts";
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+    import type {} from "./a.d.ts";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt
new file mode 100644
index 0000000000..18463589db
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt
@@ -0,0 +1,72 @@
+/project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
+/project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
+
+
+==== /project/a.ts (0 errors) ====
+    export {};
+    
+==== /project/b.ts (0 errors) ====
+    export {};
+    
+==== /project/b.js (0 errors) ====
+    export {};
+    
+==== /project/b.d.ts (0 errors) ====
+    export {};
+    
+==== /project/c.ts (0 errors) ====
+    export {};
+    
+==== /project/c.tsx (0 errors) ====
+    export {};
+    
+==== /project/d/index.ts (0 errors) ====
+    export {};
+    
+==== /project/e (0 errors) ====
+    WOMP WOMP BINARY DATA
+    
+==== /project/e.ts (0 errors) ====
+    export {};
+    
+==== /project/e.txt (0 errors) ====
+    The letter e is for elephant
+    This poem is not about elephants
+    It is about the letter e
+    - Authored by GitHub Copilot, Nov 2022
+    
+==== /project/e.txt.ts (0 errors) ====
+    export {};
+    
+==== /project/main.ts (1 errors) ====
+    import {} from "./a";
+    import {} from "./a.js";
+    import {} from "./a.ts";
+    
+    import {} from "./b";
+    import {} from "./b.js";
+    import {} from "./b.ts";
+    import {} from "./b.d.ts";
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
+    import type {} from "./b.d.ts";
+    
+    import {} from "./c.ts";
+    import {} from "./c.tsx";
+    
+    import {} from "./d";
+    import {} from "./d/index";
+    import {} from "./d/index.ts";
+    
+    // These should not resolve, but preventing them has
+    // relatively little utility compared to the cost of
+    // the filesystem hits.
+    import {} from "./e";
+    import {} from "./e.txt";
+    
+==== /project/types.d.ts (1 errors) ====
+    import {} from "./a.ts";
+    import {} from "./a.d.ts";
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
+    import type {} from "./a.d.ts";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt
new file mode 100644
index 0000000000..18463589db
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt
@@ -0,0 +1,72 @@
+/project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
+/project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
+
+
+==== /project/a.ts (0 errors) ====
+    export {};
+    
+==== /project/b.ts (0 errors) ====
+    export {};
+    
+==== /project/b.js (0 errors) ====
+    export {};
+    
+==== /project/b.d.ts (0 errors) ====
+    export {};
+    
+==== /project/c.ts (0 errors) ====
+    export {};
+    
+==== /project/c.tsx (0 errors) ====
+    export {};
+    
+==== /project/d/index.ts (0 errors) ====
+    export {};
+    
+==== /project/e (0 errors) ====
+    WOMP WOMP BINARY DATA
+    
+==== /project/e.ts (0 errors) ====
+    export {};
+    
+==== /project/e.txt (0 errors) ====
+    The letter e is for elephant
+    This poem is not about elephants
+    It is about the letter e
+    - Authored by GitHub Copilot, Nov 2022
+    
+==== /project/e.txt.ts (0 errors) ====
+    export {};
+    
+==== /project/main.ts (1 errors) ====
+    import {} from "./a";
+    import {} from "./a.js";
+    import {} from "./a.ts";
+    
+    import {} from "./b";
+    import {} from "./b.js";
+    import {} from "./b.ts";
+    import {} from "./b.d.ts";
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
+    import type {} from "./b.d.ts";
+    
+    import {} from "./c.ts";
+    import {} from "./c.tsx";
+    
+    import {} from "./d";
+    import {} from "./d/index";
+    import {} from "./d/index.ts";
+    
+    // These should not resolve, but preventing them has
+    // relatively little utility compared to the cost of
+    // the filesystem hits.
+    import {} from "./e";
+    import {} from "./e.txt";
+    
+==== /project/types.d.ts (1 errors) ====
+    import {} from "./a.ts";
+    import {} from "./a.d.ts";
+                   ~~~~~~~~~~
+!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
+    import type {} from "./a.d.ts";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt
index 7c608bf97b..83c172d377 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt
@@ -1,6 +1,6 @@
 /main.cts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-/main.mts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-/main.ts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
+/main.mts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
+/main.ts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
 
 
 ==== /node_modules/dual/package.json (0 errors) ====
@@ -32,13 +32,13 @@
     
 ==== /main.ts (1 errors) ====
     import { esm, cjs } from "dual";
-             ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
+                  ~~~
+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
     
 ==== /main.mts (1 errors) ====
     import { esm, cjs } from "dual";
-             ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
+                  ~~~
+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
     
 ==== /main.cts (1 errors) ====
     import { esm, cjs } from "dual";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt.diff
index 8ba7ede0f1..5feb7f4d8e 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt.diff
@@ -11,8 +11,8 @@
 -/main.mts(1,15): error TS2305: Module '"dual"' has no exported member 'cjs'.
 -/main.ts(1,15): error TS2305: Module '"dual"' has no exported member 'cjs'.
 +/main.cts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-+/main.mts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-+/main.ts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
++/main.mts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
++/main.ts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
  
  
 -!!! error TS6504: File '/node_modules/dual/index.cjs' is a JavaScript file. Did you mean to enable the 'allowJs' option?
@@ -24,21 +24,18 @@
  ==== /node_modules/dual/package.json (0 errors) ====
      {
        "name": "dual",
-@@= skipped -43, +31 lines =@@
-     
+@@= skipped -44, +32 lines =@@
  ==== /main.ts (1 errors) ====
      import { esm, cjs } from "dual";
--                  ~~~
+                   ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
-+             ~~~
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
++!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
      
  ==== /main.mts (1 errors) ====
      import { esm, cjs } from "dual";
--                  ~~~
+                   ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
-+             ~~~
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
++!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
      
  ==== /main.cts (1 errors) ====
      import { esm, cjs } from "dual";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).types b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).types
index d4cc3cba08..2154e18069 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).types
@@ -10,13 +10,13 @@ export const cjs: number;
 
 === /main.ts ===
 import { esm, cjs } from "dual";
->esm : any
->cjs : number
+>esm : number
+>cjs : any
 
 === /main.mts ===
 import { esm, cjs } from "dual";
->esm : any
->cjs : number
+>esm : number
+>cjs : any
 
 === /main.cts ===
 import { esm, cjs } from "dual";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).types.diff
deleted file mode 100644
index abaf84d601..0000000000
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).types.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.bundlerNodeModules1(module=esnext).types
-+++ new.bundlerNodeModules1(module=esnext).types
-@@= skipped -9, +9 lines =@@
- 
- === /main.ts ===
- import { esm, cjs } from "dual";
-->esm : number
-->cjs : any
-+>esm : any
-+>cjs : number
- 
- === /main.mts ===
- import { esm, cjs } from "dual";
-->esm : number
-->cjs : any
-+>esm : any
-+>cjs : number
- 
- === /main.cts ===
- import { esm, cjs } from "dual";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt
index 7c608bf97b..83c172d377 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt
@@ -1,6 +1,6 @@
 /main.cts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-/main.mts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-/main.ts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
+/main.mts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
+/main.ts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
 
 
 ==== /node_modules/dual/package.json (0 errors) ====
@@ -32,13 +32,13 @@
     
 ==== /main.ts (1 errors) ====
     import { esm, cjs } from "dual";
-             ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
+                  ~~~
+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
     
 ==== /main.mts (1 errors) ====
     import { esm, cjs } from "dual";
-             ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
+                  ~~~
+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
     
 ==== /main.cts (1 errors) ====
     import { esm, cjs } from "dual";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt.diff
index c4ced294c4..e6f37f7fd0 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt.diff
@@ -11,8 +11,8 @@
 -/main.mts(1,15): error TS2305: Module '"dual"' has no exported member 'cjs'.
 -/main.ts(1,15): error TS2305: Module '"dual"' has no exported member 'cjs'.
 +/main.cts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-+/main.mts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-+/main.ts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
++/main.mts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
++/main.ts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
  
  
 -!!! error TS6504: File '/node_modules/dual/index.cjs' is a JavaScript file. Did you mean to enable the 'allowJs' option?
@@ -24,21 +24,18 @@
  ==== /node_modules/dual/package.json (0 errors) ====
      {
        "name": "dual",
-@@= skipped -43, +31 lines =@@
-     
+@@= skipped -44, +32 lines =@@
  ==== /main.ts (1 errors) ====
      import { esm, cjs } from "dual";
--                  ~~~
+                   ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
-+             ~~~
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
++!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
      
  ==== /main.mts (1 errors) ====
      import { esm, cjs } from "dual";
--                  ~~~
+                   ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
-+             ~~~
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
++!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
      
  ==== /main.cts (1 errors) ====
      import { esm, cjs } from "dual";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).types b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).types
index d4cc3cba08..2154e18069 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).types
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).types
@@ -10,13 +10,13 @@ export const cjs: number;
 
 === /main.ts ===
 import { esm, cjs } from "dual";
->esm : any
->cjs : number
+>esm : number
+>cjs : any
 
 === /main.mts ===
 import { esm, cjs } from "dual";
->esm : any
->cjs : number
+>esm : number
+>cjs : any
 
 === /main.cts ===
 import { esm, cjs } from "dual";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).types.diff b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).types.diff
deleted file mode 100644
index 59ee3d75f4..0000000000
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).types.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.bundlerNodeModules1(module=preserve).types
-+++ new.bundlerNodeModules1(module=preserve).types
-@@= skipped -9, +9 lines =@@
- 
- === /main.ts ===
- import { esm, cjs } from "dual";
-->esm : number
-->cjs : any
-+>esm : any
-+>cjs : number
- 
- === /main.mts ===
- import { esm, cjs } from "dual";
-->esm : number
-->cjs : any
-+>esm : any
-+>cjs : number
- 
- === /main.cts ===
- import { esm, cjs } from "dual";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=esnext).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=esnext).errors.txt
index 1fe58deccf..738eafa193 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=esnext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=esnext).errors.txt
@@ -1,3 +1,4 @@
+/main.ts(4,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
 /main.ts(7,16): error TS2307: Cannot find module './redirect/index' or its corresponding type declarations.
 
 
@@ -18,11 +19,13 @@
     declare const _: string;
     export = _;
     
-==== /main.ts (1 errors) ====
+==== /main.ts (2 errors) ====
     import { x } from "./dir";
     import {} from "./dir/index";
     import {} from "./dir/index.js";
     import {} from "./dir/index.ts";
+                   ~~~~~~~~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
     
     import { y } from "./redirect";
     import {} from "./redirect/index";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=esnext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=esnext).errors.txt.diff
deleted file mode 100644
index d9e4be7fe1..0000000000
--- a/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=esnext).errors.txt.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.bundlerRelative1(module=esnext).errors.txt
-+++ new.bundlerRelative1(module=esnext).errors.txt
-@@= skipped -0, +0 lines =@@
--/main.ts(4,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
- /main.ts(7,16): error TS2307: Cannot find module './redirect/index' or its corresponding type declarations.
- 
- 
-@@= skipped -18, +17 lines =@@
-     declare const _: string;
-     export = _;
-     
--==== /main.ts (2 errors) ====
-+==== /main.ts (1 errors) ====
-     import { x } from "./dir";
-     import {} from "./dir/index";
-     import {} from "./dir/index.js";
-     import {} from "./dir/index.ts";
--                   ~~~~~~~~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
-     
-     import { y } from "./redirect";
-     import {} from "./redirect/index";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=preserve).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=preserve).errors.txt
index 1fe58deccf..738eafa193 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=preserve).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=preserve).errors.txt
@@ -1,3 +1,4 @@
+/main.ts(4,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
 /main.ts(7,16): error TS2307: Cannot find module './redirect/index' or its corresponding type declarations.
 
 
@@ -18,11 +19,13 @@
     declare const _: string;
     export = _;
     
-==== /main.ts (1 errors) ====
+==== /main.ts (2 errors) ====
     import { x } from "./dir";
     import {} from "./dir/index";
     import {} from "./dir/index.js";
     import {} from "./dir/index.ts";
+                   ~~~~~~~~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
     
     import { y } from "./redirect";
     import {} from "./redirect/index";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=preserve).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=preserve).errors.txt.diff
deleted file mode 100644
index 7ae741450f..0000000000
--- a/testdata/baselines/reference/submodule/conformance/bundlerRelative1(module=preserve).errors.txt.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.bundlerRelative1(module=preserve).errors.txt
-+++ new.bundlerRelative1(module=preserve).errors.txt
-@@= skipped -0, +0 lines =@@
--/main.ts(4,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
- /main.ts(7,16): error TS2307: Cannot find module './redirect/index' or its corresponding type declarations.
- 
- 
-@@= skipped -18, +17 lines =@@
-     declare const _: string;
-     export = _;
-     
--==== /main.ts (2 errors) ====
-+==== /main.ts (1 errors) ====
-     import { x } from "./dir";
-     import {} from "./dir/index";
-     import {} from "./dir/index.js";
-     import {} from "./dir/index.ts";
--                   ~~~~~~~~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
-     
-     import { y } from "./redirect";
-     import {} from "./redirect/index";
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.errors.txt b/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.errors.txt
deleted file mode 100644
index 6641484655..0000000000
--- a/testdata/baselines/reference/submodule/conformance/commonJSAliasedExport.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-bug43713.js(1,27): error TS2307: Cannot find module './commonJSAliasedExport' or its corresponding type declarations.
-
-
-==== bug43713.js (1 errors) ====
-    const { funky } = require('./commonJSAliasedExport');
-                              ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module './commonJSAliasedExport' or its corresponding type declarations.
-    /** @type {boolean} */
-    var diddy
-    var diddy = funky(1)
-    
-    
-==== commonJSAliasedExport.js (0 errors) ====
-    const donkey = (ast) =>  ast;
-    
-    function funky(declaration) {
-        return false;
-    }
-    module.exports = donkey;
-    module.exports.funky = funky;
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.errors.txt b/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.errors.txt
index 32101de391..754dde9109 100644
--- a/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.errors.txt
@@ -6,12 +6,15 @@ main.ts(5,18): error TS2307: Cannot find module './file.mjs' or its correspondin
 main.ts(6,18): error TS2307: Cannot find module './file.cjs' or its corresponding type declarations.
 main.ts(7,18): error TS2307: Cannot find module './file.mts' or its corresponding type declarations.
 main.ts(8,18): error TS2307: Cannot find module './file.cts' or its corresponding type declarations.
+main.ts(9,18): error TS2307: Cannot find module './file.d.ts' or its corresponding type declarations.
+main.ts(10,19): error TS2307: Cannot find module './file.d.cts' or its corresponding type declarations.
+main.ts(11,19): error TS2307: Cannot find module './file.d.mts' or its corresponding type declarations.
 main.ts(12,19): error TS2307: Cannot find module './file.d.json.ts' or its corresponding type declarations.
 
 
 ==== package.json (0 errors) ====
     {"type": "module"}
-==== main.ts (9 errors) ====
+==== main.ts (12 errors) ====
     import def1 from "./file.js";
                      ~~~~~~~~~~~
 !!! error TS2307: Cannot find module './file.js' or its corresponding type declarations.
@@ -37,8 +40,14 @@ main.ts(12,19): error TS2307: Cannot find module './file.d.json.ts' or its corre
                      ~~~~~~~~~~~~
 !!! error TS2307: Cannot find module './file.cts' or its corresponding type declarations.
     import def9 from "./file.d.ts";
+                     ~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module './file.d.ts' or its corresponding type declarations.
     import def10 from "./file.d.cts";
+                      ~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module './file.d.cts' or its corresponding type declarations.
     import def11 from "./file.d.mts";
+                      ~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module './file.d.mts' or its corresponding type declarations.
     import def12 from "./file.d.json.ts";
                       ~~~~~~~~~~~~~~~~~~
 !!! error TS2307: Cannot find module './file.d.json.ts' or its corresponding type declarations.
diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.errors.txt.diff
deleted file mode 100644
index 329cb71435..0000000000
--- a/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.errors.txt.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.declarationFileForTsJsImport.errors.txt
-+++ new.declarationFileForTsJsImport.errors.txt
-@@= skipped -5, +5 lines =@@
- main.ts(6,18): error TS2307: Cannot find module './file.cjs' or its corresponding type declarations.
- main.ts(7,18): error TS2307: Cannot find module './file.mts' or its corresponding type declarations.
- main.ts(8,18): error TS2307: Cannot find module './file.cts' or its corresponding type declarations.
--main.ts(9,18): error TS2307: Cannot find module './file.d.ts' or its corresponding type declarations.
--main.ts(10,19): error TS2307: Cannot find module './file.d.cts' or its corresponding type declarations.
--main.ts(11,19): error TS2307: Cannot find module './file.d.mts' or its corresponding type declarations.
- main.ts(12,19): error TS2307: Cannot find module './file.d.json.ts' or its corresponding type declarations.
- 
- 
- ==== package.json (0 errors) ====
-     {"type": "module"}
--==== main.ts (12 errors) ====
-+==== main.ts (9 errors) ====
-     import def1 from "./file.js";
-                      ~~~~~~~~~~~
- !!! error TS2307: Cannot find module './file.js' or its corresponding type declarations.
-@@= skipped -34, +31 lines =@@
-                      ~~~~~~~~~~~~
- !!! error TS2307: Cannot find module './file.cts' or its corresponding type declarations.
-     import def9 from "./file.d.ts";
--                     ~~~~~~~~~~~~~
--!!! error TS2307: Cannot find module './file.d.ts' or its corresponding type declarations.
-     import def10 from "./file.d.cts";
--                      ~~~~~~~~~~~~~~
--!!! error TS2307: Cannot find module './file.d.cts' or its corresponding type declarations.
-     import def11 from "./file.d.mts";
--                      ~~~~~~~~~~~~~~
--!!! error TS2307: Cannot find module './file.d.mts' or its corresponding type declarations.
-     import def12 from "./file.d.json.ts";
-                       ~~~~~~~~~~~~~~~~~~
- !!! error TS2307: Cannot find module './file.d.json.ts' or its corresponding type declarations.
diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.types b/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.types
index 807edbddf6..f1d5204ee9 100644
--- a/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.types
+++ b/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.types
@@ -26,13 +26,13 @@ import def8 from "./file.cts";
 >def8 : any
 
 import def9 from "./file.d.ts";
->def9 : "bad3"
+>def9 : any
 
 import def10 from "./file.d.cts";
->def10 : "bad8"
+>def10 : any
 
 import def11 from "./file.d.mts";
->def11 : "bad7"
+>def11 : any
 
 import def12 from "./file.d.json.ts";
 >def12 : any
diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.types.diff b/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.types.diff
deleted file mode 100644
index 79859505dc..0000000000
--- a/testdata/baselines/reference/submodule/conformance/declarationFileForTsJsImport.types.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- old.declarationFileForTsJsImport.types
-+++ new.declarationFileForTsJsImport.types
-@@= skipped -25, +25 lines =@@
- >def8 : any
- 
- import def9 from "./file.d.ts";
-->def9 : any
-+>def9 : "bad3"
- 
- import def10 from "./file.d.cts";
-->def10 : any
-+>def10 : "bad8"
- 
- import def11 from "./file.d.mts";
-->def11 : any
-+>def11 : "bad7"
- 
- import def12 from "./file.d.json.ts";
- >def12 : any
diff --git a/testdata/baselines/reference/submodule/conformance/declarationNotFoundPackageBundlesTypes.errors.txt b/testdata/baselines/reference/submodule/conformance/declarationNotFoundPackageBundlesTypes.errors.txt
index c63274a0c3..a0555489b9 100644
--- a/testdata/baselines/reference/submodule/conformance/declarationNotFoundPackageBundlesTypes.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/declarationNotFoundPackageBundlesTypes.errors.txt
@@ -1,11 +1,13 @@
-index.ts(2,24): error TS2307: Cannot find module 'foo/other' or its corresponding type declarations.
+index.ts(2,24): error TS7016: Could not find a declaration file for module 'foo/other'. 'node_modules/foo/other.js' implicitly has an 'any' type.
+  If the 'foo' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'foo/other';`
 
 
 ==== index.ts (1 errors) ====
     import * as Foo from "foo";
     import * as Other from "foo/other"/*1*/;
                            ~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'foo/other' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'foo/other'. 'node_modules/foo/other.js' implicitly has an 'any' type.
+!!! error TS7016:   If the 'foo' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'foo/other';`
 ==== node_modules/foo/package.json (0 errors) ====
     {   
         "name": "foo",
diff --git a/testdata/baselines/reference/submodule/conformance/declarationNotFoundPackageBundlesTypes.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/declarationNotFoundPackageBundlesTypes.errors.txt.diff
deleted file mode 100644
index 929b6ee4c7..0000000000
--- a/testdata/baselines/reference/submodule/conformance/declarationNotFoundPackageBundlesTypes.errors.txt.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- old.declarationNotFoundPackageBundlesTypes.errors.txt
-+++ new.declarationNotFoundPackageBundlesTypes.errors.txt
-@@= skipped -0, +0 lines =@@
--index.ts(2,24): error TS7016: Could not find a declaration file for module 'foo/other'. 'node_modules/foo/other.js' implicitly has an 'any' type.
--  If the 'foo' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'foo/other';`
-+index.ts(2,24): error TS2307: Cannot find module 'foo/other' or its corresponding type declarations.
- 
- 
- ==== index.ts (1 errors) ====
-     import * as Foo from "foo";
-     import * as Other from "foo/other"/*1*/;
-                            ~~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module 'foo/other'. 'node_modules/foo/other.js' implicitly has an 'any' type.
--!!! error TS7016:   If the 'foo' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'foo/other';`
-+!!! error TS2307: Cannot find module 'foo/other' or its corresponding type declarations.
- ==== node_modules/foo/package.json (0 errors) ====
-     {   
-         "name": "foo",
diff --git a/testdata/baselines/reference/submodule/conformance/decoratorOnClassConstructor2.errors.txt b/testdata/baselines/reference/submodule/conformance/decoratorOnClassConstructor2.errors.txt
new file mode 100644
index 0000000000..29b7d22083
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/decoratorOnClassConstructor2.errors.txt
@@ -0,0 +1,20 @@
+2.ts(1,20): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+2.ts(2,19): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+
+
+==== 0.ts (0 errors) ====
+    export class base { }
+    export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
+    
+==== 2.ts (2 errors) ====
+    import {base} from "./0.ts"
+                       ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    import {foo} from "./0.ts"
+                      ~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+    export class C  extends base{
+        constructor(@foo prop: any) {
+            super();
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/decoratorOnClassConstructor2.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/decoratorOnClassConstructor2.errors.txt.diff
deleted file mode 100644
index 00edb8c316..0000000000
--- a/testdata/baselines/reference/submodule/conformance/decoratorOnClassConstructor2.errors.txt.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.decoratorOnClassConstructor2.errors.txt
-+++ new.decoratorOnClassConstructor2.errors.txt
-@@= skipped -0, +-1 lines =@@
--2.ts(1,20): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--2.ts(2,19): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--
--
--==== 0.ts (0 errors) ====
--    export class base { }
--    export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { }
--    
--==== 2.ts (2 errors) ====
--    import {base} from "./0.ts"
--                       ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import {foo} from "./0.ts"
--                      ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    export class C  extends base{
--        constructor(@foo prop: any) {
--            super();
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.errors.txt b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.errors.txt
index 52d04dc3c5..c04c7d2d59 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias.errors.txt
@@ -1,10 +1,10 @@
-test.js(1,27): error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
+test.js(1,27): error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
 
 
 ==== test.js (1 errors) ====
     const { apply } = require('./moduleExportAliasDuplicateAlias')
                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
     apply()
     
 ==== moduleExportAliasDuplicateAlias.js (0 errors) ====
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.errors.txt b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.errors.txt
index 6b5b273a1e..e5f740a3c9 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias2.errors.txt
@@ -1,10 +1,10 @@
-test.js(1,27): error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
+test.js(1,27): error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
 
 
 ==== test.js (1 errors) ====
     const { apply } = require('./moduleExportAliasDuplicateAlias')
                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
     apply()
     
 ==== moduleExportAliasDuplicateAlias.js (0 errors) ====
diff --git a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.errors.txt b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.errors.txt
index 57050a304a..d50d647cff 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/moduleExportDuplicateAlias3.errors.txt
@@ -1,10 +1,10 @@
-test.js(1,27): error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
+test.js(1,27): error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
 
 
 ==== test.js (1 errors) ====
     const { apply } = require('./moduleExportAliasDuplicateAlias')
                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
     const result = apply.toFixed()
     
 ==== moduleExportAliasDuplicateAlias.js (0 errors) ====
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension1.errors.txt b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension1.errors.txt
index 882c43a6b6..20fe5e9f26 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension1.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension1.errors.txt
@@ -1,5 +1,5 @@
-/src/bar.mts(2,21): error TS2307: Cannot find module './foo' or its corresponding type declarations.
-/src/bar.mts(3,21): error TS2307: Cannot find module './baz' or its corresponding type declarations.
+/src/bar.mts(2,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.mjs'?
+/src/bar.mts(3,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
 
 
 ==== /src/foo.mts (0 errors) ====
@@ -11,8 +11,8 @@
     // Extensionless relative path ES import in an ES module
     import { foo } from "./foo"; // should error, suggest adding ".mjs"
                         ~~~~~~~
-!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.mjs'?
     import { baz } from "./baz"; // should error, ask for extension, no extension suggestion
                         ~~~~~~~
-!!! error TS2307: Cannot find module './baz' or its corresponding type declarations.
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension1.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension1.errors.txt.diff
deleted file mode 100644
index 653f4e2fc9..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension1.errors.txt.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- old.moduleResolutionWithoutExtension1.errors.txt
-+++ new.moduleResolutionWithoutExtension1.errors.txt
-@@= skipped -0, +0 lines =@@
--/src/bar.mts(2,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.mjs'?
--/src/bar.mts(3,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
-+/src/bar.mts(2,21): error TS2307: Cannot find module './foo' or its corresponding type declarations.
-+/src/bar.mts(3,21): error TS2307: Cannot find module './baz' or its corresponding type declarations.
- 
- 
- ==== /src/foo.mts (0 errors) ====
-@@= skipped -10, +10 lines =@@
-     // Extensionless relative path ES import in an ES module
-     import { foo } from "./foo"; // should error, suggest adding ".mjs"
-                         ~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.mjs'?
-+!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
-     import { baz } from "./baz"; // should error, ask for extension, no extension suggestion
-                         ~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
-+!!! error TS2307: Cannot find module './baz' or its corresponding type declarations.
-     
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.errors.txt b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.errors.txt
new file mode 100644
index 0000000000..9571e971de
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.errors.txt
@@ -0,0 +1,14 @@
+/src/bar.mts(2,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.jsx'?
+
+
+==== /src/foo.tsx (0 errors) ====
+    export function foo() {
+        return "";
+    }
+    
+==== /src/bar.mts (1 errors) ====
+    // Extensionless relative path ES import in an ES module
+    import { foo } from "./foo"; // should error, suggest adding ".jsx"
+                        ~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.jsx'?
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.errors.txt.diff
deleted file mode 100644
index aec5ddc719..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.errors.txt.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- old.moduleResolutionWithoutExtension3.errors.txt
-+++ new.moduleResolutionWithoutExtension3.errors.txt
-@@= skipped -0, +-1 lines =@@
--/src/bar.mts(2,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.jsx'?
--
--
--==== /src/foo.tsx (0 errors) ====
--    export function foo() {
--        return "";
--    }
--    
--==== /src/bar.mts (1 errors) ====
--    // Extensionless relative path ES import in an ES module
--    import { foo } from "./foo"; // should error, suggest adding ".jsx"
--                        ~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.jsx'?
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.js b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.js
index 00a0540ead..3b4e816e48 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.js
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.js
@@ -11,7 +11,10 @@ import { foo } from "./foo"; // should error, suggest adding ".jsx"
 
 
 //// [foo.jsx]
-export function foo() {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.foo = foo;
+function foo() {
     return "";
 }
 //// [bar.mjs]
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.js.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.js.diff
deleted file mode 100644
index df6d466d6a..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.js.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.moduleResolutionWithoutExtension3.js
-+++ new.moduleResolutionWithoutExtension3.js
-@@= skipped -10, +10 lines =@@
- 
- 
- //// [foo.jsx]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.foo = foo;
--function foo() {
-+export function foo() {
-     return "";
- }
- //// [bar.mjs]
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.types b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.types
index 8347976e40..4eee6929d7 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.types
@@ -11,5 +11,5 @@ export function foo() {
 === /src/bar.mts ===
 // Extensionless relative path ES import in an ES module
 import { foo } from "./foo"; // should error, suggest adding ".jsx"
->foo : () => string
+>foo : any
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.types.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.types.diff
deleted file mode 100644
index 4ed7b710ae..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension3.types.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- old.moduleResolutionWithoutExtension3.types
-+++ new.moduleResolutionWithoutExtension3.types
-@@= skipped -10, +10 lines =@@
- === /src/bar.mts ===
- // Extensionless relative path ES import in an ES module
- import { foo } from "./foo"; // should error, suggest adding ".jsx"
-->foo : any
-+>foo : () => string
- 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.errors.txt b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.errors.txt
new file mode 100644
index 0000000000..b1a357f1f1
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.errors.txt
@@ -0,0 +1,14 @@
+/src/bar.mts(2,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.js'?
+
+
+==== /src/foo.tsx (0 errors) ====
+    export function foo() {
+        return "";
+    }
+    
+==== /src/bar.mts (1 errors) ====
+    // Extensionless relative path ES import in an ES module
+    import { foo } from "./foo"; // should error, suggest adding ".js"
+                        ~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.js'?
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.errors.txt.diff
deleted file mode 100644
index cdab619613..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.errors.txt.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- old.moduleResolutionWithoutExtension4.errors.txt
-+++ new.moduleResolutionWithoutExtension4.errors.txt
-@@= skipped -0, +-1 lines =@@
--/src/bar.mts(2,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.js'?
--
--
--==== /src/foo.tsx (0 errors) ====
--    export function foo() {
--        return "";
--    }
--    
--==== /src/bar.mts (1 errors) ====
--    // Extensionless relative path ES import in an ES module
--    import { foo } from "./foo"; // should error, suggest adding ".js"
--                        ~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './foo.js'?
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.js b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.js
index 04ef8ef870..9fe42ebd8f 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.js
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.js
@@ -11,7 +11,10 @@ import { foo } from "./foo"; // should error, suggest adding ".js"
 
 
 //// [foo.js]
-export function foo() {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.foo = foo;
+function foo() {
     return "";
 }
 //// [bar.mjs]
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.js.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.js.diff
deleted file mode 100644
index 1e64aa99ed..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.js.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.moduleResolutionWithoutExtension4.js
-+++ new.moduleResolutionWithoutExtension4.js
-@@= skipped -10, +10 lines =@@
- 
- 
- //// [foo.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.foo = foo;
--function foo() {
-+export function foo() {
-     return "";
- }
- //// [bar.mjs]
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.types b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.types
index 8a06ea0b52..3482f95ff5 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.types
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.types
@@ -11,5 +11,5 @@ export function foo() {
 === /src/bar.mts ===
 // Extensionless relative path ES import in an ES module
 import { foo } from "./foo"; // should error, suggest adding ".js"
->foo : () => string
+>foo : any
 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.types.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.types.diff
deleted file mode 100644
index f7f5ae2963..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension4.types.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- old.moduleResolutionWithoutExtension4.types
-+++ new.moduleResolutionWithoutExtension4.types
-@@= skipped -10, +10 lines =@@
- === /src/bar.mts ===
- // Extensionless relative path ES import in an ES module
- import { foo } from "./foo"; // should error, suggest adding ".js"
-->foo : any
-+>foo : () => string
- 
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension5.errors.txt b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension5.errors.txt
index 6b1ea742dc..2ea6cfec72 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension5.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension5.errors.txt
@@ -1,8 +1,8 @@
-/src/buzz.mts(2,8): error TS2307: Cannot find module './foo' or its corresponding type declarations.
+/src/buzz.mts(2,8): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
 
 
 ==== /src/buzz.mts (1 errors) ====
     // Extensionless relative path dynamic import in an ES module
     import("./foo").then(x => x); // should error, ask for extension
            ~~~~~~~
-!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
\ No newline at end of file
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension5.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension5.errors.txt.diff
deleted file mode 100644
index ca680d5404..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension5.errors.txt.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.moduleResolutionWithoutExtension5.errors.txt
-+++ new.moduleResolutionWithoutExtension5.errors.txt
-@@= skipped -0, +0 lines =@@
--/src/buzz.mts(2,8): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
-+/src/buzz.mts(2,8): error TS2307: Cannot find module './foo' or its corresponding type declarations.
- 
- 
- ==== /src/buzz.mts (1 errors) ====
-     // Extensionless relative path dynamic import in an ES module
-     import("./foo").then(x => x); // should error, ask for extension
-            ~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
-+!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension8.errors.txt b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension8.errors.txt
index 3163915ee2..315ad6c867 100644
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension8.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension8.errors.txt
@@ -1,8 +1,8 @@
-/src/bar.cts(2,8): error TS2307: Cannot find module './foo' or its corresponding type declarations.
+/src/bar.cts(2,8): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
 
 
 ==== /src/bar.cts (1 errors) ====
     // Extensionless relative path dynamic import in a cjs module
     import("./foo").then(x => x); // should error, ask for extension
            ~~~~~~~
-!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
\ No newline at end of file
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension8.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension8.errors.txt.diff
deleted file mode 100644
index 54d4297906..0000000000
--- a/testdata/baselines/reference/submodule/conformance/moduleResolutionWithoutExtension8.errors.txt.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.moduleResolutionWithoutExtension8.errors.txt
-+++ new.moduleResolutionWithoutExtension8.errors.txt
-@@= skipped -0, +0 lines =@@
--/src/bar.cts(2,8): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
-+/src/bar.cts(2,8): error TS2307: Cannot find module './foo' or its corresponding type declarations.
- 
- 
- ==== /src/bar.cts (1 errors) ====
-     // Extensionless relative path dynamic import in a cjs module
-     import("./foo").then(x => x); // should error, ask for extension
-            ~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
-+!!! error TS2307: Cannot find module './foo' or its corresponding type declarations.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node16).errors.txt
new file mode 100644
index 0000000000..8192673cec
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node16).errors.txt
@@ -0,0 +1,24 @@
+index.cjs(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as self from "package";
+    self;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as self from "package";
+    self;
+==== index.cjs (1 errors) ====
+    // esm format file
+    import * as self from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+    self;
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=nodenext).errors.txt
new file mode 100644
index 0000000000..8192673cec
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=nodenext).errors.txt
@@ -0,0 +1,24 @@
+index.cjs(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as self from "package";
+    self;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as self from "package";
+    self;
+==== index.cjs (1 errors) ====
+    // esm format file
+    import * as self from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+    self;
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).errors.txt
new file mode 100644
index 0000000000..acd3f74984
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).errors.txt
@@ -0,0 +1,564 @@
+index.cts(2,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
+index.cts(3,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
+index.cts(6,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
+index.cts(9,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
+index.cts(11,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
+index.cts(12,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
+index.cts(15,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
+index.cts(16,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
+index.cts(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+index.cts(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+index.cts(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+index.cts(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.cts(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.cts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(78,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(79,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.cts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(81,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(82,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.cts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(84,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(85,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.mts(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.mts(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.mts(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.mts(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.mts(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.mts(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.mts(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.mts(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.mts(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.mts(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.ts(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.ts(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.ts(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.ts(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.ts(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.ts(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.ts(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.ts(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.ts(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.ts(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+
+
+==== subfolder/index.ts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder/index.cts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder/index.mts (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.ts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.cts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.mts (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.ts (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.mts (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.cts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== index.mts (27 errors) ====
+    import * as m1 from "./index.js";
+    import * as m2 from "./index.mjs";
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+    import * as m11 from "./subfolder2/another/index.mjs";
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones should all fail - esm format files have no index resolution or extension resolution
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    import * as m15 from "./subfolder";
+                         ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m16 from "./subfolder/";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m17 from "./subfolder/index";
+                         ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    import * as m18 from "./subfolder2";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m19 from "./subfolder2/";
+                         ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m20 from "./subfolder2/index";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    
+    // esm format file
+    const x = 1;
+    export {x};
+==== index.cts (27 errors) ====
+    // ESM-format imports below should issue errors
+    import * as m1 from "./index.js";
+                        ~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
+    import * as m2 from "./index.mjs";
+                        ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+                        ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
+    import * as m11 from "./subfolder2/another/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file)
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
+    import * as m15 from "./subfolder";
+    import * as m16 from "./subfolder/";
+    import * as m17 from "./subfolder/index";
+    import * as m18 from "./subfolder2";
+    import * as m19 from "./subfolder2/";
+    import * as m20 from "./subfolder2/index";
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    // cjs format file
+    const x = 1;
+    export {x};
+==== index.ts (27 errors) ====
+    import * as m1 from "./index.js";
+    import * as m2 from "./index.mjs";
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+    import * as m11 from "./subfolder2/another/index.mjs";
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    import * as m15 from "./subfolder";
+                         ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m16 from "./subfolder/";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m17 from "./subfolder/index";
+                         ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    import * as m18 from "./subfolder2";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m19 from "./subfolder2/";
+                         ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m20 from "./subfolder2/index";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    // esm format file
+    const x = 1;
+    export {x};
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module"
+    }
+==== subfolder/package.json (0 errors) ====
+    {
+        "type": "commonjs"
+    }
+==== subfolder2/package.json (0 errors) ====
+    {
+    }
+==== subfolder2/another/package.json (0 errors) ====
+    {
+        "type": "module"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).errors.txt.diff
deleted file mode 100644
index 79ef03142c..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,569 +0,0 @@
---- old.nodeModules1(module=node16).errors.txt
-+++ new.nodeModules1(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(2,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
--index.cts(3,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
--index.cts(6,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
--index.cts(9,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
--index.cts(11,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
--index.cts(12,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
--index.cts(15,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
--index.cts(16,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
--index.cts(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
--index.cts(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
--index.cts(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
--index.cts(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.cts(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.cts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(78,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(79,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.cts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(81,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(82,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.cts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(84,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(85,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.mts(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.mts(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.mts(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.mts(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.mts(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.mts(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.mts(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.mts(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.mts(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.mts(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.ts(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.ts(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.ts(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.ts(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.ts(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.ts(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.ts(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.ts(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.ts(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.ts(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--
--
--==== subfolder/index.ts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder/index.cts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder/index.mts (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.ts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.cts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.mts (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.ts (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.mts (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.cts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== index.mts (27 errors) ====
--    import * as m1 from "./index.js";
--    import * as m2 from "./index.mjs";
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--    import * as m11 from "./subfolder2/another/index.mjs";
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones should all fail - esm format files have no index resolution or extension resolution
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    import * as m15 from "./subfolder";
--                         ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m16 from "./subfolder/";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m17 from "./subfolder/index";
--                         ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    import * as m18 from "./subfolder2";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m19 from "./subfolder2/";
--                         ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m20 from "./subfolder2/index";
--                         ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
--    import m27 = require("./subfolder/");
--    import m28 = require("./subfolder/index");
--    import m29 = require("./subfolder2");
--    import m30 = require("./subfolder2/");
--    import m31 = require("./subfolder2/index");
--    import m32 = require("./subfolder2/another");
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    
--    // esm format file
--    const x = 1;
--    export {x};
--==== index.cts (27 errors) ====
--    // ESM-format imports below should issue errors
--    import * as m1 from "./index.js";
--                        ~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
--    import * as m2 from "./index.mjs";
--                        ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--                        ~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
--    import * as m11 from "./subfolder2/another/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file)
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
--    import * as m15 from "./subfolder";
--    import * as m16 from "./subfolder/";
--    import * as m17 from "./subfolder/index";
--    import * as m18 from "./subfolder2";
--    import * as m19 from "./subfolder2/";
--    import * as m20 from "./subfolder2/index";
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
--    import m27 = require("./subfolder/");
--    import m28 = require("./subfolder/index");
--    import m29 = require("./subfolder2");
--    import m30 = require("./subfolder2/");
--    import m31 = require("./subfolder2/index");
--    import m32 = require("./subfolder2/another");
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    // cjs format file
--    const x = 1;
--    export {x};
--==== index.ts (27 errors) ====
--    import * as m1 from "./index.js";
--    import * as m2 from "./index.mjs";
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--    import * as m11 from "./subfolder2/another/index.mjs";
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    import * as m15 from "./subfolder";
--                         ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m16 from "./subfolder/";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m17 from "./subfolder/index";
--                         ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    import * as m18 from "./subfolder2";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m19 from "./subfolder2/";
--                         ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m20 from "./subfolder2/index";
--                         ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
--    import m27 = require("./subfolder/");
--    import m28 = require("./subfolder/index");
--    import m29 = require("./subfolder2");
--    import m30 = require("./subfolder2/");
--    import m31 = require("./subfolder2/index");
--    import m32 = require("./subfolder2/another");
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    // esm format file
--    const x = 1;
--    export {x};
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module"
--    }
--==== subfolder/package.json (0 errors) ====
--    {
--        "type": "commonjs"
--    }
--==== subfolder2/package.json (0 errors) ====
--    {
--    }
--==== subfolder2/another/package.json (0 errors) ====
--    {
--        "type": "module"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).js
index 38bbfcf9b2..b90de75ced 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).js
@@ -339,9 +339,12 @@ exports.x = x;
 const x = 1;
 export { x };
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
 // cjs format file
 const x = 1;
-export { x };
+exports.x = x;
 //// [index.cjs]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).js.diff
index 5a100dd33f..453b71e732 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).js.diff
@@ -1,20 +1,6 @@
 --- old.nodeModules1(module=node16).js
 +++ new.nodeModules1(module=node16).js
-@@= skipped -338, +338 lines =@@
- const x = 1;
- export { x };
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.x = void 0;
- // cjs format file
- const x = 1;
--exports.x = x;
-+export { x };
- //// [index.cjs]
- "use strict";
- Object.defineProperty(exports, "__esModule", { value: true });
-@@= skipped -321, +318 lines =@@
+@@= skipped -659, +659 lines =@@
  // esm format file
  const x = 1;
  export { x };
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).types
index 501c69d176..3638c2330d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).types
@@ -120,37 +120,37 @@ import * as m12 from "./subfolder2/another/index.cjs";
 
 // The next ones should all fail - esm format files have no index resolution or extension resolution
 import * as m13 from "./";
->m13 : typeof import("index")
+>m13 : any
 
 import * as m14 from "./index";
->m14 : typeof import("index")
+>m14 : any
 
 import * as m15 from "./subfolder";
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 import * as m16 from "./subfolder/";
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 import * as m17 from "./subfolder/index";
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 import * as m18 from "./subfolder2";
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 import * as m19 from "./subfolder2/";
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 import * as m20 from "./subfolder2/index";
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 import * as m21 from "./subfolder2/another";
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 import * as m22 from "./subfolder2/another/";
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 import * as m23 from "./subfolder2/another/index";
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 void m1;
 >void m1 : undefined
@@ -202,47 +202,47 @@ void m12;
 
 void m13;
 >void m13 : undefined
->m13 : typeof import("index")
+>m13 : any
 
 void m14;
 >void m14 : undefined
->m14 : typeof import("index")
+>m14 : any
 
 void m15;
 >void m15 : undefined
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 void m16;
 >void m16 : undefined
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 void m17;
 >void m17 : undefined
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 void m18;
 >void m18 : undefined
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 void m19;
 >void m19 : undefined
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 void m20;
 >void m20 : undefined
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 void m21;
 >void m21 : undefined
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 void m22;
 >void m22 : undefined
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 void m23;
 >void m23 : undefined
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
 import m24 = require("./");
@@ -324,58 +324,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // esm format file
@@ -630,58 +630,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // cjs format file
@@ -731,37 +731,37 @@ import * as m12 from "./subfolder2/another/index.cjs";
 
 // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
 import * as m13 from "./";
->m13 : typeof import("index")
+>m13 : any
 
 import * as m14 from "./index";
->m14 : typeof import("index")
+>m14 : any
 
 import * as m15 from "./subfolder";
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 import * as m16 from "./subfolder/";
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 import * as m17 from "./subfolder/index";
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 import * as m18 from "./subfolder2";
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 import * as m19 from "./subfolder2/";
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 import * as m20 from "./subfolder2/index";
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 import * as m21 from "./subfolder2/another";
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 import * as m22 from "./subfolder2/another/";
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 import * as m23 from "./subfolder2/another/index";
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 void m1;
 >void m1 : undefined
@@ -813,47 +813,47 @@ void m12;
 
 void m13;
 >void m13 : undefined
->m13 : typeof import("index")
+>m13 : any
 
 void m14;
 >void m14 : undefined
->m14 : typeof import("index")
+>m14 : any
 
 void m15;
 >void m15 : undefined
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 void m16;
 >void m16 : undefined
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 void m17;
 >void m17 : undefined
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 void m18;
 >void m18 : undefined
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 void m19;
 >void m19 : undefined
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 void m20;
 >void m20 : undefined
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 void m21;
 >void m21 : undefined
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 void m22;
 >void m22 : undefined
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 void m23;
 >void m23 : undefined
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
 import m24 = require("./");
@@ -935,58 +935,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).types.diff
index 53703d7093..3bfab1db17 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node16).types.diff
@@ -53,48 +53,7 @@
  
  // The next ones should all fail - esm format files have no index resolution or extension resolution
  import * as m13 from "./";
-->m13 : any
-+>m13 : typeof import("index")
- 
- import * as m14 from "./index";
-->m14 : any
-+>m14 : typeof import("index")
- 
- import * as m15 from "./subfolder";
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- import * as m16 from "./subfolder/";
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- import * as m17 from "./subfolder/index";
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- import * as m18 from "./subfolder2";
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- import * as m19 from "./subfolder2/";
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- import * as m20 from "./subfolder2/index";
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- import * as m21 from "./subfolder2/another";
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- import * as m22 from "./subfolder2/another/";
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- import * as m23 from "./subfolder2/another/index";
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -71, +71 lines =@@
  
  void m1;
  >void m1 : undefined
@@ -158,58 +117,7 @@
  
  void m13;
  >void m13 : undefined
-->m13 : any
-+>m13 : typeof import("index")
- 
- void m14;
- >void m14 : undefined
-->m14 : any
-+>m14 : typeof import("index")
- 
- void m15;
- >void m15 : undefined
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- void m16;
- >void m16 : undefined
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- void m17;
- >void m17 : undefined
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- void m18;
- >void m18 : undefined
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- void m19;
- >void m19 : undefined
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- void m20;
- >void m20 : undefined
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- void m21;
- >void m21 : undefined
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- void m22;
- >void m22 : undefined
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- void m23;
- >void m23 : undefined
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -92, +92 lines =@@
  
  // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
  import m24 = require("./");
@@ -313,84 +221,7 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // esm format file
-@@= skipped -306, +306 lines =@@
+@@= skipped -143, +143 lines =@@
  === index.cts ===
  // ESM-format imports below should issue errors
  import * as m1 from "./index.js";
@@ -703,83 +534,6 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // cjs format file
 @@= skipped -305, +305 lines =@@
  
  === index.ts ===
@@ -833,48 +587,7 @@
  
  // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
  import * as m13 from "./";
-->m13 : any
-+>m13 : typeof import("index")
- 
- import * as m14 from "./index";
-->m14 : any
-+>m14 : typeof import("index")
- 
- import * as m15 from "./subfolder";
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- import * as m16 from "./subfolder/";
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- import * as m17 from "./subfolder/index";
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- import * as m18 from "./subfolder2";
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- import * as m19 from "./subfolder2/";
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- import * as m20 from "./subfolder2/index";
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- import * as m21 from "./subfolder2/another";
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- import * as m22 from "./subfolder2/another/";
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- import * as m23 from "./subfolder2/another/index";
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -71, +71 lines =@@
  
  void m1;
  >void m1 : undefined
@@ -938,58 +651,7 @@
  
  void m13;
  >void m13 : undefined
-->m13 : any
-+>m13 : typeof import("index")
- 
- void m14;
- >void m14 : undefined
-->m14 : any
-+>m14 : typeof import("index")
- 
- void m15;
- >void m15 : undefined
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- void m16;
- >void m16 : undefined
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- void m17;
- >void m17 : undefined
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- void m18;
- >void m18 : undefined
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- void m19;
- >void m19 : undefined
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- void m20;
- >void m20 : undefined
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- void m21;
- >void m21 : undefined
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- void m22;
- >void m22 : undefined
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- void m23;
- >void m23 : undefined
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -92, +92 lines =@@
  
  // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
  import m24 = require("./");
@@ -1093,80 +755,3 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).errors.txt
new file mode 100644
index 0000000000..acd3f74984
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).errors.txt
@@ -0,0 +1,564 @@
+index.cts(2,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
+index.cts(3,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
+index.cts(6,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
+index.cts(9,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
+index.cts(11,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
+index.cts(12,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
+index.cts(15,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
+index.cts(16,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
+index.cts(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+index.cts(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+index.cts(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+index.cts(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cts(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.cts(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.cts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(78,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(79,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.cts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(81,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(82,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.cts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(84,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cts(85,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.mts(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.mts(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.mts(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.mts(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.mts(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.mts(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mts(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.mts(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.mts(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.mts(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.mts(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mts(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.ts(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.ts(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.ts(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.ts(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.ts(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.ts(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.ts(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.ts(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.ts(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.ts(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.ts(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.ts(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+
+
+==== subfolder/index.ts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder/index.cts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder/index.mts (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.ts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.cts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.mts (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.ts (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.mts (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.cts (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== index.mts (27 errors) ====
+    import * as m1 from "./index.js";
+    import * as m2 from "./index.mjs";
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+    import * as m11 from "./subfolder2/another/index.mjs";
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones should all fail - esm format files have no index resolution or extension resolution
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    import * as m15 from "./subfolder";
+                         ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m16 from "./subfolder/";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m17 from "./subfolder/index";
+                         ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    import * as m18 from "./subfolder2";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m19 from "./subfolder2/";
+                         ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m20 from "./subfolder2/index";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    
+    // esm format file
+    const x = 1;
+    export {x};
+==== index.cts (27 errors) ====
+    // ESM-format imports below should issue errors
+    import * as m1 from "./index.js";
+                        ~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
+    import * as m2 from "./index.mjs";
+                        ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+                        ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
+    import * as m11 from "./subfolder2/another/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file)
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
+    import * as m15 from "./subfolder";
+    import * as m16 from "./subfolder/";
+    import * as m17 from "./subfolder/index";
+    import * as m18 from "./subfolder2";
+    import * as m19 from "./subfolder2/";
+    import * as m20 from "./subfolder2/index";
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    // cjs format file
+    const x = 1;
+    export {x};
+==== index.ts (27 errors) ====
+    import * as m1 from "./index.js";
+    import * as m2 from "./index.mjs";
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+    import * as m11 from "./subfolder2/another/index.mjs";
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    import * as m15 from "./subfolder";
+                         ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m16 from "./subfolder/";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m17 from "./subfolder/index";
+                         ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    import * as m18 from "./subfolder2";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m19 from "./subfolder2/";
+                         ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m20 from "./subfolder2/index";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    // esm format file
+    const x = 1;
+    export {x};
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module"
+    }
+==== subfolder/package.json (0 errors) ====
+    {
+        "type": "commonjs"
+    }
+==== subfolder2/package.json (0 errors) ====
+    {
+    }
+==== subfolder2/another/package.json (0 errors) ====
+    {
+        "type": "module"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).errors.txt.diff
deleted file mode 100644
index e7cc3dec71..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,569 +0,0 @@
---- old.nodeModules1(module=nodenext).errors.txt
-+++ new.nodeModules1(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(2,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
--index.cts(3,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
--index.cts(6,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
--index.cts(9,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
--index.cts(11,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
--index.cts(12,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
--index.cts(15,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
--index.cts(16,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
--index.cts(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
--index.cts(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
--index.cts(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
--index.cts(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cts(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.cts(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.cts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(78,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(79,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.cts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(81,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(82,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.cts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(84,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cts(85,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.mts(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.mts(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.mts(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.mts(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.mts(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.mts(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mts(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.mts(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.mts(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.mts(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.mts(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mts(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.ts(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.ts(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.ts(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.ts(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.ts(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.ts(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.ts(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.ts(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.ts(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.ts(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.ts(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.ts(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--
--
--==== subfolder/index.ts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder/index.cts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder/index.mts (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.ts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.cts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.mts (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.ts (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.mts (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.cts (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== index.mts (27 errors) ====
--    import * as m1 from "./index.js";
--    import * as m2 from "./index.mjs";
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--    import * as m11 from "./subfolder2/another/index.mjs";
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones should all fail - esm format files have no index resolution or extension resolution
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    import * as m15 from "./subfolder";
--                         ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m16 from "./subfolder/";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m17 from "./subfolder/index";
--                         ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    import * as m18 from "./subfolder2";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m19 from "./subfolder2/";
--                         ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m20 from "./subfolder2/index";
--                         ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
--    import m27 = require("./subfolder/");
--    import m28 = require("./subfolder/index");
--    import m29 = require("./subfolder2");
--    import m30 = require("./subfolder2/");
--    import m31 = require("./subfolder2/index");
--    import m32 = require("./subfolder2/another");
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    
--    // esm format file
--    const x = 1;
--    export {x};
--==== index.cts (27 errors) ====
--    // ESM-format imports below should issue errors
--    import * as m1 from "./index.js";
--                        ~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
--    import * as m2 from "./index.mjs";
--                        ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--                        ~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
--    import * as m11 from "./subfolder2/another/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file)
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
--    import * as m15 from "./subfolder";
--    import * as m16 from "./subfolder/";
--    import * as m17 from "./subfolder/index";
--    import * as m18 from "./subfolder2";
--    import * as m19 from "./subfolder2/";
--    import * as m20 from "./subfolder2/index";
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
--    import m27 = require("./subfolder/");
--    import m28 = require("./subfolder/index");
--    import m29 = require("./subfolder2");
--    import m30 = require("./subfolder2/");
--    import m31 = require("./subfolder2/index");
--    import m32 = require("./subfolder2/another");
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    // cjs format file
--    const x = 1;
--    export {x};
--==== index.ts (27 errors) ====
--    import * as m1 from "./index.js";
--    import * as m2 from "./index.mjs";
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--    import * as m11 from "./subfolder2/another/index.mjs";
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    import * as m15 from "./subfolder";
--                         ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m16 from "./subfolder/";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m17 from "./subfolder/index";
--                         ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    import * as m18 from "./subfolder2";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m19 from "./subfolder2/";
--                         ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m20 from "./subfolder2/index";
--                         ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
--    import m27 = require("./subfolder/");
--    import m28 = require("./subfolder/index");
--    import m29 = require("./subfolder2");
--    import m30 = require("./subfolder2/");
--    import m31 = require("./subfolder2/index");
--    import m32 = require("./subfolder2/another");
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    // esm format file
--    const x = 1;
--    export {x};
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module"
--    }
--==== subfolder/package.json (0 errors) ====
--    {
--        "type": "commonjs"
--    }
--==== subfolder2/package.json (0 errors) ====
--    {
--    }
--==== subfolder2/another/package.json (0 errors) ====
--    {
--        "type": "module"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).js
index 38bbfcf9b2..b90de75ced 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).js
@@ -339,9 +339,12 @@ exports.x = x;
 const x = 1;
 export { x };
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
 // cjs format file
 const x = 1;
-export { x };
+exports.x = x;
 //// [index.cjs]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).js.diff
index 6355d18e7e..2bc820cdeb 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).js.diff
@@ -1,20 +1,6 @@
 --- old.nodeModules1(module=nodenext).js
 +++ new.nodeModules1(module=nodenext).js
-@@= skipped -338, +338 lines =@@
- const x = 1;
- export { x };
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.x = void 0;
- // cjs format file
- const x = 1;
--exports.x = x;
-+export { x };
- //// [index.cjs]
- "use strict";
- Object.defineProperty(exports, "__esModule", { value: true });
-@@= skipped -321, +318 lines =@@
+@@= skipped -659, +659 lines =@@
  // esm format file
  const x = 1;
  export { x };
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).types
index 501c69d176..3638c2330d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).types
@@ -120,37 +120,37 @@ import * as m12 from "./subfolder2/another/index.cjs";
 
 // The next ones should all fail - esm format files have no index resolution or extension resolution
 import * as m13 from "./";
->m13 : typeof import("index")
+>m13 : any
 
 import * as m14 from "./index";
->m14 : typeof import("index")
+>m14 : any
 
 import * as m15 from "./subfolder";
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 import * as m16 from "./subfolder/";
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 import * as m17 from "./subfolder/index";
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 import * as m18 from "./subfolder2";
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 import * as m19 from "./subfolder2/";
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 import * as m20 from "./subfolder2/index";
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 import * as m21 from "./subfolder2/another";
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 import * as m22 from "./subfolder2/another/";
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 import * as m23 from "./subfolder2/another/index";
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 void m1;
 >void m1 : undefined
@@ -202,47 +202,47 @@ void m12;
 
 void m13;
 >void m13 : undefined
->m13 : typeof import("index")
+>m13 : any
 
 void m14;
 >void m14 : undefined
->m14 : typeof import("index")
+>m14 : any
 
 void m15;
 >void m15 : undefined
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 void m16;
 >void m16 : undefined
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 void m17;
 >void m17 : undefined
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 void m18;
 >void m18 : undefined
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 void m19;
 >void m19 : undefined
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 void m20;
 >void m20 : undefined
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 void m21;
 >void m21 : undefined
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 void m22;
 >void m22 : undefined
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 void m23;
 >void m23 : undefined
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
 import m24 = require("./");
@@ -324,58 +324,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // esm format file
@@ -630,58 +630,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // cjs format file
@@ -731,37 +731,37 @@ import * as m12 from "./subfolder2/another/index.cjs";
 
 // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
 import * as m13 from "./";
->m13 : typeof import("index")
+>m13 : any
 
 import * as m14 from "./index";
->m14 : typeof import("index")
+>m14 : any
 
 import * as m15 from "./subfolder";
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 import * as m16 from "./subfolder/";
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 import * as m17 from "./subfolder/index";
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 import * as m18 from "./subfolder2";
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 import * as m19 from "./subfolder2/";
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 import * as m20 from "./subfolder2/index";
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 import * as m21 from "./subfolder2/another";
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 import * as m22 from "./subfolder2/another/";
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 import * as m23 from "./subfolder2/another/index";
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 void m1;
 >void m1 : undefined
@@ -813,47 +813,47 @@ void m12;
 
 void m13;
 >void m13 : undefined
->m13 : typeof import("index")
+>m13 : any
 
 void m14;
 >void m14 : undefined
->m14 : typeof import("index")
+>m14 : any
 
 void m15;
 >void m15 : undefined
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 void m16;
 >void m16 : undefined
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 void m17;
 >void m17 : undefined
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 void m18;
 >void m18 : undefined
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 void m19;
 >void m19 : undefined
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 void m20;
 >void m20 : undefined
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 void m21;
 >void m21 : undefined
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 void m22;
 >void m22 : undefined
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 void m23;
 >void m23 : undefined
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
 import m24 = require("./");
@@ -935,58 +935,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).types.diff
index 30c76a9684..737670aea1 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=nodenext).types.diff
@@ -53,48 +53,7 @@
  
  // The next ones should all fail - esm format files have no index resolution or extension resolution
  import * as m13 from "./";
-->m13 : any
-+>m13 : typeof import("index")
- 
- import * as m14 from "./index";
-->m14 : any
-+>m14 : typeof import("index")
- 
- import * as m15 from "./subfolder";
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- import * as m16 from "./subfolder/";
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- import * as m17 from "./subfolder/index";
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- import * as m18 from "./subfolder2";
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- import * as m19 from "./subfolder2/";
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- import * as m20 from "./subfolder2/index";
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- import * as m21 from "./subfolder2/another";
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- import * as m22 from "./subfolder2/another/";
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- import * as m23 from "./subfolder2/another/index";
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -71, +71 lines =@@
  
  void m1;
  >void m1 : undefined
@@ -158,58 +117,7 @@
  
  void m13;
  >void m13 : undefined
-->m13 : any
-+>m13 : typeof import("index")
- 
- void m14;
- >void m14 : undefined
-->m14 : any
-+>m14 : typeof import("index")
- 
- void m15;
- >void m15 : undefined
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- void m16;
- >void m16 : undefined
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- void m17;
- >void m17 : undefined
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- void m18;
- >void m18 : undefined
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- void m19;
- >void m19 : undefined
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- void m20;
- >void m20 : undefined
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- void m21;
- >void m21 : undefined
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- void m22;
- >void m22 : undefined
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- void m23;
- >void m23 : undefined
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -92, +92 lines =@@
  
  // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
  import m24 = require("./");
@@ -313,84 +221,7 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // esm format file
-@@= skipped -306, +306 lines =@@
+@@= skipped -143, +143 lines =@@
  === index.cts ===
  // ESM-format imports below should issue errors
  import * as m1 from "./index.js";
@@ -703,83 +534,6 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // cjs format file
 @@= skipped -305, +305 lines =@@
  
  === index.ts ===
@@ -833,48 +587,7 @@
  
  // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
  import * as m13 from "./";
-->m13 : any
-+>m13 : typeof import("index")
- 
- import * as m14 from "./index";
-->m14 : any
-+>m14 : typeof import("index")
- 
- import * as m15 from "./subfolder";
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- import * as m16 from "./subfolder/";
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- import * as m17 from "./subfolder/index";
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- import * as m18 from "./subfolder2";
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- import * as m19 from "./subfolder2/";
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- import * as m20 from "./subfolder2/index";
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- import * as m21 from "./subfolder2/another";
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- import * as m22 from "./subfolder2/another/";
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- import * as m23 from "./subfolder2/another/index";
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -71, +71 lines =@@
  
  void m1;
  >void m1 : undefined
@@ -938,58 +651,7 @@
  
  void m13;
  >void m13 : undefined
-->m13 : any
-+>m13 : typeof import("index")
- 
- void m14;
- >void m14 : undefined
-->m14 : any
-+>m14 : typeof import("index")
- 
- void m15;
- >void m15 : undefined
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- void m16;
- >void m16 : undefined
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- void m17;
- >void m17 : undefined
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- void m18;
- >void m18 : undefined
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- void m19;
- >void m19 : undefined
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- void m20;
- >void m20 : undefined
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- void m21;
- >void m21 : undefined
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- void m22;
- >void m22 : undefined
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- void m23;
- >void m23 : undefined
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -92, +92 lines =@@
  
  // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
  import m24 = require("./");
@@ -1093,80 +755,3 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node16).errors.txt
new file mode 100644
index 0000000000..7cbf2626ec
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node16).errors.txt
@@ -0,0 +1,564 @@
+index.cjs(2,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
+index.cjs(3,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
+index.cjs(6,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
+index.cjs(9,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
+index.cjs(11,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
+index.cjs(12,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
+index.cjs(15,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
+index.cjs(16,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
+index.cjs(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+index.cjs(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+index.cjs(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+index.cjs(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.cjs(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.cjs(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(78,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(79,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.cjs(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(81,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(82,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.cjs(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(84,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(85,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.js(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.js(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.js(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.js(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.js(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.js(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.js(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.js(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.js(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.js(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.mjs(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.mjs(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.mjs(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.mjs(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.mjs(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.mjs(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.mjs(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.mjs(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.mjs(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.mjs(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+
+
+==== subfolder/index.js (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder/index.cjs (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder/index.mjs (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.js (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.cjs (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.mjs (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.js (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.cjs (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.mjs (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== index.js (27 errors) ====
+    import * as m1 from "./index.js";
+    import * as m2 from "./index.mjs";
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+    import * as m11 from "./subfolder2/another/index.mjs";
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    import * as m15 from "./subfolder";
+                         ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m16 from "./subfolder/";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m17 from "./subfolder/index";
+                         ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    import * as m18 from "./subfolder2";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m19 from "./subfolder2/";
+                         ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m20 from "./subfolder2/index";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    // esm format file
+    const x = 1;
+    export {x};
+==== index.cjs (27 errors) ====
+    // ESM-format imports below should issue errors
+    import * as m1 from "./index.js";
+                        ~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
+    import * as m2 from "./index.mjs";
+                        ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+                        ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
+    import * as m11 from "./subfolder2/another/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file)
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
+    import * as m15 from "./subfolder";
+    import * as m16 from "./subfolder/";
+    import * as m17 from "./subfolder/index";
+    import * as m18 from "./subfolder2";
+    import * as m19 from "./subfolder2/";
+    import * as m20 from "./subfolder2/index";
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    // cjs format file
+    const x = 1;
+    export {x};
+==== index.mjs (27 errors) ====
+    import * as m1 from "./index.js";
+    import * as m2 from "./index.mjs";
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+    import * as m11 from "./subfolder2/another/index.mjs";
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones should all fail - esm format files have no index resolution or extension resolution
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    import * as m15 from "./subfolder";
+                         ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m16 from "./subfolder/";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m17 from "./subfolder/index";
+                         ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    import * as m18 from "./subfolder2";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m19 from "./subfolder2/";
+                         ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m20 from "./subfolder2/index";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    
+    // esm format file
+    const x = 1;
+    export {x};
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module"
+    }
+==== subfolder/package.json (0 errors) ====
+    {
+        "type": "commonjs"
+    }
+==== subfolder2/package.json (0 errors) ====
+    {
+    }
+==== subfolder2/another/package.json (0 errors) ====
+    {
+        "type": "module"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node16).types
index 629022de76..d11e0329be 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node16).types
@@ -120,37 +120,37 @@ import * as m12 from "./subfolder2/another/index.cjs";
 
 // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
 import * as m13 from "./";
->m13 : typeof import("index")
+>m13 : any
 
 import * as m14 from "./index";
->m14 : typeof import("index")
+>m14 : any
 
 import * as m15 from "./subfolder";
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 import * as m16 from "./subfolder/";
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 import * as m17 from "./subfolder/index";
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 import * as m18 from "./subfolder2";
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 import * as m19 from "./subfolder2/";
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 import * as m20 from "./subfolder2/index";
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 import * as m21 from "./subfolder2/another";
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 import * as m22 from "./subfolder2/another/";
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 import * as m23 from "./subfolder2/another/index";
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 void m1;
 >void m1 : undefined
@@ -202,47 +202,47 @@ void m12;
 
 void m13;
 >void m13 : undefined
->m13 : typeof import("index")
+>m13 : any
 
 void m14;
 >void m14 : undefined
->m14 : typeof import("index")
+>m14 : any
 
 void m15;
 >void m15 : undefined
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 void m16;
 >void m16 : undefined
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 void m17;
 >void m17 : undefined
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 void m18;
 >void m18 : undefined
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 void m19;
 >void m19 : undefined
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 void m20;
 >void m20 : undefined
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 void m21;
 >void m21 : undefined
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 void m22;
 >void m22 : undefined
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 void m23;
 >void m23 : undefined
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
 import m24 = require("./");
@@ -324,58 +324,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // esm format file
@@ -630,58 +630,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // cjs format file
@@ -731,37 +731,37 @@ import * as m12 from "./subfolder2/another/index.cjs";
 
 // The next ones should all fail - esm format files have no index resolution or extension resolution
 import * as m13 from "./";
->m13 : typeof import("index")
+>m13 : any
 
 import * as m14 from "./index";
->m14 : typeof import("index")
+>m14 : any
 
 import * as m15 from "./subfolder";
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 import * as m16 from "./subfolder/";
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 import * as m17 from "./subfolder/index";
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 import * as m18 from "./subfolder2";
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 import * as m19 from "./subfolder2/";
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 import * as m20 from "./subfolder2/index";
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 import * as m21 from "./subfolder2/another";
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 import * as m22 from "./subfolder2/another/";
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 import * as m23 from "./subfolder2/another/index";
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 void m1;
 >void m1 : undefined
@@ -813,47 +813,47 @@ void m12;
 
 void m13;
 >void m13 : undefined
->m13 : typeof import("index")
+>m13 : any
 
 void m14;
 >void m14 : undefined
->m14 : typeof import("index")
+>m14 : any
 
 void m15;
 >void m15 : undefined
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 void m16;
 >void m16 : undefined
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 void m17;
 >void m17 : undefined
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 void m18;
 >void m18 : undefined
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 void m19;
 >void m19 : undefined
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 void m20;
 >void m20 : undefined
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 void m21;
 >void m21 : undefined
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 void m22;
 >void m22 : undefined
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 void m23;
 >void m23 : undefined
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
 import m24 = require("./");
@@ -935,58 +935,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=nodenext).errors.txt
new file mode 100644
index 0000000000..7cbf2626ec
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=nodenext).errors.txt
@@ -0,0 +1,564 @@
+index.cjs(2,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
+index.cjs(3,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
+index.cjs(6,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
+index.cjs(9,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
+index.cjs(11,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
+index.cjs(12,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
+index.cjs(15,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
+index.cjs(16,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
+index.cjs(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+index.cjs(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+index.cjs(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+index.cjs(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.cjs(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.cjs(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.cjs(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(78,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(79,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.cjs(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(81,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(82,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.cjs(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(84,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.cjs(85,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.js(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.js(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.js(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.js(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.js(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.js(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.js(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.js(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.js(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.js(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.js(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.js(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.mjs(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.mjs(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.mjs(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.mjs(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.mjs(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+index.mjs(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+index.mjs(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+index.mjs(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+index.mjs(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+index.mjs(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+index.mjs(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+index.mjs(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+
+
+==== subfolder/index.js (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder/index.cjs (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder/index.mjs (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.js (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.cjs (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/index.mjs (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.js (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.cjs (0 errors) ====
+    // cjs format file
+    const x = 1;
+    export {x};
+==== subfolder2/another/index.mjs (0 errors) ====
+    // esm format file
+    const x = 1;
+    export {x};
+==== index.js (27 errors) ====
+    import * as m1 from "./index.js";
+    import * as m2 from "./index.mjs";
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+    import * as m11 from "./subfolder2/another/index.mjs";
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    import * as m15 from "./subfolder";
+                         ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m16 from "./subfolder/";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m17 from "./subfolder/index";
+                         ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    import * as m18 from "./subfolder2";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m19 from "./subfolder2/";
+                         ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m20 from "./subfolder2/index";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    // esm format file
+    const x = 1;
+    export {x};
+==== index.cjs (27 errors) ====
+    // ESM-format imports below should issue errors
+    import * as m1 from "./index.js";
+                        ~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
+    import * as m2 from "./index.mjs";
+                        ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+                        ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
+    import * as m11 from "./subfolder2/another/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file)
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
+    import * as m15 from "./subfolder";
+    import * as m16 from "./subfolder/";
+    import * as m17 from "./subfolder/index";
+    import * as m18 from "./subfolder2";
+    import * as m19 from "./subfolder2/";
+    import * as m20 from "./subfolder2/index";
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    // cjs format file
+    const x = 1;
+    export {x};
+==== index.mjs (27 errors) ====
+    import * as m1 from "./index.js";
+    import * as m2 from "./index.mjs";
+    import * as m3 from "./index.cjs";
+    import * as m4 from "./subfolder/index.js";
+    import * as m5 from "./subfolder/index.mjs";
+    import * as m6 from "./subfolder/index.cjs";
+    import * as m7 from "./subfolder2/index.js";
+    import * as m8 from "./subfolder2/index.mjs";
+    import * as m9 from "./subfolder2/index.cjs";
+    import * as m10 from "./subfolder2/another/index.js";
+    import * as m11 from "./subfolder2/another/index.mjs";
+    import * as m12 from "./subfolder2/another/index.cjs";
+    // The next ones should all fail - esm format files have no index resolution or extension resolution
+    import * as m13 from "./";
+                         ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    import * as m14 from "./index";
+                         ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    import * as m15 from "./subfolder";
+                         ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m16 from "./subfolder/";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m17 from "./subfolder/index";
+                         ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    import * as m18 from "./subfolder2";
+                         ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m19 from "./subfolder2/";
+                         ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m20 from "./subfolder2/index";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    import * as m21 from "./subfolder2/another";
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m22 from "./subfolder2/another/";
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    import * as m23 from "./subfolder2/another/index";
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    void m1;
+    void m2;
+    void m3;
+    void m4;
+    void m5;
+    void m6;
+    void m7;
+    void m8;
+    void m9;
+    void m10;
+    void m11;
+    void m12;
+    void m13;
+    void m14;
+    void m15;
+    void m16;
+    void m17;
+    void m18;
+    void m19;
+    void m20;
+    void m21;
+    void m22;
+    void m23;
+    
+    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+    import m24 = require("./");
+                         ~~~~
+!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m25 = require("./index");
+                         ~~~~~~~~~
+!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m26 = require("./subfolder");
+    import m27 = require("./subfolder/");
+    import m28 = require("./subfolder/index");
+    import m29 = require("./subfolder2");
+    import m30 = require("./subfolder2/");
+    import m31 = require("./subfolder2/index");
+    import m32 = require("./subfolder2/another");
+                         ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m33 = require("./subfolder2/another/");
+                         ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import m34 = require("./subfolder2/another/index");
+                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    void m24;
+    void m25;
+    void m26;
+    void m27;
+    void m28;
+    void m29;
+    void m30;
+    void m31;
+    void m32;
+    void m33;
+    void m34;
+    
+    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
+    const _m35 = import("./");
+                        ~~~~
+!!! error TS2307: Cannot find module './' or its corresponding type declarations.
+    const _m36 = import("./index");
+                        ~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+    const _m37 = import("./subfolder");
+                        ~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m38 = import("./subfolder/");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m39 = import("./subfolder/index");
+                        ~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
+    const _m40 = import("./subfolder2");
+                        ~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m41 = import("./subfolder2/");
+                        ~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m42 = import("./subfolder2/index");
+                        ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
+    const _m43 = import("./subfolder2/another");
+                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m44 = import("./subfolder2/another/");
+                        ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+    const _m45 = import("./subfolder2/another/index");
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+    
+    // esm format file
+    const x = 1;
+    export {x};
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module"
+    }
+==== subfolder/package.json (0 errors) ====
+    {
+        "type": "commonjs"
+    }
+==== subfolder2/package.json (0 errors) ====
+    {
+    }
+==== subfolder2/another/package.json (0 errors) ====
+    {
+        "type": "module"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=nodenext).types
index 629022de76..d11e0329be 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=nodenext).types
@@ -120,37 +120,37 @@ import * as m12 from "./subfolder2/another/index.cjs";
 
 // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
 import * as m13 from "./";
->m13 : typeof import("index")
+>m13 : any
 
 import * as m14 from "./index";
->m14 : typeof import("index")
+>m14 : any
 
 import * as m15 from "./subfolder";
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 import * as m16 from "./subfolder/";
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 import * as m17 from "./subfolder/index";
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 import * as m18 from "./subfolder2";
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 import * as m19 from "./subfolder2/";
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 import * as m20 from "./subfolder2/index";
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 import * as m21 from "./subfolder2/another";
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 import * as m22 from "./subfolder2/another/";
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 import * as m23 from "./subfolder2/another/index";
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 void m1;
 >void m1 : undefined
@@ -202,47 +202,47 @@ void m12;
 
 void m13;
 >void m13 : undefined
->m13 : typeof import("index")
+>m13 : any
 
 void m14;
 >void m14 : undefined
->m14 : typeof import("index")
+>m14 : any
 
 void m15;
 >void m15 : undefined
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 void m16;
 >void m16 : undefined
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 void m17;
 >void m17 : undefined
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 void m18;
 >void m18 : undefined
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 void m19;
 >void m19 : undefined
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 void m20;
 >void m20 : undefined
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 void m21;
 >void m21 : undefined
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 void m22;
 >void m22 : undefined
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 void m23;
 >void m23 : undefined
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
 import m24 = require("./");
@@ -324,58 +324,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // esm format file
@@ -630,58 +630,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // cjs format file
@@ -731,37 +731,37 @@ import * as m12 from "./subfolder2/another/index.cjs";
 
 // The next ones should all fail - esm format files have no index resolution or extension resolution
 import * as m13 from "./";
->m13 : typeof import("index")
+>m13 : any
 
 import * as m14 from "./index";
->m14 : typeof import("index")
+>m14 : any
 
 import * as m15 from "./subfolder";
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 import * as m16 from "./subfolder/";
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 import * as m17 from "./subfolder/index";
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 import * as m18 from "./subfolder2";
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 import * as m19 from "./subfolder2/";
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 import * as m20 from "./subfolder2/index";
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 import * as m21 from "./subfolder2/another";
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 import * as m22 from "./subfolder2/another/";
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 import * as m23 from "./subfolder2/another/index";
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 void m1;
 >void m1 : undefined
@@ -813,47 +813,47 @@ void m12;
 
 void m13;
 >void m13 : undefined
->m13 : typeof import("index")
+>m13 : any
 
 void m14;
 >void m14 : undefined
->m14 : typeof import("index")
+>m14 : any
 
 void m15;
 >void m15 : undefined
->m15 : typeof import("subfolder/index")
+>m15 : any
 
 void m16;
 >void m16 : undefined
->m16 : typeof import("subfolder/index")
+>m16 : any
 
 void m17;
 >void m17 : undefined
->m17 : typeof import("subfolder/index")
+>m17 : any
 
 void m18;
 >void m18 : undefined
->m18 : typeof import("subfolder2/index")
+>m18 : any
 
 void m19;
 >void m19 : undefined
->m19 : typeof import("subfolder2/index")
+>m19 : any
 
 void m20;
 >void m20 : undefined
->m20 : typeof import("subfolder2/index")
+>m20 : any
 
 void m21;
 >void m21 : undefined
->m21 : typeof import("subfolder2/another/index")
+>m21 : any
 
 void m22;
 >void m22 : undefined
->m22 : typeof import("subfolder2/another/index")
+>m22 : any
 
 void m23;
 >void m23 : undefined
->m23 : typeof import("subfolder2/another/index")
+>m23 : any
 
 // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
 import m24 = require("./");
@@ -935,58 +935,58 @@ void m34;
 
 // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
 const _m35 = import("./");
->_m35 : Promise<typeof import("index")>
->import("./") : Promise<typeof import("index")>
+>_m35 : Promise<any>
+>import("./") : Promise<any>
 >"./" : "./"
 
 const _m36 = import("./index");
->_m36 : Promise<typeof import("index")>
->import("./index") : Promise<typeof import("index")>
+>_m36 : Promise<any>
+>import("./index") : Promise<any>
 >"./index" : "./index"
 
 const _m37 = import("./subfolder");
->_m37 : Promise<typeof import("subfolder/index")>
->import("./subfolder") : Promise<typeof import("subfolder/index")>
+>_m37 : Promise<any>
+>import("./subfolder") : Promise<any>
 >"./subfolder" : "./subfolder"
 
 const _m38 = import("./subfolder/");
->_m38 : Promise<typeof import("subfolder/index")>
->import("./subfolder/") : Promise<typeof import("subfolder/index")>
+>_m38 : Promise<any>
+>import("./subfolder/") : Promise<any>
 >"./subfolder/" : "./subfolder/"
 
 const _m39 = import("./subfolder/index");
->_m39 : Promise<typeof import("subfolder/index")>
->import("./subfolder/index") : Promise<typeof import("subfolder/index")>
+>_m39 : Promise<any>
+>import("./subfolder/index") : Promise<any>
 >"./subfolder/index" : "./subfolder/index"
 
 const _m40 = import("./subfolder2");
->_m40 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2") : Promise<typeof import("subfolder2/index")>
+>_m40 : Promise<any>
+>import("./subfolder2") : Promise<any>
 >"./subfolder2" : "./subfolder2"
 
 const _m41 = import("./subfolder2/");
->_m41 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
+>_m41 : Promise<any>
+>import("./subfolder2/") : Promise<any>
 >"./subfolder2/" : "./subfolder2/"
 
 const _m42 = import("./subfolder2/index");
->_m42 : Promise<typeof import("subfolder2/index")>
->import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
+>_m42 : Promise<any>
+>import("./subfolder2/index") : Promise<any>
 >"./subfolder2/index" : "./subfolder2/index"
 
 const _m43 = import("./subfolder2/another");
->_m43 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
+>_m43 : Promise<any>
+>import("./subfolder2/another") : Promise<any>
 >"./subfolder2/another" : "./subfolder2/another"
 
 const _m44 = import("./subfolder2/another/");
->_m44 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
+>_m44 : Promise<any>
+>import("./subfolder2/another/") : Promise<any>
 >"./subfolder2/another/" : "./subfolder2/another/"
 
 const _m45 = import("./subfolder2/another/index");
->_m45 : Promise<typeof import("subfolder2/another/index")>
->import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
+>_m45 : Promise<any>
+>import("./subfolder2/another/index") : Promise<any>
 >"./subfolder2/another/index" : "./subfolder2/another/index"
 
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt
index 0b4dfccf9f..26f1b13e74 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt
@@ -1,3 +1,5 @@
+index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 index.cjs(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
 index.cjs(9,23): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
 index.cjs(11,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
@@ -68,11 +70,15 @@ node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/typ
           ~~~~~~~~~
 !!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
     ts.mjsSource;
-==== index.cjs (3 errors) ====
+==== index.cjs (5 errors) ====
     // cjs format file
     import * as cjs from "package/cjs";
     import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
     import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
     cjs;
     mjs;
     type;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt
index 0b4dfccf9f..26f1b13e74 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt
@@ -1,3 +1,5 @@
+index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 index.cjs(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
 index.cjs(9,23): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
 index.cjs(11,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
@@ -68,11 +70,15 @@ node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/typ
           ~~~~~~~~~
 !!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
     ts.mjsSource;
-==== index.cjs (3 errors) ====
+==== index.cjs (5 errors) ====
     // cjs format file
     import * as cjs from "package/cjs";
     import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
     import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
     cjs;
     mjs;
     type;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node16).errors.txt
new file mode 100644
index 0000000000..a443d0e020
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node16).errors.txt
@@ -0,0 +1,104 @@
+index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+index.cjs(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+    import * as type from "package";
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+    import * as type from "package";
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cjs (3 errors) ====
+    // cjs format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+    import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+                          ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": {
+            "./cjs": "./index.cjs",
+            "./mjs": "./index.mjs",
+            ".": "./index.js"
+        }
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs": "./index.cjs",
+            "./mjs": "./index.mjs",
+            ".": "./index.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=nodenext).errors.txt
new file mode 100644
index 0000000000..a443d0e020
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=nodenext).errors.txt
@@ -0,0 +1,104 @@
+index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+index.cjs(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+    import * as type from "package";
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+    import * as type from "package";
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cjs (3 errors) ====
+    // cjs format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+    import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+                          ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": {
+            "./cjs": "./index.cjs",
+            "./mjs": "./index.mjs",
+            ".": "./index.js"
+        }
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs": "./index.cjs",
+            "./mjs": "./index.mjs",
+            ".": "./index.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node16).errors.txt
new file mode 100644
index 0000000000..cda549c5c6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node16).errors.txt
@@ -0,0 +1,44 @@
+index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+    import * as type from "#type";
+    cjs;
+    mjs;
+    type;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+    import * as type from "#type";
+    cjs;
+    mjs;
+    type;
+==== index.cjs (2 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+                         ~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+    import * as type from "#type";
+                          ~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+    cjs;
+    mjs;
+    type;
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js",
+        "imports": {
+            "#cjs": "./index.cjs",
+            "#mjs": "./index.mjs",
+            "#type": "./index.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=nodenext).errors.txt
new file mode 100644
index 0000000000..cda549c5c6
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=nodenext).errors.txt
@@ -0,0 +1,44 @@
+index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+    import * as type from "#type";
+    cjs;
+    mjs;
+    type;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+    import * as type from "#type";
+    cjs;
+    mjs;
+    type;
+==== index.cjs (2 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+                         ~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+    import * as type from "#type";
+                          ~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+    cjs;
+    mjs;
+    type;
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js",
+        "imports": {
+            "#cjs": "./index.cjs",
+            "#mjs": "./index.mjs",
+            "#type": "./index.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt
new file mode 100644
index 0000000000..5a720aaf53
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt
@@ -0,0 +1,75 @@
+index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cjs (1 errors) ====
+    // cjs format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+                          ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs/*": "./*.cjs",
+            "./mjs/*": "./*.mjs",
+            "./js/*": "./*.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt
new file mode 100644
index 0000000000..5a720aaf53
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt
@@ -0,0 +1,75 @@
+index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cjs (1 errors) ====
+    // cjs format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+                          ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs/*": "./*.cjs",
+            "./mjs/*": "./*.mjs",
+            "./js/*": "./*.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt
new file mode 100644
index 0000000000..6a51124825
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt
@@ -0,0 +1,75 @@
+index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cjs (1 errors) ====
+    // cjs format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+                          ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs/*.cjs": "./*.cjs",
+            "./mjs/*.mjs": "./*.mjs",
+            "./js/*.js": "./*.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt
new file mode 100644
index 0000000000..6a51124825
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt
@@ -0,0 +1,75 @@
+index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+
+
+==== index.js (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mjs (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cjs (1 errors) ====
+    // cjs format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+                          ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs/*.cjs": "./*.cjs",
+            "./mjs/*.mjs": "./*.mjs",
+            "./js/*.js": "./*.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt
new file mode 100644
index 0000000000..4c4797fb6c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt
@@ -0,0 +1,45 @@
+index.js(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+subfolder/index.js(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+subfolder/index.js(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+
+
+==== subfolder/index.js (2 errors) ====
+    // cjs format file
+    import {h} from "../index.js";
+                    ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+    import mod = require("../index.js");
+                         ~~~~~~~~~~~~~
+!!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import {f as _f} from "./index.js";
+    import mod2 = require("./index.js");
+    export async function f() {
+        const mod3 = await import ("../index.js");
+        const mod4 = await import ("./index.js");
+        h();
+    }
+==== index.js (1 errors) ====
+    // esm format file
+    import {h as _h} from "./index.js";
+    import mod = require("./index.js");
+                         ~~~~~~~~~~~~
+!!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import {f} from "./subfolder/index.js";
+    import mod2 = require("./subfolder/index.js");
+    export async function h() {
+        const mod3 = await import ("./index.js");
+        const mod4 = await import ("./subfolder/index.js");
+        f();
+    }
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module"
+    }
+==== subfolder/package.json (0 errors) ====
+    {
+        "type": "commonjs"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt
new file mode 100644
index 0000000000..4c4797fb6c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt
@@ -0,0 +1,45 @@
+index.js(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+subfolder/index.js(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+subfolder/index.js(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+
+
+==== subfolder/index.js (2 errors) ====
+    // cjs format file
+    import {h} from "../index.js";
+                    ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+    import mod = require("../index.js");
+                         ~~~~~~~~~~~~~
+!!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import {f as _f} from "./index.js";
+    import mod2 = require("./index.js");
+    export async function f() {
+        const mod3 = await import ("../index.js");
+        const mod4 = await import ("./index.js");
+        h();
+    }
+==== index.js (1 errors) ====
+    // esm format file
+    import {h as _h} from "./index.js";
+    import mod = require("./index.js");
+                         ~~~~~~~~~~~~
+!!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import {f} from "./subfolder/index.js";
+    import mod2 = require("./subfolder/index.js");
+    export async function h() {
+        const mod3 = await import ("./index.js");
+        const mod4 = await import ("./subfolder/index.js");
+        f();
+    }
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module"
+    }
+==== subfolder/package.json (0 errors) ====
+    {
+        "type": "commonjs"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt
new file mode 100644
index 0000000000..fe0dbb5d5b
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt
@@ -0,0 +1,38 @@
+/ctsExtension.cts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+/jsExtension.js(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mjs', or add the field `"type": "module"` to '/package.json'.
+/tsExtension.ts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mts', or add the field `"type": "module"` to '/package.json'.
+/tsxExtension.tsx(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, add the field `"type": "module"` to '/package.json'.
+
+
+==== /package.json (0 errors) ====
+    {}
+    
+==== /module.mts (0 errors) ====
+    export {};
+    
+==== /tsExtension.ts (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts', or add the field `"type": "module"` to '/package.json'.
+    
+==== /jsExtension.js (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs', or add the field `"type": "module"` to '/package.json'.
+    
+==== /ctsExtension.cts (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+    
+==== /tsxExtension.tsx (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, add the field `"type": "module"` to '/package.json'.
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt
new file mode 100644
index 0000000000..c8a14545ae
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt
@@ -0,0 +1,38 @@
+/ctsExtension.cts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+/jsExtension.js(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+/tsExtension.ts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
+/tsxExtension.tsx(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.
+
+
+==== /package.json (0 errors) ====
+    { "type": "commonjs" }
+    
+==== /module.mts (0 errors) ====
+    export {};
+    
+==== /tsExtension.ts (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
+    
+==== /jsExtension.js (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+    
+==== /ctsExtension.cts (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+    
+==== /tsxExtension.tsx (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt
new file mode 100644
index 0000000000..5a95dbced9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt
@@ -0,0 +1,23 @@
+/ctsExtension.cts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+
+
+==== /package.json (0 errors) ====
+    { "type": "module" }
+    
+==== /module.mts (0 errors) ====
+    export {};
+    
+==== /tsExtension.ts (0 errors) ====
+    import {} from "./module.mjs";
+    
+==== /jsExtension.js (0 errors) ====
+    import {} from "./module.mjs";
+    
+==== /ctsExtension.cts (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+    
+==== /tsxExtension.tsx (0 errors) ====
+    import {} from "./module.mjs";
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt
new file mode 100644
index 0000000000..14af0e2900
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt
@@ -0,0 +1,35 @@
+/ctsExtension.cts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+/jsExtension.js(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+/tsExtension.ts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
+/tsxExtension.tsx(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+  To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.
+
+
+==== /module.mts (0 errors) ====
+    export {};
+    
+==== /tsExtension.ts (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
+    
+==== /jsExtension.js (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+    
+==== /ctsExtension.cts (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+    
+==== /tsxExtension.tsx (1 errors) ====
+    import {} from "./module.mjs";
+                   ~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node16).errors.txt
index d3d7cff04b..5ef737bc87 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node16).errors.txt
@@ -1,3 +1,5 @@
+index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 index.cts(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
 index.cts(9,23): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
 index.cts(11,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
@@ -68,11 +70,15 @@ node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/typ
           ~~~~~~~~~
 !!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
     ts.mjsSource;
-==== index.cts (3 errors) ====
+==== index.cts (5 errors) ====
     // cjs format file
     import * as cjs from "package/cjs";
     import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
     import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
     cjs;
     mjs;
     type;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node16).errors.txt.diff
index 85ee51ddf8..b0a09b9205 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node16).errors.txt.diff
@@ -2,8 +2,8 @@
 +++ new.nodeModulesConditionalPackageExports(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 -node_modules/inner/index.d.mts(2,13): error TS2303: Circular definition of import alias 'cjs'.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
 +index.cts(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
@@ -34,7 +34,7 @@
      // esm format file
      import * as cjs from "package/cjs";
      import * as mjs from "package/mjs";
-@@= skipped -14, +28 lines =@@
+@@= skipped -14, +30 lines =@@
      mjs;
      type;
      import * as cjsi from "inner/a";
@@ -78,16 +78,11 @@
 +!!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
      ts.mjsSource;
 -==== index.cts (2 errors) ====
-+==== index.cts (3 errors) ====
++==== index.cts (5 errors) ====
      // cjs format file
      import * as cjs from "package/cjs";
      import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
-     import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
-     cjs;
+@@= skipped -20, +28 lines =@@
      mjs;
      type;
      import * as cjsi from "inner/a";
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).errors.txt
index d3d7cff04b..5ef737bc87 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).errors.txt
@@ -1,3 +1,5 @@
+index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 index.cts(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
 index.cts(9,23): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
 index.cts(11,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
@@ -68,11 +70,15 @@ node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/typ
           ~~~~~~~~~
 !!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
     ts.mjsSource;
-==== index.cts (3 errors) ====
+==== index.cts (5 errors) ====
     // cjs format file
     import * as cjs from "package/cjs";
     import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
     import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
     cjs;
     mjs;
     type;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).errors.txt.diff
index d4a40110a7..fde87ae5e1 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=nodenext).errors.txt.diff
@@ -2,8 +2,8 @@
 +++ new.nodeModulesConditionalPackageExports(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 -node_modules/inner/index.d.mts(2,13): error TS2303: Circular definition of import alias 'cjs'.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
 +index.cts(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
@@ -34,7 +34,7 @@
      // esm format file
      import * as cjs from "package/cjs";
      import * as mjs from "package/mjs";
-@@= skipped -14, +28 lines =@@
+@@= skipped -14, +30 lines =@@
      mjs;
      type;
      import * as cjsi from "inner/a";
@@ -78,16 +78,11 @@
 +!!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
      ts.mjsSource;
 -==== index.cts (2 errors) ====
-+==== index.cts (3 errors) ====
++==== index.cts (5 errors) ====
      // cjs format file
      import * as cjs from "package/cjs";
      import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
-     import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
-     cjs;
+@@= skipped -20, +28 lines =@@
      mjs;
      type;
      import * as cjsi from "inner/a";
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt
index ee951d981a..f82891bb16 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt
@@ -1,5 +1,10 @@
+index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
 node_modules/inner/index.d.cts(5,1): error TS1036: Statements are not allowed in ambient contexts.
 node_modules/inner/index.d.mts(5,1): error TS1036: Statements are not allowed in ambient contexts.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
 node_modules/inner/index.d.ts(5,1): error TS1036: Statements are not allowed in ambient contexts.
 
 
@@ -31,24 +36,32 @@ node_modules/inner/index.d.ts(5,1): error TS1036: Statements are not allowed in
     export const d = cjsi;
     export const e = mjsi;
     export const f = typei;
-==== index.cts (0 errors) ====
+==== index.cts (3 errors) ====
     // cjs format file
     import * as cjs from "package/cjs";
     import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
     import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
     export const a = cjs;
     export const b = mjs;
     export const c = type;
     import * as cjsi from "inner/cjs";
     import * as mjsi from "inner/mjs";
+                          ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
     import * as typei from "inner";
     export const d = cjsi;
     export const e = mjsi;
     export const f = typei;
-==== node_modules/inner/index.d.ts (1 errors) ====
+==== node_modules/inner/index.d.ts (2 errors) ====
     // cjs format file
     import * as cjs from "inner/cjs";
     import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
     import * as type from "inner";
     cjs;
     ~~~
@@ -67,10 +80,12 @@ node_modules/inner/index.d.ts(5,1): error TS1036: Statements are not allowed in
     mjs;
     type;
     export const esm = true;
-==== node_modules/inner/index.d.cts (1 errors) ====
+==== node_modules/inner/index.d.cts (2 errors) ====
     // cjs format file
     import * as cjs from "inner/cjs";
     import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
     import * as type from "inner";
     cjs;
     ~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt.diff
index c55b8f7539..bff1ae15b2 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt.diff
@@ -2,13 +2,10 @@
 +++ new.nodeModulesDeclarationEmitWithPackageExports(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
- node_modules/inner/index.d.cts(5,1): error TS1036: Statements are not allowed in ambient contexts.
- node_modules/inner/index.d.mts(5,1): error TS1036: Statements are not allowed in ambient contexts.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+@@= skipped -8, +7 lines =@@
  node_modules/inner/index.d.ts(5,1): error TS1036: Statements are not allowed in ambient contexts.
  
  
@@ -16,52 +13,3 @@
  ==== index.ts (0 errors) ====
      // esm format file
      import * as cjs from "package/cjs";
-@@= skipped -37, +30 lines =@@
-     export const d = cjsi;
-     export const e = mjsi;
-     export const f = typei;
--==== index.cts (3 errors) ====
-+==== index.cts (0 errors) ====
-     // cjs format file
-     import * as cjs from "package/cjs";
-     import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
-     import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
-     export const a = cjs;
-     export const b = mjs;
-     export const c = type;
-     import * as cjsi from "inner/cjs";
-     import * as mjsi from "inner/mjs";
--                          ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
-     import * as typei from "inner";
-     export const d = cjsi;
-     export const e = mjsi;
-     export const f = typei;
--==== node_modules/inner/index.d.ts (2 errors) ====
-+==== node_modules/inner/index.d.ts (1 errors) ====
-     // cjs format file
-     import * as cjs from "inner/cjs";
-     import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
-     import * as type from "inner";
-     cjs;
-     ~~~
-@@= skipped -44, +36 lines =@@
-     mjs;
-     type;
-     export const esm = true;
--==== node_modules/inner/index.d.cts (2 errors) ====
-+==== node_modules/inner/index.d.cts (1 errors) ====
-     // cjs format file
-     import * as cjs from "inner/cjs";
-     import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
-     import * as type from "inner";
-     cjs;
-     ~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt
index ee951d981a..f82891bb16 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt
@@ -1,5 +1,10 @@
+index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
 node_modules/inner/index.d.cts(5,1): error TS1036: Statements are not allowed in ambient contexts.
 node_modules/inner/index.d.mts(5,1): error TS1036: Statements are not allowed in ambient contexts.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
 node_modules/inner/index.d.ts(5,1): error TS1036: Statements are not allowed in ambient contexts.
 
 
@@ -31,24 +36,32 @@ node_modules/inner/index.d.ts(5,1): error TS1036: Statements are not allowed in
     export const d = cjsi;
     export const e = mjsi;
     export const f = typei;
-==== index.cts (0 errors) ====
+==== index.cts (3 errors) ====
     // cjs format file
     import * as cjs from "package/cjs";
     import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
     import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
     export const a = cjs;
     export const b = mjs;
     export const c = type;
     import * as cjsi from "inner/cjs";
     import * as mjsi from "inner/mjs";
+                          ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
     import * as typei from "inner";
     export const d = cjsi;
     export const e = mjsi;
     export const f = typei;
-==== node_modules/inner/index.d.ts (1 errors) ====
+==== node_modules/inner/index.d.ts (2 errors) ====
     // cjs format file
     import * as cjs from "inner/cjs";
     import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
     import * as type from "inner";
     cjs;
     ~~~
@@ -67,10 +80,12 @@ node_modules/inner/index.d.ts(5,1): error TS1036: Statements are not allowed in
     mjs;
     type;
     export const esm = true;
-==== node_modules/inner/index.d.cts (1 errors) ====
+==== node_modules/inner/index.d.cts (2 errors) ====
     // cjs format file
     import * as cjs from "inner/cjs";
     import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
     import * as type from "inner";
     cjs;
     ~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt.diff
index 2ea609ab1d..61beefb0d8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt.diff
@@ -2,13 +2,10 @@
 +++ new.nodeModulesDeclarationEmitWithPackageExports(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
- node_modules/inner/index.d.cts(5,1): error TS1036: Statements are not allowed in ambient contexts.
- node_modules/inner/index.d.mts(5,1): error TS1036: Statements are not allowed in ambient contexts.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+@@= skipped -8, +7 lines =@@
  node_modules/inner/index.d.ts(5,1): error TS1036: Statements are not allowed in ambient contexts.
  
  
@@ -16,52 +13,3 @@
  ==== index.ts (0 errors) ====
      // esm format file
      import * as cjs from "package/cjs";
-@@= skipped -37, +30 lines =@@
-     export const d = cjsi;
-     export const e = mjsi;
-     export const f = typei;
--==== index.cts (3 errors) ====
-+==== index.cts (0 errors) ====
-     // cjs format file
-     import * as cjs from "package/cjs";
-     import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
-     import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
-     export const a = cjs;
-     export const b = mjs;
-     export const c = type;
-     import * as cjsi from "inner/cjs";
-     import * as mjsi from "inner/mjs";
--                          ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
-     import * as typei from "inner";
-     export const d = cjsi;
-     export const e = mjsi;
-     export const f = typei;
--==== node_modules/inner/index.d.ts (2 errors) ====
-+==== node_modules/inner/index.d.ts (1 errors) ====
-     // cjs format file
-     import * as cjs from "inner/cjs";
-     import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
-     import * as type from "inner";
-     cjs;
-     ~~~
-@@= skipped -44, +36 lines =@@
-     mjs;
-     type;
-     export const esm = true;
--==== node_modules/inner/index.d.cts (2 errors) ====
-+==== node_modules/inner/index.d.cts (1 errors) ====
-     // cjs format file
-     import * as cjs from "inner/cjs";
-     import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
-     import * as type from "inner";
-     cjs;
-     ~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).errors.txt
index a80671672e..8300f6aaaa 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).errors.txt
@@ -1,7 +1,9 @@
-/main.cts(1,16): error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+/main.cts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+  If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
 /main.cts(2,16): error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
 /main.cts(5,16): error TS2307: Cannot find module 'exports-and-types-versions/versioned-nah' or its corresponding type declarations.
-/main.mts(1,16): error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+/main.mts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+  There are types at '/node_modules/exports-and-types-versions/types/foo.d.ts', but this result could not be resolved when respecting package.json "exports". The 'exports-and-types-versions' library may need to update its package.json or typings.
 /main.mts(2,16): error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
 /main.mts(5,16): error TS2307: Cannot find module 'exports-and-types-versions/versioned-nah' or its corresponding type declarations.
 
@@ -55,7 +57,8 @@
 ==== /main.cts (3 errors) ====
     import {} from "exports-and-types-versions/foo";
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+!!! error TS7016:   If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
     import {} from "exports-and-types-versions/nope";
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
@@ -69,7 +72,8 @@
 ==== /main.mts (3 errors) ====
     import {} from "exports-and-types-versions/foo";
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+!!! error TS7016:   There are types at '/node_modules/exports-and-types-versions/types/foo.d.ts', but this result could not be resolved when respecting package.json "exports". The 'exports-and-types-versions' library may need to update its package.json or typings.
     import {} from "exports-and-types-versions/nope";
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).errors.txt.diff
index 5b4a14917b..9c6ea3378f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=node16).errors.txt.diff
@@ -4,15 +4,10 @@
 -error TS6504: File '/node_modules/exports-and-types-versions/dist/foo.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -  The file is in the program because:
 -    Root file specified for compilation
--/main.cts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
--  If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
-+/main.cts(1,16): error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+ /main.cts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+   If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
  /main.cts(2,16): error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
- /main.cts(5,16): error TS2307: Cannot find module 'exports-and-types-versions/versioned-nah' or its corresponding type declarations.
--/main.mts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
--  There are types at '/node_modules/exports-and-types-versions/types/foo.d.ts', but this result could not be resolved when respecting package.json "exports". The 'exports-and-types-versions' library may need to update its package.json or typings.
-+/main.mts(1,16): error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
- /main.mts(2,16): error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
+@@= skipped -10, +7 lines =@@
  /main.mts(5,16): error TS2307: Cannot find module 'exports-and-types-versions/versioned-nah' or its corresponding type declarations.
  
  
@@ -22,23 +17,3 @@
  ==== /node_modules/exports-and-types-versions/package.json (0 errors) ====
      {
        "name": "exports-and-types-versions",
-@@= skipped -62, +54 lines =@@
- ==== /main.cts (3 errors) ====
-     import {} from "exports-and-types-versions/foo";
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
--!!! error TS7016:   If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
-+!!! error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
-     import {} from "exports-and-types-versions/nope";
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
-@@= skipped -15, +14 lines =@@
- ==== /main.mts (3 errors) ====
-     import {} from "exports-and-types-versions/foo";
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
--!!! error TS7016:   There are types at '/node_modules/exports-and-types-versions/types/foo.d.ts', but this result could not be resolved when respecting package.json "exports". The 'exports-and-types-versions' library may need to update its package.json or typings.
-+!!! error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
-     import {} from "exports-and-types-versions/nope";
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).errors.txt
index a80671672e..8300f6aaaa 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).errors.txt
@@ -1,7 +1,9 @@
-/main.cts(1,16): error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+/main.cts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+  If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
 /main.cts(2,16): error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
 /main.cts(5,16): error TS2307: Cannot find module 'exports-and-types-versions/versioned-nah' or its corresponding type declarations.
-/main.mts(1,16): error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+/main.mts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+  There are types at '/node_modules/exports-and-types-versions/types/foo.d.ts', but this result could not be resolved when respecting package.json "exports". The 'exports-and-types-versions' library may need to update its package.json or typings.
 /main.mts(2,16): error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
 /main.mts(5,16): error TS2307: Cannot find module 'exports-and-types-versions/versioned-nah' or its corresponding type declarations.
 
@@ -55,7 +57,8 @@
 ==== /main.cts (3 errors) ====
     import {} from "exports-and-types-versions/foo";
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+!!! error TS7016:   If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
     import {} from "exports-and-types-versions/nope";
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
@@ -69,7 +72,8 @@
 ==== /main.mts (3 errors) ====
     import {} from "exports-and-types-versions/foo";
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+!!! error TS7016:   There are types at '/node_modules/exports-and-types-versions/types/foo.d.ts', but this result could not be resolved when respecting package.json "exports". The 'exports-and-types-versions' library may need to update its package.json or typings.
     import {} from "exports-and-types-versions/nope";
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).errors.txt.diff
index 8f655ed794..9352f6674a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsBlocksTypesVersions(module=nodenext).errors.txt.diff
@@ -4,15 +4,10 @@
 -error TS6504: File '/node_modules/exports-and-types-versions/dist/foo.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -  The file is in the program because:
 -    Root file specified for compilation
--/main.cts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
--  If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
-+/main.cts(1,16): error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
+ /main.cts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
+   If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
  /main.cts(2,16): error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
- /main.cts(5,16): error TS2307: Cannot find module 'exports-and-types-versions/versioned-nah' or its corresponding type declarations.
--/main.mts(1,16): error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
--  There are types at '/node_modules/exports-and-types-versions/types/foo.d.ts', but this result could not be resolved when respecting package.json "exports". The 'exports-and-types-versions' library may need to update its package.json or typings.
-+/main.mts(1,16): error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
- /main.mts(2,16): error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
+@@= skipped -10, +7 lines =@@
  /main.mts(5,16): error TS2307: Cannot find module 'exports-and-types-versions/versioned-nah' or its corresponding type declarations.
  
  
@@ -22,23 +17,3 @@
  ==== /node_modules/exports-and-types-versions/package.json (0 errors) ====
      {
        "name": "exports-and-types-versions",
-@@= skipped -62, +54 lines =@@
- ==== /main.cts (3 errors) ====
-     import {} from "exports-and-types-versions/foo";
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
--!!! error TS7016:   If the 'exports-and-types-versions' package actually exposes this module, try adding a new declaration (.d.ts) file containing `declare module 'exports-and-types-versions/foo';`
-+!!! error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
-     import {} from "exports-and-types-versions/nope";
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
-@@= skipped -15, +14 lines =@@
- ==== /main.mts (3 errors) ====
-     import {} from "exports-and-types-versions/foo";
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module 'exports-and-types-versions/foo'. '/node_modules/exports-and-types-versions/dist/foo.js' implicitly has an 'any' type.
--!!! error TS7016:   There are types at '/node_modules/exports-and-types-versions/types/foo.d.ts', but this result could not be resolved when respecting package.json "exports". The 'exports-and-types-versions' library may need to update its package.json or typings.
-+!!! error TS2307: Cannot find module 'exports-and-types-versions/foo' or its corresponding type declarations.
-     import {} from "exports-and-types-versions/nope";
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2307: Cannot find module 'exports-and-types-versions/nope' or its corresponding type declarations.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=node16).js
index e57d5578ac..d5cc1daf78 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=node16).js
@@ -85,9 +85,12 @@ exports.x = x;
 const x = () => (void 0);
 export { x };
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
 // cjs format file
 const x = () => (void 0);
-export { x };
+exports.x = x;
 //// [index.cjs]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=node16).js.diff
index bd98d40356..84c81a67dc 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=node16).js.diff
@@ -1,20 +1,6 @@
 --- old.nodeModulesForbidenSyntax(module=node16).js
 +++ new.nodeModulesForbidenSyntax(module=node16).js
-@@= skipped -84, +84 lines =@@
- const x = () => (void 0);
- export { x };
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.x = void 0;
- // cjs format file
- const x = () => (void 0);
--exports.x = x;
-+export { x };
- //// [index.cjs]
- "use strict";
- Object.defineProperty(exports, "__esModule", { value: true });
-@@= skipped -47, +44 lines =@@
+@@= skipped -131, +131 lines =@@
  // esm format file
  const x = () => (void 0);
  export { x };
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=nodenext).js
index e57d5578ac..d5cc1daf78 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=nodenext).js
@@ -85,9 +85,12 @@ exports.x = x;
 const x = () => (void 0);
 export { x };
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
 // cjs format file
 const x = () => (void 0);
-export { x };
+exports.x = x;
 //// [index.cjs]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=nodenext).js.diff
index fc6b027e51..d8d7273850 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesForbidenSyntax(module=nodenext).js.diff
@@ -1,20 +1,6 @@
 --- old.nodeModulesForbidenSyntax(module=nodenext).js
 +++ new.nodeModulesForbidenSyntax(module=nodenext).js
-@@= skipped -84, +84 lines =@@
- const x = () => (void 0);
- export { x };
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.x = void 0;
- // cjs format file
- const x = () => (void 0);
--exports.x = x;
-+export { x };
- //// [index.cjs]
- "use strict";
- Object.defineProperty(exports, "__esModule", { value: true });
-@@= skipped -47, +44 lines =@@
+@@= skipped -131, +131 lines =@@
  // esm format file
  const x = () => (void 0);
  export { x };
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
index 1c386b92bd..7f362030f6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
@@ -1,17 +1,13 @@
-/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 /index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 
 
-==== /index.ts (7 errors) ====
+==== /index.ts (5 errors) ====
     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
     
@@ -31,8 +27,6 @@
     
     export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt.diff
index 5c4a6caf28..c7da271c46 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt.diff
@@ -1,24 +1,20 @@
 --- old.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
 +++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 -/index.ts(7,14): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
 +/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(7,49): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  
  
 -==== /index.ts (3 errors) ====
-+==== /index.ts (7 errors) ====
++==== /index.ts (5 errors) ====
      import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
      import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
-     export interface LocalInterface extends RequireInterface, ImportInterface {}
+@@= skipped -10, +12 lines =@@
      
      import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -35,10 +31,3 @@
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      export interface Loc extends Req, Imp {}
      
-     export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
-     export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js
index 8fb2e745a3..b0648485e3 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js
@@ -28,4 +28,5 @@ export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
 
 
 //// [index.js]
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js.diff
index 6420e8fcf9..45d20ae87c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js.diff
@@ -1,11 +1,9 @@
 --- old.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js
 +++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).js
-@@= skipped -27, +27 lines =@@
- 
- 
+@@= skipped -29, +29 lines =@@
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
 -
 -
 -//// [index.d.ts]
@@ -19,4 +17,3 @@
 -}
 -export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
 -export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols
index 0a1e523577..b2c93c67d5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols
@@ -30,6 +30,10 @@ export type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols.diff
deleted file mode 100644
index cacc0f62c3..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols
-+++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).symbols
-@@= skipped -29, +29 lines =@@
- export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types
index 26bf48ea1d..cd1d81407b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types
@@ -5,7 +5,7 @@ import type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 >RequireInterface : RequireInterface
 
 import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
 
 export interface LocalInterface extends RequireInterface, ImportInterface {}
 
@@ -23,8 +23,11 @@ export type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 >RequireInterface : RequireInterface
 
 export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
+
+=== /node_modules/pkg/import.d.ts ===
 
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types.diff
deleted file mode 100644
index 82185cc38d..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types
-+++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).types
-@@= skipped -4, +4 lines =@@
- >RequireInterface : RequireInterface
- 
- import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
- export interface LocalInterface extends RequireInterface, ImportInterface {}
- 
-@@= skipped -18, +18 lines =@@
- >RequireInterface : RequireInterface
- 
- export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
index a6261801f1..6747c1b291 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
@@ -1,17 +1,13 @@
-/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
 /index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 
 
-==== /index.ts (7 errors) ====
+==== /index.ts (5 errors) ====
     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
     
@@ -31,8 +27,6 @@
     
     export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt.diff
index 242c3dd9b0..5c4ff08b57 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt.diff
@@ -1,24 +1,20 @@
 --- old.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
 +++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
 -/index.ts(7,14): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
 +/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(7,49): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  
  
 -==== /index.ts (3 errors) ====
-+==== /index.ts (7 errors) ====
++==== /index.ts (5 errors) ====
      import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
      import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
-     export interface LocalInterface extends RequireInterface, ImportInterface {}
+@@= skipped -10, +12 lines =@@
      
      import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -35,10 +31,3 @@
  !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
      export interface Loc extends Req, Imp {}
      
-     export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
-     export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js
index 8fb2e745a3..b0648485e3 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js
@@ -28,4 +28,5 @@ export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
 
 
 //// [index.js]
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js.diff
index 6d644ad43e..217d90b8f9 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js.diff
@@ -1,11 +1,9 @@
 --- old.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js
 +++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).js
-@@= skipped -27, +27 lines =@@
- 
- 
+@@= skipped -29, +29 lines =@@
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
 -
 -
 -//// [index.d.ts]
@@ -19,4 +17,3 @@
 -}
 -export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
 -export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols
index 0a1e523577..b2c93c67d5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols
@@ -30,6 +30,10 @@ export type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols.diff
deleted file mode 100644
index e351f4fb9e..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols
-+++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).symbols
-@@= skipped -29, +29 lines =@@
- export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types
index 26bf48ea1d..cd1d81407b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types
@@ -5,7 +5,7 @@ import type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 >RequireInterface : RequireInterface
 
 import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
 
 export interface LocalInterface extends RequireInterface, ImportInterface {}
 
@@ -23,8 +23,11 @@ export type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 >RequireInterface : RequireInterface
 
 export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
+
+=== /node_modules/pkg/import.d.ts ===
 
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types.diff
deleted file mode 100644
index e5ac61e70a..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types
-+++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).types
-@@= skipped -4, +4 lines =@@
- >RequireInterface : RequireInterface
- 
- import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
- export interface LocalInterface extends RequireInterface, ImportInterface {}
- 
-@@= skipped -18, +18 lines =@@
- >RequireInterface : RequireInterface
- 
- export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt
index 8f8edb0e89..37f5d4c764 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt
@@ -1,28 +1,24 @@
-/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
 /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 
 
-==== /index.ts (7 errors) ====
+==== /index.ts (5 errors) ====
     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
     
     import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
+                 ~~~~~~~~~~~~~~~~
+!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1454: `resolution-mode` can only be set for type-only imports.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
-                 ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1454: `resolution-mode` can only be set for type-only imports.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -31,8 +27,6 @@
     
     export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt.diff
index 7eeb20c5f0..0afc00b727 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt.diff
@@ -2,44 +2,32 @@
 +++ new.nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -/index.ts(6,14): error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
 +/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(7,49): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  
  
 -==== /index.ts (3 errors) ====
-+==== /index.ts (7 errors) ====
++==== /index.ts (5 errors) ====
      import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
      import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
-     export interface LocalInterface extends RequireInterface, ImportInterface {}
+@@= skipped -10, +12 lines =@@
      
      import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
--                 ~~~~~~~~~~~~~~~~
+                  ~~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
++!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +!!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
-+                 ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +!!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      export interface Loc extends Req, Imp {}
      
-     export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
-     export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols
index e338ca7c68..d76777ff60 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols
@@ -13,10 +13,10 @@ export interface LocalInterface extends RequireInterface, ImportInterface {}
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 1, 13))
 
 import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
->RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 >Req : Symbol(Req, Decl(index.ts, 5, 8))
 
 import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 >Imp : Symbol(Imp, Decl(index.ts, 6, 8))
 
 export interface Loc extends Req, Imp {}
@@ -30,6 +30,10 @@ export type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols.diff
deleted file mode 100644
index dd3f751117..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols
-+++ new.nodeModulesImportAttributesModeDeclarationEmit2(module=node16).symbols
-@@= skipped -12, +12 lines =@@
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 1, 13))
- 
- import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
-+>RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- >Req : Symbol(Req, Decl(index.ts, 5, 8))
- 
- import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- >Imp : Symbol(Imp, Decl(index.ts, 6, 8))
- 
- export interface Loc extends Req, Imp {}
-@@= skipped -17, +17 lines =@@
- export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types
index f5ae09a9cc..5981886e84 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types
@@ -5,7 +5,7 @@ import type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 >RequireInterface : RequireInterface
 
 import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
 
 export interface LocalInterface extends RequireInterface, ImportInterface {}
 
@@ -23,8 +23,11 @@ export type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 >RequireInterface : RequireInterface
 
 export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
+
+=== /node_modules/pkg/import.d.ts ===
 
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types.diff
deleted file mode 100644
index bfdb2aa935..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types
-+++ new.nodeModulesImportAttributesModeDeclarationEmit2(module=node16).types
-@@= skipped -4, +4 lines =@@
- >RequireInterface : RequireInterface
- 
- import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
- export interface LocalInterface extends RequireInterface, ImportInterface {}
- 
-@@= skipped -18, +18 lines =@@
- >RequireInterface : RequireInterface
- 
- export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt
index 56480455b3..8437ec6776 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt
@@ -1,28 +1,24 @@
-/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
 /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 
 
-==== /index.ts (7 errors) ====
+==== /index.ts (5 errors) ====
     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
     
     import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
+                 ~~~~~~~~~~~~~~~~
+!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1454: `resolution-mode` can only be set for type-only imports.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
     import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
-                 ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1454: `resolution-mode` can only be set for type-only imports.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -31,8 +27,6 @@
     
     export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt.diff
index e2670c0e5b..c591730fce 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt.diff
@@ -2,34 +2,29 @@
 +++ new.nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -/index.ts(6,14): error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
  /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 +/index.ts(6,50): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 +/index.ts(7,49): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  
  
 -==== /index.ts (3 errors) ====
-+==== /index.ts (7 errors) ====
++==== /index.ts (5 errors) ====
      import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
      import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
-     export interface LocalInterface extends RequireInterface, ImportInterface {}
+@@= skipped -10, +12 lines =@@
      
      import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
--                 ~~~~~~~~~~~~~~~~
+                  ~~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
++!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +!!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
      import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
-+                 ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -37,9 +32,3 @@
      export interface Loc extends Req, Imp {}
      
      export type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
-     export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols
index e338ca7c68..d76777ff60 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols
@@ -13,10 +13,10 @@ export interface LocalInterface extends RequireInterface, ImportInterface {}
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 1, 13))
 
 import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
->RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 >Req : Symbol(Req, Decl(index.ts, 5, 8))
 
 import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 >Imp : Symbol(Imp, Decl(index.ts, 6, 8))
 
 export interface Loc extends Req, Imp {}
@@ -30,6 +30,10 @@ export type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols.diff
deleted file mode 100644
index 77a0fbefd0..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols
-+++ new.nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).symbols
-@@= skipped -12, +12 lines =@@
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 1, 13))
- 
- import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
-+>RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- >Req : Symbol(Req, Decl(index.ts, 5, 8))
- 
- import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- >Imp : Symbol(Imp, Decl(index.ts, 6, 8))
- 
- export interface Loc extends Req, Imp {}
-@@= skipped -17, +17 lines =@@
- export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types
index f5ae09a9cc..5981886e84 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types
@@ -5,7 +5,7 @@ import type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 >RequireInterface : RequireInterface
 
 import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
 
 export interface LocalInterface extends RequireInterface, ImportInterface {}
 
@@ -23,8 +23,11 @@ export type { RequireInterface } from "pkg" with { "resolution-mode": "require"
 >RequireInterface : RequireInterface
 
 export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
+
+=== /node_modules/pkg/import.d.ts ===
 
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types.diff
deleted file mode 100644
index 3e1f2f9b5a..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types
-+++ new.nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).types
-@@= skipped -4, +4 lines =@@
- >RequireInterface : RequireInterface
- 
- import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
- export interface LocalInterface extends RequireInterface, ImportInterface {}
- 
-@@= skipped -18, +18 lines =@@
- >RequireInterface : RequireInterface
- 
- export type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js
index 7d16b41058..4c8b391371 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js
@@ -28,5 +28,7 @@ export interface LocalInterface extends RequireInterface, ImportInterface {}
 
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // not exclusively type-only
-import "pkg" with { "resolution-mode": "require" };
+require("pkg");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js.diff
index 43e27cb19a..f3cc985e89 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js.diff
@@ -1,11 +1,9 @@
 --- old.nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js
 +++ new.nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).js
-@@= skipped -27, +27 lines =@@
- 
- 
+@@= skipped -29, +29 lines =@@
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
 -
 -
 -//// [index.d.ts]
@@ -14,4 +12,4 @@
 -export interface LocalInterface extends RequireInterface, ImportInterface {
 -}
 +// not exclusively type-only
-+import "pkg" with { "resolution-mode": "require" };
++require("pkg");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js
index 7d16b41058..4c8b391371 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js
@@ -28,5 +28,7 @@ export interface LocalInterface extends RequireInterface, ImportInterface {}
 
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // not exclusively type-only
-import "pkg" with { "resolution-mode": "require" };
+require("pkg");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js.diff
index 58634813b9..b6f3301a27 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js.diff
@@ -1,11 +1,9 @@
 --- old.nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js
 +++ new.nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).js
-@@= skipped -27, +27 lines =@@
- 
- 
+@@= skipped -29, +29 lines =@@
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
 -
 -
 -//// [index.d.ts]
@@ -14,4 +12,4 @@
 -export interface LocalInterface extends RequireInterface, ImportInterface {
 -}
 +// not exclusively type-only
-+import "pkg" with { "resolution-mode": "require" };
++require("pkg");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
deleted file mode 100644
index 65d7adc334..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-
-
-==== /index.ts (2 errors) ====
-    export type LocalInterface =
-        & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
-        & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-                                                                 ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-    
-    export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
-    export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                            ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-    
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export interface ImportInterface {}
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export interface RequireInterface {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt.diff
deleted file mode 100644
index d023955668..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
-+++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+
-+
-+==== /index.ts (2 errors) ====
-+    export type LocalInterface =
-+        & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
-+        & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                 ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+    
-+    export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
-+    export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                            ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+    
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export interface ImportInterface {}
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
index 8a2ebf334d..23ed57fc2c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
@@ -23,5 +23,8 @@ export const b = (null as any as import("pkg", { with: {"resolution-mode": "impo
 
 
 //// [index.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js.diff
index 5184044f7e..64e4e44b00 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js.diff
@@ -1,19 +1,12 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
+@@= skipped -27, +27 lines =@@
+ exports.b = exports.a = void 0;
+ exports.a = null;
+ exports.b = null;
 -
 -
 -//// [index.d.ts]
 -export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-+export const a = null;
-+export const b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols
index e3b90277a9..1f0e1652f5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols
@@ -8,6 +8,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
 >a : Symbol(a, Decl(index.ts, 4, 12))
@@ -15,6 +16,11 @@ export const a = (null as any as import("pkg", { with: {"resolution-mode": "requ
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols.diff
deleted file mode 100644
index 723063bba7..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols
-+++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols
-@@= skipped -7, +7 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
index 0086cfb5f9..237a0cfdc9 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
@@ -2,7 +2,7 @@
 
 === /index.ts ===
 export type LocalInterface =
->LocalInterface : any
+>LocalInterface : LocalInterface
 
     & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
@@ -14,11 +14,14 @@ export const a = (null as any as import("pkg", { with: {"resolution-mode": "requ
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : any
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : any
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : any
+>b : ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
 >null as any : any
 
+=== /node_modules/pkg/import.d.ts ===
+
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
index c633d54143..ed328e07d8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
@@ -1,13 +1,6 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
-@@= skipped -1, +1 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
+@@= skipped -7, +7 lines =@@
      & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
@@ -23,14 +16,9 @@
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : any
-+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : any
-+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : any
++>b : ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
  >null as any : any
  
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
+ === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
deleted file mode 100644
index 65d7adc334..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-
-
-==== /index.ts (2 errors) ====
-    export type LocalInterface =
-        & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
-        & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-                                                                 ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-    
-    export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
-    export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                            ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-    
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export interface ImportInterface {}
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export interface RequireInterface {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt.diff
deleted file mode 100644
index 6c8ea4cd12..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
-+++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+
-+
-+==== /index.ts (2 errors) ====
-+    export type LocalInterface =
-+        & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
-+        & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                 ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+    
-+    export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
-+    export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                            ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+    
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export interface ImportInterface {}
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
index 8a2ebf334d..23ed57fc2c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
@@ -23,5 +23,8 @@ export const b = (null as any as import("pkg", { with: {"resolution-mode": "impo
 
 
 //// [index.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js.diff
index e74462939c..39b80f3c71 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js.diff
@@ -1,19 +1,12 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
+@@= skipped -27, +27 lines =@@
+ exports.b = exports.a = void 0;
+ exports.a = null;
+ exports.b = null;
 -
 -
 -//// [index.d.ts]
 -export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-+export const a = null;
-+export const b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols
index e3b90277a9..1f0e1652f5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols
@@ -8,6 +8,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
 >a : Symbol(a, Decl(index.ts, 4, 12))
@@ -15,6 +16,11 @@ export const a = (null as any as import("pkg", { with: {"resolution-mode": "requ
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols.diff
deleted file mode 100644
index 3dfbfa8a2b..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols
-+++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols
-@@= skipped -7, +7 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
index 0086cfb5f9..237a0cfdc9 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
@@ -2,7 +2,7 @@
 
 === /index.ts ===
 export type LocalInterface =
->LocalInterface : any
+>LocalInterface : LocalInterface
 
     & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
@@ -14,11 +14,14 @@ export const a = (null as any as import("pkg", { with: {"resolution-mode": "requ
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : any
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : any
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : any
+>b : ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
 >null as any : any
 
+=== /node_modules/pkg/import.d.ts ===
+
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
index 1571fd490c..320120cc1a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
@@ -1,13 +1,6 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
-@@= skipped -1, +1 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
+@@= skipped -7, +7 lines =@@
      & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
@@ -23,14 +16,9 @@
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : any
-+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : any
-+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : any
++>b : ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
  >null as any : any
  
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
+ === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
index b4bc7b2d24..2d2f2c5b8f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
@@ -1,7 +1,5 @@
 /index.ts(2,49): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(5,76): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(3,22): error TS1005: 'with' expected.
 /other.ts(3,39): error TS1005: ';' expected.
@@ -10,7 +8,7 @@
 /other.ts(3,52): error TS1128: Declaration or statement expected.
 /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
 /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(6,49): error TS1005: 'with' expected.
 /other.ts(6,66): error TS1005: ';' expected.
@@ -42,7 +40,7 @@
 /other3.ts(3,56): error TS1128: Declaration or statement expected.
 /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'.
 /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
-/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other3.ts(6,48): error TS1005: '{' expected.
 /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
@@ -58,7 +56,7 @@
 /other4.ts(6,32): error TS1128: Declaration or statement expected.
 /other4.ts(6,33): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
 /other4.ts(7,21): error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
-/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other4.ts(9,48): error TS1005: '{' expected.
 /other4.ts(9,58): error TS1005: ',' expected.
@@ -92,21 +90,17 @@
 ==== /node_modules/pkg/require.d.ts (0 errors) ====
     export interface RequireInterface {}
     
-==== /index.ts (4 errors) ====
+==== /index.ts (2 errors) ====
     export type LocalInterface =
         & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
                                                     ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
         & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-                                                                 ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
                                                                                ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                            ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /other.ts (27 errors) ====
     // missing with:
@@ -131,7 +125,7 @@
                          ~~~~~~~~~~~~~~~~~
 !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
                                                        ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
                                      ~~~~~~~~~~~~~~~
@@ -216,7 +210,7 @@
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
                                                            ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
                                      ~~~~~~~~~~~~~
@@ -266,7 +260,7 @@
 !!! error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
 !!! related TS2728 /other4.ts:10:48: 'Attribute2' is declared here.
                                     ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", Attribute1).RequireInterface);
                                      ~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt.diff
deleted file mode 100644
index d81e95134a..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
-+++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
-@@= skipped -0, +0 lines =@@
- /index.ts(2,49): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- /index.ts(5,76): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(3,22): error TS1005: 'with' expected.
- /other.ts(3,39): error TS1005: ';' expected.
-@@= skipped -7, +9 lines =@@
- /other.ts(3,52): error TS1128: Declaration or statement expected.
- /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
- /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
--/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(6,49): error TS1005: 'with' expected.
- /other.ts(6,66): error TS1005: ';' expected.
-@@= skipped -32, +32 lines =@@
- /other3.ts(3,56): error TS1128: Declaration or statement expected.
- /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'.
- /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
--/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other3.ts(6,48): error TS1005: '{' expected.
- /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
-@@= skipped -16, +16 lines =@@
- /other4.ts(6,32): error TS1128: Declaration or statement expected.
- /other4.ts(6,33): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
- /other4.ts(7,21): error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
--/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other4.ts(9,48): error TS1005: '{' expected.
- /other4.ts(9,58): error TS1005: ',' expected.
-@@= skipped -34, +34 lines =@@
- ==== /node_modules/pkg/require.d.ts (0 errors) ====
-     export interface RequireInterface {}
-     
--==== /index.ts (2 errors) ====
-+==== /index.ts (4 errors) ====
-     export type LocalInterface =
-         & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
-                                                     ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
-         & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                 ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
-     export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
-                                                                                ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
-     export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                            ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /other.ts (27 errors) ====
-     // missing with:
-@@= skipped -35, +39 lines =@@
-                          ~~~~~~~~~~~~~~~~~
- !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
-                                      ~~~~~~~~~~~~~~~
-@@= skipped -85, +85 lines =@@
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
-                                                            ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -50, +50 lines =@@
- !!! error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
- !!! related TS2728 /other4.ts:10:48: 'Attribute2' is declared here.
-                                     ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", Attribute1).RequireInterface);
-                                      ~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
index 111d421ae2..8c56196a45 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
@@ -71,37 +71,55 @@ export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
 export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
 
 //// [index.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
 //// [other.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 "resolution-mode";
 "require";
 RequireInterface
     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
-export const a = null;
+exports.a = null;
 "resolution-mode";
 "require";
 RequireInterface;
 ;
-export const b = null;
+exports.b = null;
 "resolution-mode";
 "import";
 ImportInterface;
 ;
 //// [other2.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
 //// [other3.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 RequireInterface
     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
-export const a = null.RequireInterface;
-export const b = null.ImportInterface;
+exports.a = null.RequireInterface;
+exports.b = null.ImportInterface;
 //// [other4.js]
-Attribute1;
-RequireInterface
-    & import("pkg", Attribute2).ImportInterface;
-export const a = null, Attribute1, RequireInterface;
-export const b = null, Attribute2, ImportInterface;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportInterface = exports.Attribute2 = exports.b = exports.RequireInterface = exports.Attribute1 = exports.a = void 0;
+exports.Attribute1;
+exports.RequireInterface
+    & import("pkg", exports.Attribute2).ImportInterface;
+exports.a = null;
+exports.b = null;
 //// [other5.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js.diff
index db82ffd63e..35c4f152d0 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js.diff
@@ -1,74 +1,9 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
-@@= skipped -70, +70 lines =@@
- export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Attribute2 = exports.b = exports.RequireInterface = exports.Attribute1 = exports.a = void 0;
--exports.Attribute1;
--exports.RequireInterface
--    & import("pkg", exports.Attribute2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Attribute1;
-+RequireInterface
-+    & import("pkg", Attribute2).ImportInterface;
-+export const a = null, Attribute1, RequireInterface;
-+export const b = null, Attribute2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
+@@= skipped -122, +122 lines =@@
+ exports.b = exports.a = void 0;
+ exports.a = null;
+ exports.b = null;
 -
 -
 -//// [index.d.ts]
@@ -97,5 +32,3 @@
 -export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: any;
-+export const a = null;
-+export const b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
index 038c67eb4c..68bfcacf41 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
@@ -16,6 +16,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
 >a : Symbol(a, Decl(index.ts, 4, 12))
@@ -23,6 +24,7 @@ export const a = (null as any as import("pkg", { with: {"resolution-mode": "foob
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 === /other.ts ===
 // missing with:
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
index 9b950ccc26..22d173466b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
@@ -1,22 +1,6 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- === /other.ts ===
- // missing with:
-@@= skipped -9, +8 lines =@@
+@@= skipped -32, +32 lines =@@
  
      & import("pkg", {"resolution-mode": "require"}).RequireInterface
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
index ff111beef1..f03658da11 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
@@ -10,7 +10,7 @@ export interface RequireInterface {}
 
 === /index.ts ===
 export type LocalInterface =
->LocalInterface : any
+>LocalInterface : LocalInterface
 
     & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
@@ -22,9 +22,9 @@ export const a = (null as any as import("pkg", { with: {"resolution-mode": "foob
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : any
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : any
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : any
+>b : ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -40,7 +40,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -97,7 +97,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -145,7 +145,7 @@ export type LocalInterface =
 
     & import("pkg", Attribute2).ImportInterface;
 >import("pkg", Attribute2).ImportInterface : any
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Attribute2 : any
 >ImportInterface : any
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
index a80e589bcd..6954c63c77 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
@@ -1,13 +1,6 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
-@@= skipped -9, +9 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
+@@= skipped -15, +15 lines =@@
      & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
@@ -23,22 +16,13 @@
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : any
-+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : any
-+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : any
++>b : ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
  >null as any : any
  
  === /other.ts ===
-@@= skipped -30, +30 lines =@@
- 
-     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
- >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
- >"resolution-mode" : string
-@@= skipped -34, +34 lines =@@
+@@= skipped -58, +58 lines =@@
      & import("pkg", { with: {"bad": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
@@ -51,25 +35,7 @@
  >null as any : any
  
  export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
-@@= skipped -23, +23 lines =@@
- 
-     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
- >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
-@@= skipped -48, +48 lines =@@
- 
-     & import("pkg", Attribute2).ImportInterface;
- >import("pkg", Attribute2).ImportInterface : any
-->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >Attribute2 : any
- >ImportInterface : any
-@@= skipped -29, +29 lines =@@
+@@= skipped -100, +100 lines =@@
      & import("pkg", { with: {} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
index bd05ca390b..1075b870f1 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
@@ -1,7 +1,5 @@
 /index.ts(2,49): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(5,76): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(3,22): error TS1005: 'with' expected.
 /other.ts(3,39): error TS1005: ';' expected.
@@ -10,7 +8,7 @@
 /other.ts(3,52): error TS1128: Declaration or statement expected.
 /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
 /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(6,49): error TS1005: 'with' expected.
 /other.ts(6,66): error TS1005: ';' expected.
@@ -45,7 +43,7 @@
   Types of property 'with' are incompatible.
     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
-/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other3.ts(6,48): error TS1005: '{' expected.
 /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
@@ -61,7 +59,7 @@
 /other4.ts(6,32): error TS1128: Declaration or statement expected.
 /other4.ts(6,33): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
 /other4.ts(7,21): error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
-/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other4.ts(9,48): error TS1005: '{' expected.
 /other4.ts(9,58): error TS1005: ',' expected.
@@ -95,21 +93,17 @@
 ==== /node_modules/pkg/require.d.ts (0 errors) ====
     export interface RequireInterface {}
     
-==== /index.ts (4 errors) ====
+==== /index.ts (2 errors) ====
     export type LocalInterface =
         & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
                                                     ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
         & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-                                                                 ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
                                                                                ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                            ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /other.ts (27 errors) ====
     // missing with:
@@ -134,7 +128,7 @@
                          ~~~~~~~~~~~~~~~~~
 !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
                                                        ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
                                      ~~~~~~~~~~~~~~~
@@ -222,7 +216,7 @@
 !!! error TS2322:     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
 !!! error TS2322:       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
                                                            ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
                                      ~~~~~~~~~~~~~
@@ -272,7 +266,7 @@
 !!! error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
 !!! related TS2728 /other4.ts:10:48: 'Attribute2' is declared here.
                                     ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", Attribute1).RequireInterface);
                                      ~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
deleted file mode 100644
index cbfdbb3626..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
-+++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
-@@= skipped -0, +0 lines =@@
- /index.ts(2,49): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- /index.ts(5,76): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(3,22): error TS1005: 'with' expected.
- /other.ts(3,39): error TS1005: ';' expected.
-@@= skipped -7, +9 lines =@@
- /other.ts(3,52): error TS1128: Declaration or statement expected.
- /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
- /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
--/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(6,49): error TS1005: 'with' expected.
- /other.ts(6,66): error TS1005: ';' expected.
-@@= skipped -35, +35 lines =@@
-   Types of property 'with' are incompatible.
-     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
-       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
--/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other3.ts(6,48): error TS1005: '{' expected.
- /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
-@@= skipped -16, +16 lines =@@
- /other4.ts(6,32): error TS1128: Declaration or statement expected.
- /other4.ts(6,33): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
- /other4.ts(7,21): error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
--/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other4.ts(9,48): error TS1005: '{' expected.
- /other4.ts(9,58): error TS1005: ',' expected.
-@@= skipped -34, +34 lines =@@
- ==== /node_modules/pkg/require.d.ts (0 errors) ====
-     export interface RequireInterface {}
-     
--==== /index.ts (2 errors) ====
-+==== /index.ts (4 errors) ====
-     export type LocalInterface =
-         & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
-                                                     ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
-         & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                 ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
-     export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
-                                                                                ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
-     export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                            ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /other.ts (27 errors) ====
-     // missing with:
-@@= skipped -35, +39 lines =@@
-                          ~~~~~~~~~~~~~~~~~
- !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
-                                      ~~~~~~~~~~~~~~~
-@@= skipped -88, +88 lines =@@
- !!! error TS2322:     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
- !!! error TS2322:       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
-                                                            ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -50, +50 lines =@@
- !!! error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
- !!! related TS2728 /other4.ts:10:48: 'Attribute2' is declared here.
-                                     ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", Attribute1).RequireInterface);
-                                      ~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
index 111d421ae2..8c56196a45 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
@@ -71,37 +71,55 @@ export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
 export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
 
 //// [index.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
 //// [other.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 "resolution-mode";
 "require";
 RequireInterface
     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
-export const a = null;
+exports.a = null;
 "resolution-mode";
 "require";
 RequireInterface;
 ;
-export const b = null;
+exports.b = null;
 "resolution-mode";
 "import";
 ImportInterface;
 ;
 //// [other2.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
 //// [other3.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 RequireInterface
     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
-export const a = null.RequireInterface;
-export const b = null.ImportInterface;
+exports.a = null.RequireInterface;
+exports.b = null.ImportInterface;
 //// [other4.js]
-Attribute1;
-RequireInterface
-    & import("pkg", Attribute2).ImportInterface;
-export const a = null, Attribute1, RequireInterface;
-export const b = null, Attribute2, ImportInterface;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportInterface = exports.Attribute2 = exports.b = exports.RequireInterface = exports.Attribute1 = exports.a = void 0;
+exports.Attribute1;
+exports.RequireInterface
+    & import("pkg", exports.Attribute2).ImportInterface;
+exports.a = null;
+exports.b = null;
 //// [other5.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js.diff
index 1f545a505d..9222a385a6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js.diff
@@ -1,74 +1,9 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
-@@= skipped -70, +70 lines =@@
- export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Attribute2 = exports.b = exports.RequireInterface = exports.Attribute1 = exports.a = void 0;
--exports.Attribute1;
--exports.RequireInterface
--    & import("pkg", exports.Attribute2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Attribute1;
-+RequireInterface
-+    & import("pkg", Attribute2).ImportInterface;
-+export const a = null, Attribute1, RequireInterface;
-+export const b = null, Attribute2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
+@@= skipped -122, +122 lines =@@
+ exports.b = exports.a = void 0;
+ exports.a = null;
+ exports.b = null;
 -
 -
 -//// [index.d.ts]
@@ -97,5 +32,3 @@
 -export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: any;
-+export const a = null;
-+export const b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
index 038c67eb4c..68bfcacf41 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
@@ -16,6 +16,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
 >a : Symbol(a, Decl(index.ts, 4, 12))
@@ -23,6 +24,7 @@ export const a = (null as any as import("pkg", { with: {"resolution-mode": "foob
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 === /other.ts ===
 // missing with:
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
index 27f2ddb16e..3514574618 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
@@ -1,22 +1,6 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- === /other.ts ===
- // missing with:
-@@= skipped -9, +8 lines =@@
+@@= skipped -32, +32 lines =@@
  
      & import("pkg", {"resolution-mode": "require"}).RequireInterface
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
index ff111beef1..f03658da11 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
@@ -10,7 +10,7 @@ export interface RequireInterface {}
 
 === /index.ts ===
 export type LocalInterface =
->LocalInterface : any
+>LocalInterface : LocalInterface
 
     & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
@@ -22,9 +22,9 @@ export const a = (null as any as import("pkg", { with: {"resolution-mode": "foob
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : any
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : any
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : any
+>b : ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -40,7 +40,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -97,7 +97,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -145,7 +145,7 @@ export type LocalInterface =
 
     & import("pkg", Attribute2).ImportInterface;
 >import("pkg", Attribute2).ImportInterface : any
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Attribute2 : any
 >ImportInterface : any
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
index be1f4702e7..9b80ae3813 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
@@ -1,13 +1,6 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
-@@= skipped -9, +9 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
+@@= skipped -15, +15 lines =@@
      & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
@@ -23,22 +16,13 @@
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : any
-+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : any
-+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : any
++>b : ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
  >null as any : any
  
  === /other.ts ===
-@@= skipped -30, +30 lines =@@
- 
-     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
- >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
- >"resolution-mode" : string
-@@= skipped -34, +34 lines =@@
+@@= skipped -58, +58 lines =@@
      & import("pkg", { with: {"bad": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
@@ -51,25 +35,7 @@
  >null as any : any
  
  export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
-@@= skipped -23, +23 lines =@@
- 
-     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
- >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
-@@= skipped -48, +48 lines =@@
- 
-     & import("pkg", Attribute2).ImportInterface;
- >import("pkg", Attribute2).ImportInterface : any
-->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >Attribute2 : any
- >ImportInterface : any
-@@= skipped -29, +29 lines =@@
+@@= skipped -100, +100 lines =@@
      & import("pkg", { with: {} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
index ecb24d8ecb..696905d303 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
@@ -1,17 +1,13 @@
-/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 /index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 
 
-==== /index.ts (7 errors) ====
+==== /index.ts (5 errors) ====
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
     
@@ -31,8 +27,6 @@
     
     export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt.diff
index dd5f81117d..167df7cb55 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt.diff
@@ -1,24 +1,20 @@
 --- old.nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
 +++ new.nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 -/index.ts(7,14): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
 +/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(7,49): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  
  
 -==== /index.ts (3 errors) ====
-+==== /index.ts (7 errors) ====
++==== /index.ts (5 errors) ====
      import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
      import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
-     export interface LocalInterface extends RequireInterface, ImportInterface {}
+@@= skipped -10, +12 lines =@@
      
      import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -35,10 +31,3 @@
  !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      export interface Loc extends Req, Imp {}
      
-     export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
-     export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).js
index 917f148c91..e24fd94dba 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).js
@@ -28,4 +28,5 @@ export type { ImportInterface } from "pkg" assert { "resolution-mode": "import"
 
 
 //// [index.js]
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).js.diff
index 065990685b..a91c3f6d63 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).js.diff
@@ -1,11 +1,9 @@
 --- old.nodeModulesImportModeDeclarationEmit1(module=node16).js
 +++ new.nodeModulesImportModeDeclarationEmit1(module=node16).js
-@@= skipped -27, +27 lines =@@
- 
- 
+@@= skipped -29, +29 lines =@@
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
 -
 -
 -//// [index.d.ts]
@@ -19,4 +17,3 @@
 -}
 -export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
 -export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).symbols
index ae0208dd6d..97a76656c4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).symbols
@@ -30,6 +30,10 @@ export type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).symbols.diff
deleted file mode 100644
index 01d3c015e5..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).symbols.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.nodeModulesImportModeDeclarationEmit1(module=node16).symbols
-+++ new.nodeModulesImportModeDeclarationEmit1(module=node16).symbols
-@@= skipped -29, +29 lines =@@
- export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).types
index c98a583801..286cacdc83 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).types
@@ -5,7 +5,7 @@ import type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 >RequireInterface : RequireInterface
 
 import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
 
 export interface LocalInterface extends RequireInterface, ImportInterface {}
 
@@ -23,8 +23,11 @@ export type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 >RequireInterface : RequireInterface
 
 export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
+
+=== /node_modules/pkg/import.d.ts ===
 
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).types.diff
deleted file mode 100644
index ab44cf76c1..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesImportModeDeclarationEmit1(module=node16).types
-+++ new.nodeModulesImportModeDeclarationEmit1(module=node16).types
-@@= skipped -4, +4 lines =@@
- >RequireInterface : RequireInterface
- 
- import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
- export interface LocalInterface extends RequireInterface, ImportInterface {}
- 
-@@= skipped -18, +18 lines =@@
- >RequireInterface : RequireInterface
- 
- export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
index 2e250539a4..90ef0c9bb9 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
@@ -1,17 +1,13 @@
-/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 /index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 
 
-==== /index.ts (7 errors) ====
+==== /index.ts (5 errors) ====
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
     
@@ -31,8 +27,6 @@
     
     export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt.diff
index 79aa385251..72e77cc4db 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt.diff
@@ -1,24 +1,20 @@
 --- old.nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
 +++ new.nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 -/index.ts(7,14): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
 +/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(7,49): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  
  
 -==== /index.ts (3 errors) ====
-+==== /index.ts (7 errors) ====
++==== /index.ts (5 errors) ====
      import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
      import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
-     export interface LocalInterface extends RequireInterface, ImportInterface {}
+@@= skipped -10, +12 lines =@@
      
      import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -35,10 +31,3 @@
  !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
      export interface Loc extends Req, Imp {}
      
-     export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
-     export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).js
index 917f148c91..e24fd94dba 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).js
@@ -28,4 +28,5 @@ export type { ImportInterface } from "pkg" assert { "resolution-mode": "import"
 
 
 //// [index.js]
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).js.diff
index 17becbd7db..9e3f2137be 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).js.diff
@@ -1,11 +1,9 @@
 --- old.nodeModulesImportModeDeclarationEmit1(module=nodenext).js
 +++ new.nodeModulesImportModeDeclarationEmit1(module=nodenext).js
-@@= skipped -27, +27 lines =@@
- 
- 
+@@= skipped -29, +29 lines =@@
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
 -
 -
 -//// [index.d.ts]
@@ -19,4 +17,3 @@
 -}
 -export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
 -export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols
index ae0208dd6d..97a76656c4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols
@@ -30,6 +30,10 @@ export type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols.diff
deleted file mode 100644
index 9edbda66e6..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- old.nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols
-+++ new.nodeModulesImportModeDeclarationEmit1(module=nodenext).symbols
-@@= skipped -29, +29 lines =@@
- export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).types
index c98a583801..286cacdc83 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).types
@@ -5,7 +5,7 @@ import type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 >RequireInterface : RequireInterface
 
 import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
 
 export interface LocalInterface extends RequireInterface, ImportInterface {}
 
@@ -23,8 +23,11 @@ export type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 >RequireInterface : RequireInterface
 
 export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
+
+=== /node_modules/pkg/import.d.ts ===
 
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).types.diff
deleted file mode 100644
index f18f43e7f4..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesImportModeDeclarationEmit1(module=nodenext).types
-+++ new.nodeModulesImportModeDeclarationEmit1(module=nodenext).types
-@@= skipped -4, +4 lines =@@
- >RequireInterface : RequireInterface
- 
- import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
- export interface LocalInterface extends RequireInterface, ImportInterface {}
- 
-@@= skipped -18, +18 lines =@@
- >RequireInterface : RequireInterface
- 
- export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt
index f043d32055..5ae57bd7b6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt
@@ -1,28 +1,24 @@
-/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
 /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 
 
-==== /index.ts (7 errors) ====
+==== /index.ts (5 errors) ====
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
     
     import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
+                 ~~~~~~~~~~~~~~~~
+!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1454: `resolution-mode` can only be set for type-only imports.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
-                 ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1454: `resolution-mode` can only be set for type-only imports.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -31,8 +27,6 @@
     
     export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt.diff
index fd726b4cac..0826326e8e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt.diff
@@ -2,44 +2,32 @@
 +++ new.nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -/index.ts(6,14): error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
 +/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(7,49): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  
  
 -==== /index.ts (3 errors) ====
-+==== /index.ts (7 errors) ====
++==== /index.ts (5 errors) ====
      import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
      import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
-     export interface LocalInterface extends RequireInterface, ImportInterface {}
+@@= skipped -10, +12 lines =@@
      
      import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
--                 ~~~~~~~~~~~~~~~~
+                  ~~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
++!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +!!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
-+                 ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +!!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      export interface Loc extends Req, Imp {}
      
-     export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
-     export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).symbols
index 7e5d391304..8d280aee6f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).symbols
@@ -13,10 +13,10 @@ export interface LocalInterface extends RequireInterface, ImportInterface {}
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 1, 13))
 
 import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
->RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 >Req : Symbol(Req, Decl(index.ts, 5, 8))
 
 import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 >Imp : Symbol(Imp, Decl(index.ts, 6, 8))
 
 export interface Loc extends Req, Imp {}
@@ -30,6 +30,10 @@ export type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).symbols.diff
deleted file mode 100644
index f0c0e9b596..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).symbols.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.nodeModulesImportModeDeclarationEmit2(module=node16).symbols
-+++ new.nodeModulesImportModeDeclarationEmit2(module=node16).symbols
-@@= skipped -12, +12 lines =@@
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 1, 13))
- 
- import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
-+>RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- >Req : Symbol(Req, Decl(index.ts, 5, 8))
- 
- import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- >Imp : Symbol(Imp, Decl(index.ts, 6, 8))
- 
- export interface Loc extends Req, Imp {}
-@@= skipped -17, +17 lines =@@
- export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).types
index aff112d86d..aac55ee93c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).types
@@ -5,7 +5,7 @@ import type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 >RequireInterface : RequireInterface
 
 import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
 
 export interface LocalInterface extends RequireInterface, ImportInterface {}
 
@@ -23,8 +23,11 @@ export type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 >RequireInterface : RequireInterface
 
 export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
+
+=== /node_modules/pkg/import.d.ts ===
 
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).types.diff
deleted file mode 100644
index a4318aed6c..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesImportModeDeclarationEmit2(module=node16).types
-+++ new.nodeModulesImportModeDeclarationEmit2(module=node16).types
-@@= skipped -4, +4 lines =@@
- >RequireInterface : RequireInterface
- 
- import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
- export interface LocalInterface extends RequireInterface, ImportInterface {}
- 
-@@= skipped -18, +18 lines =@@
- >RequireInterface : RequireInterface
- 
- export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt
index 5ce50a8e21..d7ce0d7f94 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt
@@ -1,28 +1,24 @@
-/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
 /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 
 
-==== /index.ts (7 errors) ====
+==== /index.ts (5 errors) ====
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
     
     import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
+                 ~~~~~~~~~~~~~~~~
+!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1454: `resolution-mode` can only be set for type-only imports.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
     import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
-                 ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1454: `resolution-mode` can only be set for type-only imports.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -31,8 +27,6 @@
     
     export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt.diff
index 6bc6dc8bc2..7bc8b9b0ac 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt.diff
@@ -2,34 +2,29 @@
 +++ new.nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -/index.ts(6,14): error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+/index.ts(2,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
  /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 +/index.ts(6,50): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 +/index.ts(7,49): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(11,15): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
  
  
 -==== /index.ts (3 errors) ====
-+==== /index.ts (7 errors) ====
++==== /index.ts (5 errors) ====
      import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
      import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
-     export interface LocalInterface extends RequireInterface, ImportInterface {}
+@@= skipped -10, +12 lines =@@
      
      import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
--                 ~~~~~~~~~~~~~~~~
+                  ~~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
++!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +!!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
      import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
-+                 ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -37,9 +32,3 @@
      export interface Loc extends Req, Imp {}
      
      export type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
-     export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-+                  ~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols
index 7e5d391304..8d280aee6f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols
@@ -13,10 +13,10 @@ export interface LocalInterface extends RequireInterface, ImportInterface {}
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 1, 13))
 
 import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
->RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 >Req : Symbol(Req, Decl(index.ts, 5, 8))
 
 import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 >Imp : Symbol(Imp, Decl(index.ts, 6, 8))
 
 export interface Loc extends Req, Imp {}
@@ -30,6 +30,10 @@ export type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
 >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
 
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols.diff
deleted file mode 100644
index 034ccec3e6..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols
-+++ new.nodeModulesImportModeDeclarationEmit2(module=nodenext).symbols
-@@= skipped -12, +12 lines =@@
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 1, 13))
- 
- import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
-+>RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- >Req : Symbol(Req, Decl(index.ts, 5, 8))
- 
- import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- >Imp : Symbol(Imp, Decl(index.ts, 6, 8))
- 
- export interface Loc extends Req, Imp {}
-@@= skipped -17, +17 lines =@@
- export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
- >ImportInterface : Symbol(ImportInterface, Decl(index.ts, 10, 13))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).types
index aff112d86d..aac55ee93c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).types
@@ -5,7 +5,7 @@ import type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 >RequireInterface : RequireInterface
 
 import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
 
 export interface LocalInterface extends RequireInterface, ImportInterface {}
 
@@ -23,8 +23,11 @@ export type { RequireInterface } from "pkg" assert { "resolution-mode": "require
 >RequireInterface : RequireInterface
 
 export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
->ImportInterface : any
+>ImportInterface : ImportInterface
+
+=== /node_modules/pkg/import.d.ts ===
 
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).types.diff
deleted file mode 100644
index 4558738aa6..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesImportModeDeclarationEmit2(module=nodenext).types
-+++ new.nodeModulesImportModeDeclarationEmit2(module=nodenext).types
-@@= skipped -4, +4 lines =@@
- >RequireInterface : RequireInterface
- 
- import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
- export interface LocalInterface extends RequireInterface, ImportInterface {}
- 
-@@= skipped -18, +18 lines =@@
- >RequireInterface : RequireInterface
- 
- export type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-->ImportInterface : ImportInterface
-+>ImportInterface : any
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).js
index db9339d50f..7cb2a3986a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).js
@@ -28,5 +28,7 @@ export interface LocalInterface extends RequireInterface, ImportInterface {}
 
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // not exclusively type-only
-import "pkg" assert { "resolution-mode": "require" };
+require("pkg");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).js.diff
index edc61fd0d3..4ae094e698 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).js.diff
@@ -1,11 +1,9 @@
 --- old.nodeModulesImportModeDeclarationEmitErrors1(module=node16).js
 +++ new.nodeModulesImportModeDeclarationEmitErrors1(module=node16).js
-@@= skipped -27, +27 lines =@@
- 
- 
+@@= skipped -29, +29 lines =@@
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
 -
 -
 -//// [index.d.ts]
@@ -14,4 +12,4 @@
 -export interface LocalInterface extends RequireInterface, ImportInterface {
 -}
 +// not exclusively type-only
-+import "pkg" assert { "resolution-mode": "require" };
++require("pkg");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js
index db9339d50f..7cb2a3986a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js
@@ -28,5 +28,7 @@ export interface LocalInterface extends RequireInterface, ImportInterface {}
 
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // not exclusively type-only
-import "pkg" assert { "resolution-mode": "require" };
+require("pkg");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js.diff
index 0d88b70eb7..47e5dfa0d1 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js.diff
@@ -1,11 +1,9 @@
 --- old.nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js
 +++ new.nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).js
-@@= skipped -27, +27 lines =@@
- 
- 
+@@= skipped -29, +29 lines =@@
  //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
 -
 -
 -//// [index.d.ts]
@@ -14,4 +12,4 @@
 -export interface LocalInterface extends RequireInterface, ImportInterface {
 -}
 +// not exclusively type-only
-+import "pkg" assert { "resolution-mode": "require" };
++require("pkg");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
deleted file mode 100644
index e744d2e78f..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-
-
-==== /index.ts (2 errors) ====
-    export type LocalInterface =
-        & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
-        & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-                                                                   ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-    
-    export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
-    export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                              ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-    
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export interface ImportInterface {}
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export interface RequireInterface {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt.diff
deleted file mode 100644
index 383d3ca73c..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
-+++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+
-+
-+==== /index.ts (2 errors) ====
-+    export type LocalInterface =
-+        & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
-+        & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                   ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+    
-+    export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
-+    export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                              ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+    
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export interface ImportInterface {}
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
index 643b0fc91a..ac1cb24c8b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
@@ -23,5 +23,8 @@ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "im
 
 
 //// [index.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js.diff
index 8c77376b66..fc51a606b8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js.diff
@@ -1,19 +1,12 @@
 --- old.nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
+@@= skipped -27, +27 lines =@@
+ exports.b = exports.a = void 0;
+ exports.a = null;
+ exports.b = null;
 -
 -
 -//// [index.d.ts]
 -export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-+export const a = null;
-+export const b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols
index ee746e04fa..7558565243 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols
@@ -8,6 +8,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
 >a : Symbol(a, Decl(index.ts, 4, 12))
@@ -15,6 +16,11 @@ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "re
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols.diff
deleted file mode 100644
index 000e1e017b..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- old.nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols
-+++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols
-@@= skipped -7, +7 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
index b88a4e40b2..1d8d54f48f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
@@ -2,7 +2,7 @@
 
 === /index.ts ===
 export type LocalInterface =
->LocalInterface : any
+>LocalInterface : LocalInterface
 
     & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
@@ -14,11 +14,14 @@ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "re
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : any
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : any
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : any
+>b : ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
 >null as any : any
 
+=== /node_modules/pkg/import.d.ts ===
+
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
index d82ded4718..befa3efc83 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
@@ -1,13 +1,6 @@
 --- old.nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
-@@= skipped -1, +1 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
+@@= skipped -7, +7 lines =@@
      & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
@@ -23,14 +16,9 @@
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : any
-+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : any
-+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : any
++>b : ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
  >null as any : any
  
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
+ === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
deleted file mode 100644
index e744d2e78f..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-
-
-==== /index.ts (2 errors) ====
-    export type LocalInterface =
-        & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
-        & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-                                                                   ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-    
-    export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
-    export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                              ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-    
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export interface ImportInterface {}
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export interface RequireInterface {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt.diff
deleted file mode 100644
index 6543063539..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
-+++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+
-+
-+==== /index.ts (2 errors) ====
-+    export type LocalInterface =
-+        & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
-+        & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                   ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+    
-+    export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
-+    export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                              ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+    
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export interface ImportInterface {}
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
index 643b0fc91a..ac1cb24c8b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
@@ -23,5 +23,8 @@ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "im
 
 
 //// [index.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js.diff
index c1ff82237a..26d8d412c0 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js.diff
@@ -1,19 +1,12 @@
 --- old.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
+@@= skipped -27, +27 lines =@@
+ exports.b = exports.a = void 0;
+ exports.a = null;
+ exports.b = null;
 -
 -
 -//// [index.d.ts]
 -export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-+export const a = null;
-+export const b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols
index ee746e04fa..7558565243 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols
@@ -8,6 +8,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
 >a : Symbol(a, Decl(index.ts, 4, 12))
@@ -15,6 +16,11 @@ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "re
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
+
+=== /node_modules/pkg/import.d.ts ===
+export interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 === /node_modules/pkg/require.d.ts ===
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols.diff
deleted file mode 100644
index 5a51b7088c..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- old.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols
-+++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols
-@@= skipped -7, +7 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
index b88a4e40b2..1d8d54f48f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
@@ -2,7 +2,7 @@
 
 === /index.ts ===
 export type LocalInterface =
->LocalInterface : any
+>LocalInterface : LocalInterface
 
     & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
@@ -14,11 +14,14 @@ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "re
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : any
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : any
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : any
+>b : ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
 >null as any : any
 
+=== /node_modules/pkg/import.d.ts ===
+
+export interface ImportInterface {}
 === /node_modules/pkg/require.d.ts ===
 
 export interface RequireInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
index b00aec8aff..3c3a38bf13 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
@@ -1,13 +1,6 @@
 --- old.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
-@@= skipped -1, +1 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
+@@= skipped -7, +7 lines =@@
      & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
@@ -23,14 +16,9 @@
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : any
-+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : any
-+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : any
++>b : ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
  >null as any : any
  
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
+ === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
index 87270b7acc..5172f49a5c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
@@ -1,7 +1,5 @@
 /index.ts(2,51): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(5,78): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(3,22): error TS1005: 'with' expected.
 /other.ts(3,39): error TS1005: ';' expected.
@@ -10,7 +8,7 @@
 /other.ts(3,52): error TS1128: Declaration or statement expected.
 /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
 /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(6,49): error TS1005: 'with' expected.
 /other.ts(6,66): error TS1005: ';' expected.
@@ -42,7 +40,7 @@
 /other3.ts(3,56): error TS1128: Declaration or statement expected.
 /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'.
 /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
-/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other3.ts(6,48): error TS1005: '{' expected.
 /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
@@ -58,7 +56,7 @@
 /other4.ts(6,30): error TS1128: Declaration or statement expected.
 /other4.ts(6,31): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
 /other4.ts(7,21): error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
-/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other4.ts(9,48): error TS1005: '{' expected.
 /other4.ts(9,56): error TS1005: ',' expected.
@@ -90,21 +88,17 @@
     export interface ImportInterface {}
 ==== /node_modules/pkg/require.d.ts (0 errors) ====
     export interface RequireInterface {}
-==== /index.ts (4 errors) ====
+==== /index.ts (2 errors) ====
     export type LocalInterface =
         & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
                                                       ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
         & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-                                                                   ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
                                                                                  ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                              ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 ==== /other.ts (27 errors) ====
     // missing assert:
     export type LocalInterface =
@@ -128,7 +122,7 @@
                          ~~~~~~~~~~~~~~~~~
 !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
                                                        ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
                                      ~~~~~~~~~~~~~~~
@@ -211,7 +205,7 @@
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
                                                            ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
                                      ~~~~~~~~~~~~~
@@ -260,7 +254,7 @@
 !!! error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
 !!! related TS2728 /other4.ts:10:48: 'Asserts2' is declared here.
                                   ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", Asserts1).RequireInterface);
                                      ~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt.diff
deleted file mode 100644
index 4d31ca910a..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
-+++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
-@@= skipped -0, +0 lines =@@
- /index.ts(2,51): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- /index.ts(5,78): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(3,22): error TS1005: 'with' expected.
- /other.ts(3,39): error TS1005: ';' expected.
-@@= skipped -7, +9 lines =@@
- /other.ts(3,52): error TS1128: Declaration or statement expected.
- /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
- /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
--/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(6,49): error TS1005: 'with' expected.
- /other.ts(6,66): error TS1005: ';' expected.
-@@= skipped -32, +32 lines =@@
- /other3.ts(3,56): error TS1128: Declaration or statement expected.
- /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'.
- /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
--/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other3.ts(6,48): error TS1005: '{' expected.
- /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
-@@= skipped -16, +16 lines =@@
- /other4.ts(6,30): error TS1128: Declaration or statement expected.
- /other4.ts(6,31): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
- /other4.ts(7,21): error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
--/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other4.ts(9,48): error TS1005: '{' expected.
- /other4.ts(9,56): error TS1005: ',' expected.
-@@= skipped -32, +32 lines =@@
-     export interface ImportInterface {}
- ==== /node_modules/pkg/require.d.ts (0 errors) ====
-     export interface RequireInterface {}
--==== /index.ts (2 errors) ====
-+==== /index.ts (4 errors) ====
-     export type LocalInterface =
-         & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
-                                                       ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
-         & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                   ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
-     export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
-                                                                                  ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
-     export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                              ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- ==== /other.ts (27 errors) ====
-     // missing assert:
-     export type LocalInterface =
-@@= skipped -34, +38 lines =@@
-                          ~~~~~~~~~~~~~~~~~
- !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
-                                      ~~~~~~~~~~~~~~~
-@@= skipped -83, +83 lines =@@
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
-                                                            ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -49, +49 lines =@@
- !!! error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
- !!! related TS2728 /other4.ts:10:48: 'Asserts2' is declared here.
-                                   ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", Asserts1).RequireInterface);
-                                      ~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
index beec651474..fc898fbb30 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
@@ -65,37 +65,55 @@ export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
 
 
 //// [index.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
 //// [other.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 "resolution-mode";
 "require";
 RequireInterface
     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
-export const a = null;
+exports.a = null;
 "resolution-mode";
 "require";
 RequireInterface;
 ;
-export const b = null;
+exports.b = null;
 "resolution-mode";
 "import";
 ImportInterface;
 ;
 //// [other2.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
 //// [other3.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 RequireInterface
     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
-export const a = null.RequireInterface;
-export const b = null.ImportInterface;
+exports.a = null.RequireInterface;
+exports.b = null.ImportInterface;
 //// [other4.js]
-Asserts1;
-RequireInterface
-    & import("pkg", Asserts2).ImportInterface;
-export const a = null, Asserts1, RequireInterface;
-export const b = null, Asserts2, ImportInterface;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportInterface = exports.Asserts2 = exports.b = exports.RequireInterface = exports.Asserts1 = exports.a = void 0;
+exports.Asserts1;
+exports.RequireInterface
+    & import("pkg", exports.Asserts2).ImportInterface;
+exports.a = null;
+exports.b = null;
 //// [other5.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js.diff
index b2ea46bb68..bee7974464 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js.diff
@@ -1,74 +1,9 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
-@@= skipped -64, +64 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Asserts2 = exports.b = exports.RequireInterface = exports.Asserts1 = exports.a = void 0;
--exports.Asserts1;
--exports.RequireInterface
--    & import("pkg", exports.Asserts2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Asserts1;
-+RequireInterface
-+    & import("pkg", Asserts2).ImportInterface;
-+export const a = null, Asserts1, RequireInterface;
-+export const b = null, Asserts2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
+@@= skipped -116, +116 lines =@@
+ exports.b = exports.a = void 0;
+ exports.a = null;
+ exports.b = null;
 -
 -
 -//// [index.d.ts]
@@ -97,5 +32,3 @@
 -export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: any;
-+export const a = null;
-+export const b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
index fa884a0ce9..0db2789686 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
@@ -16,6 +16,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
 >a : Symbol(a, Decl(index.ts, 4, 12))
@@ -23,6 +24,7 @@ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "fo
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 === /other.ts ===
 // missing assert:
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
index 36b901678b..6065274388 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
@@ -1,22 +1,6 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- === /other.ts ===
- // missing assert:
-@@= skipped -9, +8 lines =@@
+@@= skipped -32, +32 lines =@@
  
      & import("pkg", {"resolution-mode": "require"}).RequireInterface
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
index cfc3d310cd..0922a7fb98 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
@@ -8,7 +8,7 @@ export interface ImportInterface {}
 export interface RequireInterface {}
 === /index.ts ===
 export type LocalInterface =
->LocalInterface : any
+>LocalInterface : LocalInterface
 
     & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
@@ -20,9 +20,9 @@ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "fo
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : any
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : any
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : any
+>b : ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -38,7 +38,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -95,7 +95,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -143,7 +143,7 @@ export type LocalInterface =
 
     & import("pkg", Asserts2).ImportInterface;
 >import("pkg", Asserts2).ImportInterface : any
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Asserts2 : any
 >ImportInterface : any
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
index ad06dc9923..059c94d110 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
@@ -1,13 +1,6 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
-@@= skipped -7, +7 lines =@@
- export interface RequireInterface {}
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
+@@= skipped -13, +13 lines =@@
      & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
@@ -23,22 +16,13 @@
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : any
-+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : any
-+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : any
++>b : ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
  >null as any : any
  
  === /other.ts ===
-@@= skipped -30, +30 lines =@@
- 
-     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
- >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
- >"resolution-mode" : string
-@@= skipped -34, +34 lines =@@
+@@= skipped -58, +58 lines =@@
      & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
@@ -51,25 +35,7 @@
  >null as any : any
  
  export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
-@@= skipped -23, +23 lines =@@
- 
-     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
- >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
-@@= skipped -48, +48 lines =@@
- 
-     & import("pkg", Asserts2).ImportInterface;
- >import("pkg", Asserts2).ImportInterface : any
-->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >Asserts2 : any
- >ImportInterface : any
-@@= skipped -29, +29 lines =@@
+@@= skipped -100, +100 lines =@@
      & import("pkg", { assert: {} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
index fae99bba73..632a556e13 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
@@ -1,7 +1,5 @@
 /index.ts(2,51): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(5,78): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(3,22): error TS1005: 'with' expected.
 /other.ts(3,39): error TS1005: ';' expected.
@@ -10,7 +8,7 @@
 /other.ts(3,52): error TS1128: Declaration or statement expected.
 /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
 /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(6,49): error TS1005: 'with' expected.
 /other.ts(6,66): error TS1005: ';' expected.
@@ -45,7 +43,7 @@
   Types of property 'with' are incompatible.
     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
-/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other3.ts(6,48): error TS1005: '{' expected.
 /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
@@ -61,7 +59,7 @@
 /other4.ts(6,30): error TS1128: Declaration or statement expected.
 /other4.ts(6,31): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
 /other4.ts(7,21): error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
-/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
 /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other4.ts(9,48): error TS1005: '{' expected.
 /other4.ts(9,56): error TS1005: ',' expected.
@@ -93,21 +91,17 @@
     export interface ImportInterface {}
 ==== /node_modules/pkg/require.d.ts (0 errors) ====
     export interface RequireInterface {}
-==== /index.ts (4 errors) ====
+==== /index.ts (2 errors) ====
     export type LocalInterface =
         & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
                                                       ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
         & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-                                                                   ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
                                                                                  ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                              ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 ==== /other.ts (27 errors) ====
     // missing assert:
     export type LocalInterface =
@@ -131,7 +125,7 @@
                          ~~~~~~~~~~~~~~~~~
 !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
                                                        ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
                                      ~~~~~~~~~~~~~~~
@@ -217,7 +211,7 @@
 !!! error TS2322:     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
 !!! error TS2322:       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
                                                            ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
                                      ~~~~~~~~~~~~~
@@ -266,7 +260,7 @@
 !!! error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
 !!! related TS2728 /other4.ts:10:48: 'Asserts2' is declared here.
                                   ~~~~~~~~~~~~~~~
-!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
     
     export const a = (null as any as import("pkg", Asserts1).RequireInterface);
                                      ~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
deleted file mode 100644
index 27e9ae5593..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,87 +0,0 @@
---- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
-+++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
-@@= skipped -0, +0 lines =@@
- /index.ts(2,51): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- /index.ts(5,78): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(3,22): error TS1005: 'with' expected.
- /other.ts(3,39): error TS1005: ';' expected.
-@@= skipped -7, +9 lines =@@
- /other.ts(3,52): error TS1128: Declaration or statement expected.
- /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
- /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
--/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(6,49): error TS1005: 'with' expected.
- /other.ts(6,66): error TS1005: ';' expected.
-@@= skipped -35, +35 lines =@@
-   Types of property 'with' are incompatible.
-     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
-       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
--/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other3.ts(6,48): error TS1005: '{' expected.
- /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
-@@= skipped -16, +16 lines =@@
- /other4.ts(6,30): error TS1128: Declaration or statement expected.
- /other4.ts(6,31): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
- /other4.ts(7,21): error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
--/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other4.ts(9,48): error TS1005: '{' expected.
- /other4.ts(9,56): error TS1005: ',' expected.
-@@= skipped -32, +32 lines =@@
-     export interface ImportInterface {}
- ==== /node_modules/pkg/require.d.ts (0 errors) ====
-     export interface RequireInterface {}
--==== /index.ts (2 errors) ====
-+==== /index.ts (4 errors) ====
-     export type LocalInterface =
-         & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
-                                                       ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
-         & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                   ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-     
-     export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
-                                                                                  ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
-     export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                              ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
- ==== /other.ts (27 errors) ====
-     // missing assert:
-     export type LocalInterface =
-@@= skipped -34, +38 lines =@@
-                          ~~~~~~~~~~~~~~~~~
- !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
-                                      ~~~~~~~~~~~~~~~
-@@= skipped -86, +86 lines =@@
- !!! error TS2322:     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
- !!! error TS2322:       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
-                                                            ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -49, +49 lines =@@
- !!! error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
- !!! related TS2728 /other4.ts:10:48: 'Asserts2' is declared here.
-                                   ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", Asserts1).RequireInterface);
-                                      ~~~~~~~~~~~~~
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
index beec651474..fc898fbb30 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
@@ -65,37 +65,55 @@ export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
 
 
 //// [index.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
 //// [other.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 "resolution-mode";
 "require";
 RequireInterface
     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
-export const a = null;
+exports.a = null;
 "resolution-mode";
 "require";
 RequireInterface;
 ;
-export const b = null;
+exports.b = null;
 "resolution-mode";
 "import";
 ImportInterface;
 ;
 //// [other2.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
 //// [other3.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
 RequireInterface
     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
-export const a = null.RequireInterface;
-export const b = null.ImportInterface;
+exports.a = null.RequireInterface;
+exports.b = null.ImportInterface;
 //// [other4.js]
-Asserts1;
-RequireInterface
-    & import("pkg", Asserts2).ImportInterface;
-export const a = null, Asserts1, RequireInterface;
-export const b = null, Asserts2, ImportInterface;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportInterface = exports.Asserts2 = exports.b = exports.RequireInterface = exports.Asserts1 = exports.a = void 0;
+exports.Asserts1;
+exports.RequireInterface
+    & import("pkg", exports.Asserts2).ImportInterface;
+exports.a = null;
+exports.b = null;
 //// [other5.js]
-export const a = null;
-export const b = null;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.b = exports.a = void 0;
+exports.a = null;
+exports.b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js.diff
index 6c7efed173..caca78ac2a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js.diff
@@ -1,74 +1,9 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
-@@= skipped -64, +64 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Asserts2 = exports.b = exports.RequireInterface = exports.Asserts1 = exports.a = void 0;
--exports.Asserts1;
--exports.RequireInterface
--    & import("pkg", exports.Asserts2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Asserts1;
-+RequireInterface
-+    & import("pkg", Asserts2).ImportInterface;
-+export const a = null, Asserts1, RequireInterface;
-+export const b = null, Asserts2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
+@@= skipped -116, +116 lines =@@
+ exports.b = exports.a = void 0;
+ exports.a = null;
+ exports.b = null;
 -
 -
 -//// [index.d.ts]
@@ -97,5 +32,3 @@
 -export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: any;
-+export const a = null;
-+export const b = null;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
index fa884a0ce9..0db2789686 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
@@ -16,6 +16,7 @@ export type LocalInterface =
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
 >a : Symbol(a, Decl(index.ts, 4, 12))
@@ -23,6 +24,7 @@ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "fo
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
 >b : Symbol(b, Decl(index.ts, 5, 12))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
 
 === /other.ts ===
 // missing assert:
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
index a086fcbcb7..8c964da52e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
@@ -1,22 +1,6 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- === /other.ts ===
- // missing assert:
-@@= skipped -9, +8 lines =@@
+@@= skipped -32, +32 lines =@@
  
      & import("pkg", {"resolution-mode": "require"}).RequireInterface
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
index cfc3d310cd..0922a7fb98 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
@@ -8,7 +8,7 @@ export interface ImportInterface {}
 export interface RequireInterface {}
 === /index.ts ===
 export type LocalInterface =
->LocalInterface : any
+>LocalInterface : LocalInterface
 
     & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
@@ -20,9 +20,9 @@ export const a = (null as any as import("pkg", { assert: {"resolution-mode": "fo
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : any
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : any
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : any
+>b : ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -38,7 +38,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -95,7 +95,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -143,7 +143,7 @@ export type LocalInterface =
 
     & import("pkg", Asserts2).ImportInterface;
 >import("pkg", Asserts2).ImportInterface : any
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
+>import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Asserts2 : any
 >ImportInterface : any
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
index 3611caabba..83247caf8e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
@@ -1,13 +1,6 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
-@@= skipped -7, +7 lines =@@
- export interface RequireInterface {}
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
+@@= skipped -13, +13 lines =@@
      & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
@@ -23,22 +16,13 @@
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : any
-+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : any
-+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : any
++>b : ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
  >null as any : any
  
  === /other.ts ===
-@@= skipped -30, +30 lines =@@
- 
-     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
- >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
- >"resolution-mode" : string
-@@= skipped -34, +34 lines =@@
+@@= skipped -58, +58 lines =@@
      & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
@@ -51,25 +35,7 @@
  >null as any : any
  
  export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
-@@= skipped -23, +23 lines =@@
- 
-     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
- >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
-@@= skipped -48, +48 lines =@@
- 
-     & import("pkg", Asserts2).ImportInterface;
- >import("pkg", Asserts2).ImportInterface : any
-->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >Asserts2 : any
- >ImportInterface : any
-@@= skipped -29, +29 lines =@@
+@@= skipped -100, +100 lines =@@
      & import("pkg", { assert: {} }).ImportInterface;
  
  export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node16).errors.txt
new file mode 100644
index 0000000000..ce2e504ca9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node16).errors.txt
@@ -0,0 +1,104 @@
+index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+    import * as type from "package";
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+    import * as type from "package";
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cts (3 errors) ====
+    // cjs format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+    import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+                          ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": {
+            "./cjs": "./index.cjs",
+            "./mjs": "./index.mjs",
+            ".": "./index.js"
+        }
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs": "./index.cjs",
+            "./mjs": "./index.mjs",
+            ".": "./index.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node16).errors.txt.diff
index 13beeb3991..e21c2db59a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node16).errors.txt.diff
@@ -1,114 +1,29 @@
 --- old.nodeModulesPackageExports(module=node16).errors.txt
 +++ new.nodeModulesPackageExports(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--
--
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ 
+ 
 -!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--    import * as type from "package";
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--    import * as type from "package";
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cts (3 errors) ====
--    // cjs format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--    import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--                          ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
+ ==== index.ts (0 errors) ====
+     // esm format file
+     import * as cjs from "package/cjs";
+@@= skipped -55, +52 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs";
--    import * as mjs from "inner/mjs";
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs";
--    import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": {
--            "./cjs": "./index.cjs",
--            "./mjs": "./index.mjs",
--            ".": "./index.js"
--        }
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs": "./index.cjs",
--            "./mjs": "./index.mjs",
--            ".": "./index.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs";
+                          ~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=nodenext).errors.txt
new file mode 100644
index 0000000000..ce2e504ca9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=nodenext).errors.txt
@@ -0,0 +1,104 @@
+index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+    import * as type from "package";
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+    import * as type from "package";
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cts (3 errors) ====
+    // cjs format file
+    import * as cjs from "package/cjs";
+    import * as mjs from "package/mjs";
+                         ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+    import * as type from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+    cjs;
+    mjs;
+    type;
+    import * as cjsi from "inner/cjs";
+    import * as mjsi from "inner/mjs";
+                          ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as typei from "inner";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs";
+    import * as mjs from "inner/mjs";
+                         ~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+    import * as type from "inner";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": {
+            "./cjs": "./index.cjs",
+            "./mjs": "./index.mjs",
+            ".": "./index.js"
+        }
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs": "./index.cjs",
+            "./mjs": "./index.mjs",
+            ".": "./index.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=nodenext).errors.txt.diff
index 675694c665..35e4e0512e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=nodenext).errors.txt.diff
@@ -1,114 +1,29 @@
 --- old.nodeModulesPackageExports(module=nodenext).errors.txt
 +++ new.nodeModulesPackageExports(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cts(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--
--
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ 
+ 
 -!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--    import * as type from "package";
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--    import * as type from "package";
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cts (3 errors) ====
--    // cjs format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--    import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--                          ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
+ ==== index.ts (0 errors) ====
+     // esm format file
+     import * as cjs from "package/cjs";
+@@= skipped -55, +52 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs";
--    import * as mjs from "inner/mjs";
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs";
--    import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": {
--            "./cjs": "./index.cjs",
--            "./mjs": "./index.mjs",
--            ".": "./index.js"
--        }
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs": "./index.cjs",
--            "./mjs": "./index.mjs",
--            ".": "./index.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs";
+                          ~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node16).errors.txt
new file mode 100644
index 0000000000..1599e814ad
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node16).errors.txt
@@ -0,0 +1,44 @@
+index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+    import * as type from "#type";
+    cjs;
+    mjs;
+    type;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+    import * as type from "#type";
+    cjs;
+    mjs;
+    type;
+==== index.cts (2 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+                         ~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+    import * as type from "#type";
+                          ~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+    cjs;
+    mjs;
+    type;
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js",
+        "imports": {
+            "#cjs": "./index.cjs",
+            "#mjs": "./index.mjs",
+            "#type": "./index.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node16).errors.txt.diff
deleted file mode 100644
index 96020509ed..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- old.nodeModulesPackageImports(module=node16).errors.txt
-+++ new.nodeModulesPackageImports(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
--index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--    import * as type from "#type";
--    cjs;
--    mjs;
--    type;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--    import * as type from "#type";
--    cjs;
--    mjs;
--    type;
--==== index.cts (2 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--                         ~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
--    import * as type from "#type";
--                          ~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
--    cjs;
--    mjs;
--    type;
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js",
--        "imports": {
--            "#cjs": "./index.cjs",
--            "#mjs": "./index.mjs",
--            "#type": "./index.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=nodenext).errors.txt
new file mode 100644
index 0000000000..1599e814ad
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=nodenext).errors.txt
@@ -0,0 +1,44 @@
+index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+    import * as type from "#type";
+    cjs;
+    mjs;
+    type;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+    import * as type from "#type";
+    cjs;
+    mjs;
+    type;
+==== index.cts (2 errors) ====
+    // esm format file
+    import * as cjs from "#cjs";
+    import * as mjs from "#mjs";
+                         ~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+    import * as type from "#type";
+                          ~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+    cjs;
+    mjs;
+    type;
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js",
+        "imports": {
+            "#cjs": "./index.cjs",
+            "#mjs": "./index.mjs",
+            "#type": "./index.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=nodenext).errors.txt.diff
deleted file mode 100644
index 9714cbe3ba..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- old.nodeModulesPackageImports(module=nodenext).errors.txt
-+++ new.nodeModulesPackageImports(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
--index.cts(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--    import * as type from "#type";
--    cjs;
--    mjs;
--    type;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--    import * as type from "#type";
--    cjs;
--    mjs;
--    type;
--==== index.cts (2 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--                         ~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
--    import * as type from "#type";
--                          ~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
--    cjs;
--    mjs;
--    type;
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js",
--        "imports": {
--            "#cjs": "./index.cjs",
--            "#mjs": "./index.mjs",
--            "#type": "./index.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node16).errors.txt
new file mode 100644
index 0000000000..e08c4fedb3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node16).errors.txt
@@ -0,0 +1,75 @@
+index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cts (1 errors) ====
+    // cjs format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+                          ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs/*": "./*.cjs",
+            "./mjs/*": "./*.mjs",
+            "./js/*": "./*.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node16).errors.txt.diff
index 7506e9b62e..c95fb527f2 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node16).errors.txt.diff
@@ -1,83 +1,22 @@
 --- old.nodeModulesPackagePatternExports(module=node16).errors.txt
 +++ new.nodeModulesPackagePatternExports(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+@@= skipped -0, +0 lines =@@
+ index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cts (1 errors) ====
--    // cjs format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--                          ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ 
+ 
+@@= skipped -29, +28 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs/index";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs/index";
--    import * as mjs from "inner/mjs/index";
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index";
--    import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs/*": "./*.cjs",
--            "./mjs/*": "./*.mjs",
--            "./js/*": "./*.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs/index";
+                          ~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=nodenext).errors.txt
new file mode 100644
index 0000000000..e08c4fedb3
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=nodenext).errors.txt
@@ -0,0 +1,75 @@
+index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cts (1 errors) ====
+    // cjs format file
+    import * as cjsi from "inner/cjs/index";
+    import * as mjsi from "inner/mjs/index";
+                          ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as typei from "inner/js/index";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index";
+    import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+    import * as type from "inner/js/index";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs/*": "./*.cjs",
+            "./mjs/*": "./*.mjs",
+            "./js/*": "./*.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=nodenext).errors.txt.diff
index 4d7690bfcc..24043b8257 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=nodenext).errors.txt.diff
@@ -1,83 +1,22 @@
 --- old.nodeModulesPackagePatternExports(module=nodenext).errors.txt
 +++ new.nodeModulesPackagePatternExports(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+@@= skipped -0, +0 lines =@@
+ index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cts (1 errors) ====
--    // cjs format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--                          ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ 
+ 
+@@= skipped -29, +28 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs/index";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs/index";
--    import * as mjs from "inner/mjs/index";
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index";
--    import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs/*": "./*.cjs",
--            "./mjs/*": "./*.mjs",
--            "./js/*": "./*.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs/index";
+                          ~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node16).errors.txt
index 7b905f13c1..491a598cda 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node16).errors.txt
@@ -1,6 +1,7 @@
 index.cts(2,23): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
 index.cts(3,23): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
 index.cts(4,24): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
+index.cts(9,24): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 index.mts(2,23): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
 index.mts(3,23): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
 index.mts(4,24): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
@@ -16,6 +17,8 @@ node_modules/inner/exclude/index.d.mts(4,23): error TS2307: Cannot find module '
 node_modules/inner/exclude/index.d.ts(2,22): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
 node_modules/inner/exclude/index.d.ts(3,22): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
 node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 
 
 ==== index.ts (3 errors) ====
@@ -58,7 +61,7 @@ node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'i
     cjsi2;
     mjsi2;
     typei2;
-==== index.cts (3 errors) ====
+==== index.cts (4 errors) ====
     // cjs format file
     import * as cjsi from "inner/cjs/exclude/index";
                           ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -74,6 +77,8 @@ node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'i
     typei;
     import * as cjsi2 from "inner/cjs/index";
     import * as mjsi2 from "inner/mjs/index";
+                           ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
     import * as typei2 from "inner/js/index";
     cjsi2;
     mjsi2;
@@ -120,10 +125,12 @@ node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'i
     export { cjs };
     export { mjs };
     export { type };
-==== node_modules/inner/index.d.ts (0 errors) ====
+==== node_modules/inner/index.d.ts (1 errors) ====
     // cjs format file
     import * as cjs from "inner/cjs/index";
     import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
     import * as type from "inner/js/index";
     export { cjs };
     export { mjs };
@@ -136,10 +143,12 @@ node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'i
     export { cjs };
     export { mjs };
     export { type };
-==== node_modules/inner/index.d.cts (0 errors) ====
+==== node_modules/inner/index.d.cts (1 errors) ====
     // cjs format file
     import * as cjs from "inner/cjs/index";
     import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
     import * as type from "inner/js/index";
     export { cjs };
     export { mjs };
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node16).errors.txt.diff
index eaeaedff88..3aac16e99c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node16).errors.txt.diff
@@ -1,68 +1,23 @@
 --- old.nodeModulesPackagePatternExportsExclude(module=node16).errors.txt
 +++ new.nodeModulesPackagePatternExportsExclude(module=node16).errors.txt
-@@= skipped -0, +0 lines =@@
- index.cts(2,23): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
- index.cts(3,23): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
- index.cts(4,24): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
--index.cts(9,24): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
- index.mts(2,23): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
- index.mts(3,23): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
- index.mts(4,24): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
-@@= skipped -16, +15 lines =@@
- node_modules/inner/exclude/index.d.ts(2,22): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
+@@= skipped -17, +17 lines =@@
  node_modules/inner/exclude/index.d.ts(3,22): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
  node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
  
  
- ==== index.ts (3 errors) ====
-@@= skipped -45, +42 lines =@@
-     cjsi2;
-     mjsi2;
-     typei2;
--==== index.cts (4 errors) ====
-+==== index.cts (3 errors) ====
-     // cjs format file
-     import * as cjsi from "inner/cjs/exclude/index";
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~
-@@= skipped -16, +16 lines =@@
-     typei;
-     import * as cjsi2 from "inner/cjs/index";
-     import * as mjsi2 from "inner/mjs/index";
--                           ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
-     import * as typei2 from "inner/js/index";
-     cjsi2;
-     mjsi2;
-@@= skipped -48, +46 lines =@@
+@@= skipped -108, +107 lines =@@
      export { cjs };
      export { mjs };
      export { type };
 -==== node_modules/inner/index.d.ts (2 errors) ====
-+==== node_modules/inner/index.d.ts (0 errors) ====
++==== node_modules/inner/index.d.ts (1 errors) ====
      // cjs format file
      import * as cjs from "inner/cjs/index";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
      import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
-     import * as type from "inner/js/index";
-     export { cjs };
-     export { mjs };
-@@= skipped -20, +16 lines =@@
-     export { cjs };
-     export { mjs };
-     export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
-+==== node_modules/inner/index.d.cts (0 errors) ====
-     // cjs format file
-     import * as cjs from "inner/cjs/index";
-     import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
-     import * as type from "inner/js/index";
-     export { cjs };
-     export { mjs };
+                          ~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt
index 7b905f13c1..491a598cda 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt
@@ -1,6 +1,7 @@
 index.cts(2,23): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
 index.cts(3,23): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
 index.cts(4,24): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
+index.cts(9,24): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 index.mts(2,23): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
 index.mts(3,23): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
 index.mts(4,24): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
@@ -16,6 +17,8 @@ node_modules/inner/exclude/index.d.mts(4,23): error TS2307: Cannot find module '
 node_modules/inner/exclude/index.d.ts(2,22): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
 node_modules/inner/exclude/index.d.ts(3,22): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
 node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 
 
 ==== index.ts (3 errors) ====
@@ -58,7 +61,7 @@ node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'i
     cjsi2;
     mjsi2;
     typei2;
-==== index.cts (3 errors) ====
+==== index.cts (4 errors) ====
     // cjs format file
     import * as cjsi from "inner/cjs/exclude/index";
                           ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -74,6 +77,8 @@ node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'i
     typei;
     import * as cjsi2 from "inner/cjs/index";
     import * as mjsi2 from "inner/mjs/index";
+                           ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
     import * as typei2 from "inner/js/index";
     cjsi2;
     mjsi2;
@@ -120,10 +125,12 @@ node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'i
     export { cjs };
     export { mjs };
     export { type };
-==== node_modules/inner/index.d.ts (0 errors) ====
+==== node_modules/inner/index.d.ts (1 errors) ====
     // cjs format file
     import * as cjs from "inner/cjs/index";
     import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
     import * as type from "inner/js/index";
     export { cjs };
     export { mjs };
@@ -136,10 +143,12 @@ node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'i
     export { cjs };
     export { mjs };
     export { type };
-==== node_modules/inner/index.d.cts (0 errors) ====
+==== node_modules/inner/index.d.cts (1 errors) ====
     // cjs format file
     import * as cjs from "inner/cjs/index";
     import * as mjs from "inner/mjs/index";
+                         ~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
     import * as type from "inner/js/index";
     export { cjs };
     export { mjs };
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt.diff
index aaf6aa9710..c50d8b90da 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt.diff
@@ -1,68 +1,23 @@
 --- old.nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt
 +++ new.nodeModulesPackagePatternExportsExclude(module=nodenext).errors.txt
-@@= skipped -0, +0 lines =@@
- index.cts(2,23): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
- index.cts(3,23): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
- index.cts(4,24): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
--index.cts(9,24): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
- index.mts(2,23): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
- index.mts(3,23): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
- index.mts(4,24): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
-@@= skipped -16, +15 lines =@@
- node_modules/inner/exclude/index.d.ts(2,22): error TS2307: Cannot find module 'inner/cjs/exclude/index' or its corresponding type declarations.
+@@= skipped -17, +17 lines =@@
  node_modules/inner/exclude/index.d.ts(3,22): error TS2307: Cannot find module 'inner/mjs/exclude/index' or its corresponding type declarations.
  node_modules/inner/exclude/index.d.ts(4,23): error TS2307: Cannot find module 'inner/js/exclude/index' or its corresponding type declarations.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
  
  
- ==== index.ts (3 errors) ====
-@@= skipped -45, +42 lines =@@
-     cjsi2;
-     mjsi2;
-     typei2;
--==== index.cts (4 errors) ====
-+==== index.cts (3 errors) ====
-     // cjs format file
-     import * as cjsi from "inner/cjs/exclude/index";
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~
-@@= skipped -16, +16 lines =@@
-     typei;
-     import * as cjsi2 from "inner/cjs/index";
-     import * as mjsi2 from "inner/mjs/index";
--                           ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
-     import * as typei2 from "inner/js/index";
-     cjsi2;
-     mjsi2;
-@@= skipped -48, +46 lines =@@
+@@= skipped -108, +107 lines =@@
      export { cjs };
      export { mjs };
      export { type };
 -==== node_modules/inner/index.d.ts (2 errors) ====
-+==== node_modules/inner/index.d.ts (0 errors) ====
++==== node_modules/inner/index.d.ts (1 errors) ====
      // cjs format file
      import * as cjs from "inner/cjs/index";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
      import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
-     import * as type from "inner/js/index";
-     export { cjs };
-     export { mjs };
-@@= skipped -20, +16 lines =@@
-     export { cjs };
-     export { mjs };
-     export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
-+==== node_modules/inner/index.d.cts (0 errors) ====
-     // cjs format file
-     import * as cjs from "inner/cjs/index";
-     import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
-     import * as type from "inner/js/index";
-     export { cjs };
-     export { mjs };
+                          ~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt
new file mode 100644
index 0000000000..dfa8eefd0f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt
@@ -0,0 +1,75 @@
+index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cts (1 errors) ====
+    // cjs format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+                          ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs/*.cjs": "./*.cjs",
+            "./mjs/*.mjs": "./*.mjs",
+            "./js/*.js": "./*.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt.diff
index ace55bb2c6..bdede9025a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt.diff
@@ -1,83 +1,22 @@
 --- old.nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt
 +++ new.nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+@@= skipped -0, +0 lines =@@
+ index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cts (1 errors) ====
--    // cjs format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--                          ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+ 
+ 
+@@= skipped -29, +28 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index.cjs";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs/index.cjs";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs/index.cjs";
--    import * as mjs from "inner/mjs/index.mjs";
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index.cjs";
--    import * as mjs from "inner/mjs/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs/*.cjs": "./*.cjs",
--            "./mjs/*.mjs": "./*.mjs",
--            "./js/*.js": "./*.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs/index.mjs";
+                          ~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt
new file mode 100644
index 0000000000..dfa8eefd0f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt
@@ -0,0 +1,75 @@
+index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== index.cts (1 errors) ====
+    // cjs format file
+    import * as cjsi from "inner/cjs/index.cjs";
+    import * as mjsi from "inner/mjs/index.mjs";
+                          ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as typei from "inner/js/index.js";
+    cjsi;
+    mjsi;
+    typei;
+==== node_modules/inner/index.d.ts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.mts (0 errors) ====
+    // esm format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== node_modules/inner/index.d.cts (1 errors) ====
+    // cjs format file
+    import * as cjs from "inner/cjs/index.cjs";
+    import * as mjs from "inner/mjs/index.mjs";
+                         ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+    import * as type from "inner/js/index.js";
+    export { cjs };
+    export { mjs };
+    export { type };
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+    }
+==== node_modules/inner/package.json (0 errors) ====
+    {
+        "name": "inner",
+        "private": true,
+        "exports": {
+            "./cjs/*.cjs": "./*.cjs",
+            "./mjs/*.mjs": "./*.mjs",
+            "./js/*.js": "./*.js"
+        }
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt.diff
index 42da4c05e6..c435062b41 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt.diff
@@ -1,83 +1,22 @@
 --- old.nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt
 +++ new.nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+@@= skipped -0, +0 lines =@@
+ index.cts(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cts (1 errors) ====
--    // cjs format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--                          ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+ 
+ 
+@@= skipped -29, +28 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index.cjs";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs/index.cjs";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs/index.cjs";
--    import * as mjs from "inner/mjs/index.mjs";
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index.cjs";
--    import * as mjs from "inner/mjs/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs/*.cjs": "./*.cjs",
--            "./mjs/*.mjs": "./*.mjs",
--            "./js/*.js": "./*.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs/index.mjs";
+                          ~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node16).errors.txt
new file mode 100644
index 0000000000..44537a76c9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node16).errors.txt
@@ -0,0 +1,45 @@
+index.ts(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+subfolder/index.ts(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
+subfolder/index.ts(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+
+
+==== subfolder/index.ts (2 errors) ====
+    // cjs format file
+    import {h} from "../index.js";
+                    ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
+    import mod = require("../index.js");
+                         ~~~~~~~~~~~~~
+!!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import {f as _f} from "./index.js";
+    import mod2 = require("./index.js");
+    export async function f() {
+        const mod3 = await import ("../index.js");
+        const mod4 = await import ("./index.js");
+        h();
+    }
+==== index.ts (1 errors) ====
+    // esm format file
+    import {h as _h} from "./index.js";
+    import mod = require("./index.js");
+                         ~~~~~~~~~~~~
+!!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import {f} from "./subfolder/index.js";
+    import mod2 = require("./subfolder/index.js");
+    export async function h() {
+        const mod3 = await import ("./index.js");
+        const mod4 = await import ("./subfolder/index.js");
+        f();
+    }
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module"
+    }
+==== subfolder/package.json (0 errors) ====
+    {
+        "type": "commonjs"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node16).errors.txt.diff
deleted file mode 100644
index 504a1aff54..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- old.nodeModulesSynchronousCallErrors(module=node16).errors.txt
-+++ new.nodeModulesSynchronousCallErrors(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.ts(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--subfolder/index.ts(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
--subfolder/index.ts(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--
--
--==== subfolder/index.ts (2 errors) ====
--    // cjs format file
--    import {h} from "../index.js";
--                    ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
--    import mod = require("../index.js");
--                         ~~~~~~~~~~~~~
--!!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import {f as _f} from "./index.js";
--    import mod2 = require("./index.js");
--    export async function f() {
--        const mod3 = await import ("../index.js");
--        const mod4 = await import ("./index.js");
--        h();
--    }
--==== index.ts (1 errors) ====
--    // esm format file
--    import {h as _h} from "./index.js";
--    import mod = require("./index.js");
--                         ~~~~~~~~~~~~
--!!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import {f} from "./subfolder/index.js";
--    import mod2 = require("./subfolder/index.js");
--    export async function h() {
--        const mod3 = await import ("./index.js");
--        const mod4 = await import ("./subfolder/index.js");
--        f();
--    }
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module"
--    }
--==== subfolder/package.json (0 errors) ====
--    {
--        "type": "commonjs"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=nodenext).errors.txt
new file mode 100644
index 0000000000..44537a76c9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=nodenext).errors.txt
@@ -0,0 +1,45 @@
+index.ts(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+subfolder/index.ts(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
+subfolder/index.ts(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+
+
+==== subfolder/index.ts (2 errors) ====
+    // cjs format file
+    import {h} from "../index.js";
+                    ~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
+    import mod = require("../index.js");
+                         ~~~~~~~~~~~~~
+!!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import {f as _f} from "./index.js";
+    import mod2 = require("./index.js");
+    export async function f() {
+        const mod3 = await import ("../index.js");
+        const mod4 = await import ("./index.js");
+        h();
+    }
+==== index.ts (1 errors) ====
+    // esm format file
+    import {h as _h} from "./index.js";
+    import mod = require("./index.js");
+                         ~~~~~~~~~~~~
+!!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+    import {f} from "./subfolder/index.js";
+    import mod2 = require("./subfolder/index.js");
+    export async function h() {
+        const mod3 = await import ("./index.js");
+        const mod4 = await import ("./subfolder/index.js");
+        f();
+    }
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module"
+    }
+==== subfolder/package.json (0 errors) ====
+    {
+        "type": "commonjs"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=nodenext).errors.txt.diff
deleted file mode 100644
index cb894af5b8..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- old.nodeModulesSynchronousCallErrors(module=nodenext).errors.txt
-+++ new.nodeModulesSynchronousCallErrors(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.ts(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--subfolder/index.ts(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
--subfolder/index.ts(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--
--
--==== subfolder/index.ts (2 errors) ====
--    // cjs format file
--    import {h} from "../index.js";
--                    ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
--    import mod = require("../index.js");
--                         ~~~~~~~~~~~~~
--!!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import {f as _f} from "./index.js";
--    import mod2 = require("./index.js");
--    export async function f() {
--        const mod3 = await import ("../index.js");
--        const mod4 = await import ("./index.js");
--        h();
--    }
--==== index.ts (1 errors) ====
--    // esm format file
--    import {h as _h} from "./index.js";
--    import mod = require("./index.js");
--                         ~~~~~~~~~~~~
--!!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import {f} from "./subfolder/index.js";
--    import mod2 = require("./subfolder/index.js");
--    export async function h() {
--        const mod3 = await import ("./index.js");
--        const mod4 = await import ("./subfolder/index.js");
--        f();
--    }
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module"
--    }
--==== subfolder/package.json (0 errors) ====
--    {
--        "type": "commonjs"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js
index 95efa57ebe..14269169ad 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js
@@ -24,5 +24,6 @@ declare global {
 export interface LocalInterface extends RequireInterface {}
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" preserve="true" />
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js.diff
index afdf4799eb..e4837ff92f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js.diff
@@ -1,11 +1,8 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=node16).js
-@@= skipped -23, +23 lines =@@
- export interface LocalInterface extends RequireInterface {}
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -26, +26 lines =@@
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
  /// <reference types="pkg" preserve="true" />
 -
 -
@@ -13,4 +10,3 @@
 -/// <reference types="pkg" preserve="true" />
 -export interface LocalInterface extends RequireInterface {
 -}
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js
index 95efa57ebe..14269169ad 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js
@@ -24,5 +24,6 @@ declare global {
 export interface LocalInterface extends RequireInterface {}
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" preserve="true" />
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js.diff
index da13d71221..884006683d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js.diff
@@ -1,11 +1,8 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit1(module=nodenext).js
-@@= skipped -23, +23 lines =@@
- export interface LocalInterface extends RequireInterface {}
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -26, +26 lines =@@
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
  /// <reference types="pkg" preserve="true" />
 -
 -
@@ -13,4 +10,3 @@
 -/// <reference types="pkg" preserve="true" />
 -export interface LocalInterface extends RequireInterface {
 -}
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt
deleted file mode 100644
index d07fb3dfc1..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/index.ts(2,41): error TS2304: Cannot find name 'ImportInterface'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" preserve="true" />
-    export interface LocalInterface extends ImportInterface {}
-                                            ~~~~~~~~~~~~~~~
-!!! error TS2304: Cannot find name 'ImportInterface'.
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface ImportInterface {}
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface RequireInterface {}
-    }
-==== /package.json (0 errors) ====
-    {
-        "private": true,
-        "type": "module"
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt.diff
deleted file mode 100644
index b990eafac1..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(2,41): error TS2304: Cannot find name 'ImportInterface'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" preserve="true" />
-+    export interface LocalInterface extends ImportInterface {}
-+                                            ~~~~~~~~~~~~~~~
-+!!! error TS2304: Cannot find name 'ImportInterface'.
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface ImportInterface {}
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface RequireInterface {}
-+    }
-+==== /package.json (0 errors) ====
-+    {
-+        "private": true,
-+        "type": "module"
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols
index 720eba1bca..f53263f851 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols
@@ -4,12 +4,13 @@
 /// <reference types="pkg" preserve="true" />
 export interface LocalInterface extends ImportInterface {}
 >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
->global : Symbol((Missing), Decl(require.d.ts, 0, 10))
+>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
 
-    interface RequireInterface {}
->RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
+    interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols.diff
index 0649d72af2..6dd7cc801c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols.diff
@@ -1,20 +1,11 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).symbols
-@@= skipped -3, +3 lines =@@
- /// <reference types="pkg" preserve="true" />
- export interface LocalInterface extends ImportInterface {}
- >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
- 
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
+@@= skipped -8, +8 lines =@@
+ === /node_modules/pkg/import.d.ts ===
  export {};
  declare global {
 ->global : Symbol(global, Decl(import.d.ts, 0, 10))
-+>global : Symbol((Missing), Decl(require.d.ts, 0, 10))
++>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
  
--    interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
-+    interface RequireInterface {}
-+>RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
- }
+     interface ImportInterface {}
+ >ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types
index 161a51956e..f2f8e65465 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types
@@ -4,10 +4,10 @@
 
 /// <reference types="pkg" preserve="true" />
 export interface LocalInterface extends ImportInterface {}
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
 >global : any
 
-    interface RequireInterface {}
+    interface ImportInterface {}
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types.diff
deleted file mode 100644
index 409a079262..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=node16).types
-@@= skipped -3, +3 lines =@@
- 
- /// <reference types="pkg" preserve="true" />
- export interface LocalInterface extends ImportInterface {}
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
- >global : any
- 
--    interface ImportInterface {}
-+    interface RequireInterface {}
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt
deleted file mode 100644
index d07fb3dfc1..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/index.ts(2,41): error TS2304: Cannot find name 'ImportInterface'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" preserve="true" />
-    export interface LocalInterface extends ImportInterface {}
-                                            ~~~~~~~~~~~~~~~
-!!! error TS2304: Cannot find name 'ImportInterface'.
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface ImportInterface {}
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface RequireInterface {}
-    }
-==== /package.json (0 errors) ====
-    {
-        "private": true,
-        "type": "module"
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt.diff
deleted file mode 100644
index 6c3efd6575..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(2,41): error TS2304: Cannot find name 'ImportInterface'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" preserve="true" />
-+    export interface LocalInterface extends ImportInterface {}
-+                                            ~~~~~~~~~~~~~~~
-+!!! error TS2304: Cannot find name 'ImportInterface'.
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface ImportInterface {}
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface RequireInterface {}
-+    }
-+==== /package.json (0 errors) ====
-+    {
-+        "private": true,
-+        "type": "module"
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols
index 720eba1bca..f53263f851 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols
@@ -4,12 +4,13 @@
 /// <reference types="pkg" preserve="true" />
 export interface LocalInterface extends ImportInterface {}
 >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
->global : Symbol((Missing), Decl(require.d.ts, 0, 10))
+>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
 
-    interface RequireInterface {}
->RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
+    interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols.diff
index 0cdd5d113f..45bd28f793 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols.diff
@@ -1,20 +1,11 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).symbols
-@@= skipped -3, +3 lines =@@
- /// <reference types="pkg" preserve="true" />
- export interface LocalInterface extends ImportInterface {}
- >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
- 
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
+@@= skipped -8, +8 lines =@@
+ === /node_modules/pkg/import.d.ts ===
  export {};
  declare global {
 ->global : Symbol(global, Decl(import.d.ts, 0, 10))
-+>global : Symbol((Missing), Decl(require.d.ts, 0, 10))
++>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
  
--    interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
-+    interface RequireInterface {}
-+>RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
- }
+     interface ImportInterface {}
+ >ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types
index 161a51956e..f2f8e65465 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types
@@ -4,10 +4,10 @@
 
 /// <reference types="pkg" preserve="true" />
 export interface LocalInterface extends ImportInterface {}
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
 >global : any
 
-    interface RequireInterface {}
+    interface ImportInterface {}
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types.diff
deleted file mode 100644
index e00db5e450..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit2(module=nodenext).types
-@@= skipped -3, +3 lines =@@
- 
- /// <reference types="pkg" preserve="true" />
- export interface LocalInterface extends ImportInterface {}
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
- >global : any
- 
--    interface ImportInterface {}
-+    interface RequireInterface {}
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt
deleted file mode 100644
index 57cda6d8b2..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/index.ts(2,41): error TS2304: Cannot find name 'ImportInterface'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" resolution-mode="import" preserve="true" />
-    export interface LocalInterface extends ImportInterface {}
-                                            ~~~~~~~~~~~~~~~
-!!! error TS2304: Cannot find name 'ImportInterface'.
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface ImportInterface {}
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface RequireInterface {}
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt.diff
deleted file mode 100644
index af2f2b3768..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(2,41): error TS2304: Cannot find name 'ImportInterface'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" resolution-mode="import" preserve="true" />
-+    export interface LocalInterface extends ImportInterface {}
-+                                            ~~~~~~~~~~~~~~~
-+!!! error TS2304: Cannot find name 'ImportInterface'.
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface ImportInterface {}
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface RequireInterface {}
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js
index 224a1e03c1..56f5104b87 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js
@@ -24,5 +24,6 @@ declare global {
 export interface LocalInterface extends ImportInterface {}
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js.diff
index 17b31b31e7..05f91d230a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js.diff
@@ -1,11 +1,8 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).js
-@@= skipped -23, +23 lines =@@
- export interface LocalInterface extends ImportInterface {}
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -26, +26 lines =@@
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
  /// <reference types="pkg" resolution-mode="import" preserve="true" />
 -
 -
@@ -13,4 +10,3 @@
 -/// <reference types="pkg" resolution-mode="import" preserve="true" />
 -export interface LocalInterface extends ImportInterface {
 -}
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols
index 52a5c02870..e3d0e330df 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols
@@ -4,12 +4,13 @@
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
 export interface LocalInterface extends ImportInterface {}
 >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
->global : Symbol((Missing), Decl(require.d.ts, 0, 10))
+>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
 
-    interface RequireInterface {}
->RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
+    interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols.diff
index a173c6f497..3e9275d8a7 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols.diff
@@ -1,20 +1,11 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).symbols
-@@= skipped -3, +3 lines =@@
- /// <reference types="pkg" resolution-mode="import" preserve="true" />
- export interface LocalInterface extends ImportInterface {}
- >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
- 
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
+@@= skipped -8, +8 lines =@@
+ === /node_modules/pkg/import.d.ts ===
  export {};
  declare global {
 ->global : Symbol(global, Decl(import.d.ts, 0, 10))
-+>global : Symbol((Missing), Decl(require.d.ts, 0, 10))
++>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
  
--    interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
-+    interface RequireInterface {}
-+>RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
- }
+     interface ImportInterface {}
+ >ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types
index 852f4abd19..ec5a644814 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types
@@ -4,10 +4,10 @@
 
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
 export interface LocalInterface extends ImportInterface {}
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
 >global : any
 
-    interface RequireInterface {}
+    interface ImportInterface {}
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types.diff
deleted file mode 100644
index 8ec205437b..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=node16).types
-@@= skipped -3, +3 lines =@@
- 
- /// <reference types="pkg" resolution-mode="import" preserve="true" />
- export interface LocalInterface extends ImportInterface {}
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
- >global : any
- 
--    interface ImportInterface {}
-+    interface RequireInterface {}
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt
deleted file mode 100644
index 57cda6d8b2..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/index.ts(2,41): error TS2304: Cannot find name 'ImportInterface'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" resolution-mode="import" preserve="true" />
-    export interface LocalInterface extends ImportInterface {}
-                                            ~~~~~~~~~~~~~~~
-!!! error TS2304: Cannot find name 'ImportInterface'.
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface ImportInterface {}
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface RequireInterface {}
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt.diff
deleted file mode 100644
index 5b53d09baa..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(2,41): error TS2304: Cannot find name 'ImportInterface'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" resolution-mode="import" preserve="true" />
-+    export interface LocalInterface extends ImportInterface {}
-+                                            ~~~~~~~~~~~~~~~
-+!!! error TS2304: Cannot find name 'ImportInterface'.
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface ImportInterface {}
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface RequireInterface {}
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js
index 224a1e03c1..56f5104b87 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js
@@ -24,5 +24,6 @@ declare global {
 export interface LocalInterface extends ImportInterface {}
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js.diff
index d9994a3609..293513a23c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js.diff
@@ -1,11 +1,8 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).js
-@@= skipped -23, +23 lines =@@
- export interface LocalInterface extends ImportInterface {}
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -26, +26 lines =@@
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
  /// <reference types="pkg" resolution-mode="import" preserve="true" />
 -
 -
@@ -13,4 +10,3 @@
 -/// <reference types="pkg" resolution-mode="import" preserve="true" />
 -export interface LocalInterface extends ImportInterface {
 -}
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols
index 52a5c02870..e3d0e330df 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols
@@ -4,12 +4,13 @@
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
 export interface LocalInterface extends ImportInterface {}
 >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
->global : Symbol((Missing), Decl(require.d.ts, 0, 10))
+>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
 
-    interface RequireInterface {}
->RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
+    interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols.diff
index 8c8dd3c256..6eb452d11a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols.diff
@@ -1,20 +1,11 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).symbols
-@@= skipped -3, +3 lines =@@
- /// <reference types="pkg" resolution-mode="import" preserve="true" />
- export interface LocalInterface extends ImportInterface {}
- >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
- 
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
+@@= skipped -8, +8 lines =@@
+ === /node_modules/pkg/import.d.ts ===
  export {};
  declare global {
 ->global : Symbol(global, Decl(import.d.ts, 0, 10))
-+>global : Symbol((Missing), Decl(require.d.ts, 0, 10))
++>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
  
--    interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
-+    interface RequireInterface {}
-+>RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
- }
+     interface ImportInterface {}
+ >ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types
index 852f4abd19..ec5a644814 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types
@@ -4,10 +4,10 @@
 
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
 export interface LocalInterface extends ImportInterface {}
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
 >global : any
 
-    interface RequireInterface {}
+    interface ImportInterface {}
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types.diff
deleted file mode 100644
index c834fa3f0c..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit4(module=nodenext).types
-@@= skipped -3, +3 lines =@@
- 
- /// <reference types="pkg" resolution-mode="import" preserve="true" />
- export interface LocalInterface extends ImportInterface {}
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
- >global : any
- 
--    interface ImportInterface {}
-+    interface RequireInterface {}
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt
deleted file mode 100644
index 439d21b2a6..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/index.ts(3,41): error TS2304: Cannot find name 'ImportInterface'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" resolution-mode="import" preserve="true" />
-    /// <reference types="pkg" resolution-mode="require" preserve="true" />
-    export interface LocalInterface extends ImportInterface, RequireInterface {}
-                                            ~~~~~~~~~~~~~~~
-!!! error TS2304: Cannot find name 'ImportInterface'.
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface ImportInterface {}
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface RequireInterface {}
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt.diff
deleted file mode 100644
index 67b65d1a8e..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(3,41): error TS2304: Cannot find name 'ImportInterface'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" resolution-mode="import" preserve="true" />
-+    /// <reference types="pkg" resolution-mode="require" preserve="true" />
-+    export interface LocalInterface extends ImportInterface, RequireInterface {}
-+                                            ~~~~~~~~~~~~~~~
-+!!! error TS2304: Cannot find name 'ImportInterface'.
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface ImportInterface {}
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface RequireInterface {}
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js
index 70d5ef61eb..48dd64ce4b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js
@@ -25,6 +25,7 @@ declare global {
 export interface LocalInterface extends ImportInterface, RequireInterface {}
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
 /// <reference types="pkg" resolution-mode="require" preserve="true" />
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js.diff
index 1625914567..3e1ff1212b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js.diff
@@ -1,11 +1,7 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).js
-@@= skipped -24, +24 lines =@@
- export interface LocalInterface extends ImportInterface, RequireInterface {}
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -28, +28 lines =@@
+ Object.defineProperty(exports, "__esModule", { value: true });
  /// <reference types="pkg" resolution-mode="import" preserve="true" />
  /// <reference types="pkg" resolution-mode="require" preserve="true" />
 -
@@ -15,4 +11,3 @@
 -/// <reference types="pkg" resolution-mode="require" preserve="true" />
 -export interface LocalInterface extends ImportInterface, RequireInterface {
 -}
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols
index 489b2073aa..5fe4a8543b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols
@@ -5,8 +5,17 @@
 /// <reference types="pkg" resolution-mode="require" preserve="true" />
 export interface LocalInterface extends ImportInterface, RequireInterface {}
 >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
 
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
+
+    interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols.diff
index 00c98fc2e4..0877637870 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols.diff
@@ -1,20 +1,15 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).symbols
-@@= skipped -4, +4 lines =@@
- /// <reference types="pkg" resolution-mode="require" preserve="true" />
- export interface LocalInterface extends ImportInterface, RequireInterface {}
- >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
- 
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
+@@= skipped -10, +10 lines =@@
+ === /node_modules/pkg/import.d.ts ===
+ export {};
+ declare global {
 ->global : Symbol(global, Decl(import.d.ts, 0, 10))
--
--    interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
--}
++>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
+ 
+     interface ImportInterface {}
+ >ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+@@= skipped -8, +8 lines =@@
  === /node_modules/pkg/require.d.ts ===
  export {};
  declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types
index d513a0047b..fb2475f96e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types
@@ -5,6 +5,13 @@
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
 /// <reference types="pkg" resolution-mode="require" preserve="true" />
 export interface LocalInterface extends ImportInterface, RequireInterface {}
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : any
+
+    interface ImportInterface {}
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types.diff
deleted file mode 100644
index a8dc17d687..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=node16).types
-@@= skipped -4, +4 lines =@@
- /// <reference types="pkg" resolution-mode="import" preserve="true" />
- /// <reference types="pkg" resolution-mode="require" preserve="true" />
- export interface LocalInterface extends ImportInterface, RequireInterface {}
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : any
--
--    interface ImportInterface {}
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt
deleted file mode 100644
index 439d21b2a6..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/index.ts(3,41): error TS2304: Cannot find name 'ImportInterface'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" resolution-mode="import" preserve="true" />
-    /// <reference types="pkg" resolution-mode="require" preserve="true" />
-    export interface LocalInterface extends ImportInterface, RequireInterface {}
-                                            ~~~~~~~~~~~~~~~
-!!! error TS2304: Cannot find name 'ImportInterface'.
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface ImportInterface {}
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        interface RequireInterface {}
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt.diff
deleted file mode 100644
index fbe6281447..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(3,41): error TS2304: Cannot find name 'ImportInterface'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" resolution-mode="import" preserve="true" />
-+    /// <reference types="pkg" resolution-mode="require" preserve="true" />
-+    export interface LocalInterface extends ImportInterface, RequireInterface {}
-+                                            ~~~~~~~~~~~~~~~
-+!!! error TS2304: Cannot find name 'ImportInterface'.
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface ImportInterface {}
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        interface RequireInterface {}
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js
index 70d5ef61eb..48dd64ce4b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js
@@ -25,6 +25,7 @@ declare global {
 export interface LocalInterface extends ImportInterface, RequireInterface {}
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
 /// <reference types="pkg" resolution-mode="require" preserve="true" />
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js.diff
index 554884a4b0..f7e795a6e0 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js.diff
@@ -1,11 +1,7 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).js
-@@= skipped -24, +24 lines =@@
- export interface LocalInterface extends ImportInterface, RequireInterface {}
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
+@@= skipped -28, +28 lines =@@
+ Object.defineProperty(exports, "__esModule", { value: true });
  /// <reference types="pkg" resolution-mode="import" preserve="true" />
  /// <reference types="pkg" resolution-mode="require" preserve="true" />
 -
@@ -15,4 +11,3 @@
 -/// <reference types="pkg" resolution-mode="require" preserve="true" />
 -export interface LocalInterface extends ImportInterface, RequireInterface {
 -}
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols
index 489b2073aa..5fe4a8543b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols
@@ -5,8 +5,17 @@
 /// <reference types="pkg" resolution-mode="require" preserve="true" />
 export interface LocalInterface extends ImportInterface, RequireInterface {}
 >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
 
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
+
+    interface ImportInterface {}
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols.diff
index 44c6c6af69..499e5a369f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols.diff
@@ -1,20 +1,15 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).symbols
-@@= skipped -4, +4 lines =@@
- /// <reference types="pkg" resolution-mode="require" preserve="true" />
- export interface LocalInterface extends ImportInterface, RequireInterface {}
- >LocalInterface : Symbol(LocalInterface, Decl(index.ts, 0, 0))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
- 
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
+@@= skipped -10, +10 lines =@@
+ === /node_modules/pkg/import.d.ts ===
+ export {};
+ declare global {
 ->global : Symbol(global, Decl(import.d.ts, 0, 10))
--
--    interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
--}
++>global : Symbol((Missing), Decl(import.d.ts, 0, 10))
+ 
+     interface ImportInterface {}
+ >ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+@@= skipped -8, +8 lines =@@
  === /node_modules/pkg/require.d.ts ===
  export {};
  declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types
index d513a0047b..fb2475f96e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types
@@ -5,6 +5,13 @@
 /// <reference types="pkg" resolution-mode="import" preserve="true" />
 /// <reference types="pkg" resolution-mode="require" preserve="true" />
 export interface LocalInterface extends ImportInterface, RequireInterface {}
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : any
+
+    interface ImportInterface {}
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types.diff
deleted file mode 100644
index cfdc5f1a4a..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types
-+++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit5(module=nodenext).types
-@@= skipped -4, +4 lines =@@
- /// <reference types="pkg" resolution-mode="import" preserve="true" />
- /// <reference types="pkg" resolution-mode="require" preserve="true" />
- export interface LocalInterface extends ImportInterface, RequireInterface {}
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : any
--
--    interface ImportInterface {}
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js
index b11dad02ea..022f8e15e5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js
@@ -29,8 +29,15 @@ import obj from "./uses.js"
 export default (obj as typeof obj);
 
 //// [uses.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" preserve="true" />
-export default getInterR();
+exports.default = getInterR();
 //// [index.js]
-import obj from "./uses.js";
-export default obj;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const uses_js_1 = __importDefault(require("./uses.js"));
+exports.default = uses_js_1.default;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js.diff
index 13e0697996..ed32cc7719 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js.diff
@@ -1,22 +1,9 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node16).js
-@@= skipped -28, +28 lines =@@
- export default (obj as typeof obj);
- 
- //// [uses.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" preserve="true" />
--exports.default = getInterR();
-+export default getInterR();
- //// [index.js]
--"use strict";
--var __importDefault = (this && this.__importDefault) || function (mod) {
--    return (mod && mod.__esModule) ? mod : { "default": mod };
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--const uses_js_1 = __importDefault(require("./uses.js"));
--exports.default = uses_js_1.default;
+@@= skipped -40, +40 lines =@@
+ Object.defineProperty(exports, "__esModule", { value: true });
+ const uses_js_1 = __importDefault(require("./uses.js"));
+ exports.default = uses_js_1.default;
 -
 -
 -//// [uses.d.ts]
@@ -66,5 +53,3 @@
 -    declare const _default: RequireInterface;
 -    export default _default;
 -    
-+import obj from "./uses.js";
-+export default obj;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js
index b11dad02ea..022f8e15e5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js
@@ -29,8 +29,15 @@ import obj from "./uses.js"
 export default (obj as typeof obj);
 
 //// [uses.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" preserve="true" />
-export default getInterR();
+exports.default = getInterR();
 //// [index.js]
-import obj from "./uses.js";
-export default obj;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const uses_js_1 = __importDefault(require("./uses.js"));
+exports.default = uses_js_1.default;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js.diff
index 9c98c2644d..17ff72717d 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js.diff
@@ -1,22 +1,9 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=nodenext).js
-@@= skipped -28, +28 lines =@@
- export default (obj as typeof obj);
- 
- //// [uses.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" preserve="true" />
--exports.default = getInterR();
-+export default getInterR();
- //// [index.js]
--"use strict";
--var __importDefault = (this && this.__importDefault) || function (mod) {
--    return (mod && mod.__esModule) ? mod : { "default": mod };
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--const uses_js_1 = __importDefault(require("./uses.js"));
--exports.default = uses_js_1.default;
+@@= skipped -40, +40 lines =@@
+ Object.defineProperty(exports, "__esModule", { value: true });
+ const uses_js_1 = __importDefault(require("./uses.js"));
+ exports.default = uses_js_1.default;
 -
 -
 -//// [uses.d.ts]
@@ -66,5 +53,3 @@
 -    declare const _default: RequireInterface;
 -    export default _default;
 -    
-+import obj from "./uses.js";
-+export default obj;
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).errors.txt
index d6ecea604b..bb4c18976f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).errors.txt
@@ -1,5 +1,4 @@
 /index.ts(4,28): error TS2339: Property 'default' does not exist on type 'RequireInterface'.
-/sub1/uses.ts(2,16): error TS2552: Cannot find name 'getInterI'. Did you mean 'getInterR'?
 
 
 ==== /index.ts (1 errors) ====
@@ -30,12 +29,9 @@
         interface RequireInterface { _r: any; }
         function getInterR(): RequireInterface;
     }
-==== /sub1/uses.ts (1 errors) ====
+==== /sub1/uses.ts (0 errors) ====
     /// <reference types="pkg" preserve="true" />
     export default getInterI();
-                   ~~~~~~~~~
-!!! error TS2552: Cannot find name 'getInterI'. Did you mean 'getInterR'?
-!!! related TS2728 /node_modules/pkg/require.d.ts:4:14: 'getInterR' is declared here.
 ==== /sub1/package.json (0 errors) ====
     {
         "private": true,
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).errors.txt.diff
index 8b181d94d3..69f1775ae7 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).errors.txt.diff
@@ -4,7 +4,6 @@
 -<no content>
 @@= skipped --1, +1 lines =@@
 +/index.ts(4,28): error TS2339: Property 'default' does not exist on type 'RequireInterface'.
-+/sub1/uses.ts(2,16): error TS2552: Cannot find name 'getInterI'. Did you mean 'getInterR'?
 +
 +
 +==== /index.ts (1 errors) ====
@@ -35,12 +34,9 @@
 +        interface RequireInterface { _r: any; }
 +        function getInterR(): RequireInterface;
 +    }
-+==== /sub1/uses.ts (1 errors) ====
++==== /sub1/uses.ts (0 errors) ====
 +    /// <reference types="pkg" preserve="true" />
 +    export default getInterI();
-+                   ~~~~~~~~~
-+!!! error TS2552: Cannot find name 'getInterI'. Did you mean 'getInterR'?
-+!!! related TS2728 /node_modules/pkg/require.d.ts:4:14: 'getInterR' is declared here.
 +==== /sub1/package.json (0 errors) ====
 +    {
 +        "private": true,
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).symbols
index caebc3574f..69f4886b16 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).symbols
@@ -13,6 +13,19 @@ export default [obj1, obj2.default] as const;
 >obj2 : Symbol(obj2, Decl(index.ts, 2, 6))
 >const : Symbol(const)
 
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
+
+    interface ImportInterface { _i: any; }
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+>_i : Symbol(_i, Decl(import.d.ts, 2, 31))
+
+    function getInterI(): ImportInterface;
+>getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
@@ -27,9 +40,10 @@ declare global {
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
 }
 === /sub1/uses.ts ===
-
 /// <reference types="pkg" preserve="true" />
 export default getInterI();
+>getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
+
 === /sub2/uses.ts ===
 /// <reference types="pkg" preserve="true" />
 export default getInterR();
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).symbols.diff
index ac6812e2de..5af46a3ce0 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).symbols.diff
@@ -9,23 +9,17 @@
 ->default : Symbol(obj2.default, Decl(uses.ts, 0, 0))
  >const : Symbol(const)
  
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
--
--    interface ImportInterface { _i: any; }
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+ === /node_modules/pkg/import.d.ts ===
+@@= skipped -12, +10 lines =@@
+ 
+     interface ImportInterface { _i: any; }
+ >ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 ->_i : Symbol(ImportInterface._i, Decl(import.d.ts, 2, 31))
--
--    function getInterI(): ImportInterface;
-->getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
-@@= skipped -25, +10 lines =@@
++>_i : Symbol(_i, Decl(import.d.ts, 2, 31))
+ 
+     function getInterI(): ImportInterface;
+ >getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
+@@= skipped -13, +13 lines =@@
  
      interface RequireInterface { _r: any; }
  >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
@@ -34,14 +28,3 @@
  
      function getInterR(): RequireInterface;
  >getInterR : Symbol(getInterR, Decl(require.d.ts, 2, 43))
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
- }
- === /sub1/uses.ts ===
-+
- /// <reference types="pkg" preserve="true" />
- export default getInterI();
-->getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
--
- === /sub2/uses.ts ===
- /// <reference types="pkg" preserve="true" />
- export default getInterR();
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types
index fc698ca4ed..feec0c28a6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types
@@ -3,19 +3,30 @@
 === /index.ts ===
 // only an esm file can `import` both kinds of files
 import obj1 from "./sub1/uses.js"
->obj1 : any
+>obj1 : ImportInterface
 
 import obj2 from "./sub2/uses.js"
 >obj2 : RequireInterface
 
 export default [obj1, obj2.default] as const;
->[obj1, obj2.default] as const : readonly [any, any]
->[obj1, obj2.default] : readonly [any, any]
->obj1 : any
+>[obj1, obj2.default] as const : readonly [ImportInterface, any]
+>[obj1, obj2.default] : readonly [ImportInterface, any]
+>obj1 : ImportInterface
 >obj2.default : any
 >obj2 : RequireInterface
 >default : any
 
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : typeof global
+
+    interface ImportInterface { _i: any; }
+>_i : any
+
+    function getInterI(): ImportInterface;
+>getInterI : () => ImportInterface
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
@@ -30,8 +41,8 @@ declare global {
 === /sub1/uses.ts ===
 /// <reference types="pkg" preserve="true" />
 export default getInterI();
->getInterI() : any
->getInterI : any
+>getInterI() : ImportInterface
+>getInterI : () => ImportInterface
 
 === /sub2/uses.ts ===
 /// <reference types="pkg" preserve="true" />
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types.diff
index c5ef50b6f5..781a76e361 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types.diff
@@ -1,11 +1,7 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=node16).types
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- // only an esm file can `import` both kinds of files
- import obj1 from "./sub1/uses.js"
-->obj1 : ImportInterface
-+>obj1 : any
+@@= skipped -5, +5 lines =@@
+ >obj1 : ImportInterface
  
  import obj2 from "./sub2/uses.js"
 ->obj2 : typeof obj2
@@ -14,39 +10,15 @@
  export default [obj1, obj2.default] as const;
 ->[obj1, obj2.default] as const : readonly [ImportInterface, RequireInterface]
 ->[obj1, obj2.default] : readonly [ImportInterface, RequireInterface]
-->obj1 : ImportInterface
++>[obj1, obj2.default] as const : readonly [ImportInterface, any]
++>[obj1, obj2.default] : readonly [ImportInterface, any]
+ >obj1 : ImportInterface
 ->obj2.default : RequireInterface
 ->obj2 : typeof obj2
 ->default : RequireInterface
-+>[obj1, obj2.default] as const : readonly [any, any]
-+>[obj1, obj2.default] : readonly [any, any]
-+>obj1 : any
 +>obj2.default : any
 +>obj2 : RequireInterface
 +>default : any
  
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : typeof global
--
--    interface ImportInterface { _i: any; }
-->_i : any
--
--    function getInterI(): ImportInterface;
-->getInterI : () => ImportInterface
--}
- === /node_modules/pkg/require.d.ts ===
+ === /node_modules/pkg/import.d.ts ===
  export {};
- declare global {
-@@= skipped -38, +27 lines =@@
- === /sub1/uses.ts ===
- /// <reference types="pkg" preserve="true" />
- export default getInterI();
-->getInterI() : ImportInterface
-->getInterI : () => ImportInterface
-+>getInterI() : any
-+>getInterI : any
- 
- === /sub2/uses.ts ===
- /// <reference types="pkg" preserve="true" />
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).errors.txt
index d6ecea604b..bb4c18976f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).errors.txt
@@ -1,5 +1,4 @@
 /index.ts(4,28): error TS2339: Property 'default' does not exist on type 'RequireInterface'.
-/sub1/uses.ts(2,16): error TS2552: Cannot find name 'getInterI'. Did you mean 'getInterR'?
 
 
 ==== /index.ts (1 errors) ====
@@ -30,12 +29,9 @@
         interface RequireInterface { _r: any; }
         function getInterR(): RequireInterface;
     }
-==== /sub1/uses.ts (1 errors) ====
+==== /sub1/uses.ts (0 errors) ====
     /// <reference types="pkg" preserve="true" />
     export default getInterI();
-                   ~~~~~~~~~
-!!! error TS2552: Cannot find name 'getInterI'. Did you mean 'getInterR'?
-!!! related TS2728 /node_modules/pkg/require.d.ts:4:14: 'getInterR' is declared here.
 ==== /sub1/package.json (0 errors) ====
     {
         "private": true,
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).errors.txt.diff
index 1146b04e51..56e0af471f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).errors.txt.diff
@@ -4,7 +4,6 @@
 -<no content>
 @@= skipped --1, +1 lines =@@
 +/index.ts(4,28): error TS2339: Property 'default' does not exist on type 'RequireInterface'.
-+/sub1/uses.ts(2,16): error TS2552: Cannot find name 'getInterI'. Did you mean 'getInterR'?
 +
 +
 +==== /index.ts (1 errors) ====
@@ -35,12 +34,9 @@
 +        interface RequireInterface { _r: any; }
 +        function getInterR(): RequireInterface;
 +    }
-+==== /sub1/uses.ts (1 errors) ====
++==== /sub1/uses.ts (0 errors) ====
 +    /// <reference types="pkg" preserve="true" />
 +    export default getInterI();
-+                   ~~~~~~~~~
-+!!! error TS2552: Cannot find name 'getInterI'. Did you mean 'getInterR'?
-+!!! related TS2728 /node_modules/pkg/require.d.ts:4:14: 'getInterR' is declared here.
 +==== /sub1/package.json (0 errors) ====
 +    {
 +        "private": true,
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).symbols
index caebc3574f..69f4886b16 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).symbols
@@ -13,6 +13,19 @@ export default [obj1, obj2.default] as const;
 >obj2 : Symbol(obj2, Decl(index.ts, 2, 6))
 >const : Symbol(const)
 
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
+
+    interface ImportInterface { _i: any; }
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+>_i : Symbol(_i, Decl(import.d.ts, 2, 31))
+
+    function getInterI(): ImportInterface;
+>getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
+>ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
@@ -27,9 +40,10 @@ declare global {
 >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
 }
 === /sub1/uses.ts ===
-
 /// <reference types="pkg" preserve="true" />
 export default getInterI();
+>getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
+
 === /sub2/uses.ts ===
 /// <reference types="pkg" preserve="true" />
 export default getInterR();
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).symbols.diff
index 80dd9551b8..f9c1e72ee4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).symbols.diff
@@ -9,23 +9,17 @@
 ->default : Symbol(obj2.default, Decl(uses.ts, 0, 0))
  >const : Symbol(const)
  
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
--
--    interface ImportInterface { _i: any; }
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
+ === /node_modules/pkg/import.d.ts ===
+@@= skipped -12, +10 lines =@@
+ 
+     interface ImportInterface { _i: any; }
+ >ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
 ->_i : Symbol(ImportInterface._i, Decl(import.d.ts, 2, 31))
--
--    function getInterI(): ImportInterface;
-->getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 1, 16))
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
-@@= skipped -25, +10 lines =@@
++>_i : Symbol(_i, Decl(import.d.ts, 2, 31))
+ 
+     function getInterI(): ImportInterface;
+ >getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
+@@= skipped -13, +13 lines =@@
  
      interface RequireInterface { _r: any; }
  >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
@@ -34,14 +28,3 @@
  
      function getInterR(): RequireInterface;
  >getInterR : Symbol(getInterR, Decl(require.d.ts, 2, 43))
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 1, 16))
- }
- === /sub1/uses.ts ===
-+
- /// <reference types="pkg" preserve="true" />
- export default getInterI();
-->getInterI : Symbol(getInterI, Decl(import.d.ts, 2, 42))
--
- === /sub2/uses.ts ===
- /// <reference types="pkg" preserve="true" />
- export default getInterR();
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types
index fc698ca4ed..feec0c28a6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types
@@ -3,19 +3,30 @@
 === /index.ts ===
 // only an esm file can `import` both kinds of files
 import obj1 from "./sub1/uses.js"
->obj1 : any
+>obj1 : ImportInterface
 
 import obj2 from "./sub2/uses.js"
 >obj2 : RequireInterface
 
 export default [obj1, obj2.default] as const;
->[obj1, obj2.default] as const : readonly [any, any]
->[obj1, obj2.default] : readonly [any, any]
->obj1 : any
+>[obj1, obj2.default] as const : readonly [ImportInterface, any]
+>[obj1, obj2.default] : readonly [ImportInterface, any]
+>obj1 : ImportInterface
 >obj2.default : any
 >obj2 : RequireInterface
 >default : any
 
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : typeof global
+
+    interface ImportInterface { _i: any; }
+>_i : any
+
+    function getInterI(): ImportInterface;
+>getInterI : () => ImportInterface
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
@@ -30,8 +41,8 @@ declare global {
 === /sub1/uses.ts ===
 /// <reference types="pkg" preserve="true" />
 export default getInterI();
->getInterI() : any
->getInterI : any
+>getInterI() : ImportInterface
+>getInterI : () => ImportInterface
 
 === /sub2/uses.ts ===
 /// <reference types="pkg" preserve="true" />
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types.diff
index 13c02b455c..815321995c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types.diff
@@ -1,11 +1,7 @@
 --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types
 +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit7(module=nodenext).types
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- // only an esm file can `import` both kinds of files
- import obj1 from "./sub1/uses.js"
-->obj1 : ImportInterface
-+>obj1 : any
+@@= skipped -5, +5 lines =@@
+ >obj1 : ImportInterface
  
  import obj2 from "./sub2/uses.js"
 ->obj2 : typeof obj2
@@ -14,39 +10,15 @@
  export default [obj1, obj2.default] as const;
 ->[obj1, obj2.default] as const : readonly [ImportInterface, RequireInterface]
 ->[obj1, obj2.default] : readonly [ImportInterface, RequireInterface]
-->obj1 : ImportInterface
++>[obj1, obj2.default] as const : readonly [ImportInterface, any]
++>[obj1, obj2.default] : readonly [ImportInterface, any]
+ >obj1 : ImportInterface
 ->obj2.default : RequireInterface
 ->obj2 : typeof obj2
 ->default : RequireInterface
-+>[obj1, obj2.default] as const : readonly [any, any]
-+>[obj1, obj2.default] : readonly [any, any]
-+>obj1 : any
 +>obj2.default : any
 +>obj2 : RequireInterface
 +>default : any
  
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : typeof global
--
--    interface ImportInterface { _i: any; }
-->_i : any
--
--    function getInterI(): ImportInterface;
-->getInterI : () => ImportInterface
--}
- === /node_modules/pkg/require.d.ts ===
+ === /node_modules/pkg/import.d.ts ===
  export {};
- declare global {
-@@= skipped -38, +27 lines =@@
- === /sub1/uses.ts ===
- /// <reference types="pkg" preserve="true" />
- export default getInterI();
-->getInterI() : ImportInterface
-->getInterI : () => ImportInterface
-+>getInterI() : any
-+>getInterI : any
- 
- === /sub2/uses.ts ===
- /// <reference types="pkg" preserve="true" />
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=node16).js
index d876244bf9..df6436da90 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=node16).js
@@ -26,7 +26,8 @@ bar; // bar should resolve while foo should not, since index.js is cjs
 export {};
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" />
 foo;
 bar; // bar should resolve while foo should not, since index.js is cjs
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=node16).js.diff
deleted file mode 100644
index bb3fc4b864..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=node16).js.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride1(module=node16).js
-+++ new.nodeModulesTripleSlashReferenceModeOverride1(module=node16).js
-@@= skipped -25, +25 lines =@@
- export {};
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" />
- foo;
- bar; // bar should resolve while foo should not, since index.js is cjs
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js
index d876244bf9..df6436da90 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js
@@ -26,7 +26,8 @@ bar; // bar should resolve while foo should not, since index.js is cjs
 export {};
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" />
 foo;
 bar; // bar should resolve while foo should not, since index.js is cjs
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js.diff
deleted file mode 100644
index 9fee728470..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js
-+++ new.nodeModulesTripleSlashReferenceModeOverride1(module=nodenext).js
-@@= skipped -25, +25 lines =@@
- export {};
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" />
- foo;
- bar; // bar should resolve while foo should not, since index.js is cjs
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt
index 0d440c1fd9..13991aa135 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt
@@ -1,12 +1,12 @@
-/index.ts(2,1): error TS2304: Cannot find name 'foo'.
+/index.ts(3,1): error TS2304: Cannot find name 'bar'.
 
 
 ==== /index.ts (1 errors) ====
     /// <reference types="pkg" />
     foo; // foo should resolve while bar should not, since index.js is esm
-    ~~~
-!!! error TS2304: Cannot find name 'foo'.
     bar;
+    ~~~
+!!! error TS2304: Cannot find name 'bar'.
     export {};
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt.diff
deleted file mode 100644
index 5a5227ed7b..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeOverride2(module=node16).errors.txt
-@@= skipped -0, +0 lines =@@
--/index.ts(3,1): error TS2304: Cannot find name 'bar'.
-+/index.ts(2,1): error TS2304: Cannot find name 'foo'.
- 
- 
- ==== /index.ts (1 errors) ====
-     /// <reference types="pkg" />
-     foo; // foo should resolve while bar should not, since index.js is esm
--    bar;
-     ~~~
--!!! error TS2304: Cannot find name 'bar'.
-+!!! error TS2304: Cannot find name 'foo'.
-+    bar;
-     export {};
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols
index 834fc88eb4..0f65d258dc 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols
@@ -3,15 +3,15 @@
 === /index.ts ===
 /// <reference types="pkg" />
 foo; // foo should resolve while bar should not, since index.js is esm
-bar;
->bar : Symbol(bar, Decl(require.d.ts, 2, 7))
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
 
+bar;
 export {};
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
->global : Symbol(global, Decl(require.d.ts, 0, 10))
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
 
-    var bar: number;
->bar : Symbol(bar, Decl(require.d.ts, 2, 7))
+    var foo: number;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols.diff
deleted file mode 100644
index f55698a186..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols
-+++ new.nodeModulesTripleSlashReferenceModeOverride2(module=node16).symbols
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- /// <reference types="pkg" />
- foo; // foo should resolve while bar should not, since index.js is esm
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--
- bar;
-+>bar : Symbol(bar, Decl(require.d.ts, 2, 7))
-+
- export {};
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
-+>global : Symbol(global, Decl(require.d.ts, 0, 10))
- 
--    var foo: number;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
-+    var bar: number;
-+>bar : Symbol(bar, Decl(require.d.ts, 2, 7))
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).types
index 235394cd2c..3b7a7ec78e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).types
@@ -3,17 +3,17 @@
 === /index.ts ===
 /// <reference types="pkg" />
 foo; // foo should resolve while bar should not, since index.js is esm
->foo : any
+>foo : number
 
 bar;
->bar : number
+>bar : any
 
 export {};
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
 >global : typeof global
 
-    var bar: number;
->bar : number
+    var foo: number;
+>foo : number
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).types.diff
deleted file mode 100644
index ade2267109..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=node16).types.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride2(module=node16).types
-+++ new.nodeModulesTripleSlashReferenceModeOverride2(module=node16).types
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- /// <reference types="pkg" />
- foo; // foo should resolve while bar should not, since index.js is esm
-->foo : number
-+>foo : any
- 
- bar;
-->bar : any
-+>bar : number
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
- >global : typeof global
- 
--    var foo: number;
-->foo : number
-+    var bar: number;
-+>bar : number
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt
index 0d440c1fd9..13991aa135 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt
@@ -1,12 +1,12 @@
-/index.ts(2,1): error TS2304: Cannot find name 'foo'.
+/index.ts(3,1): error TS2304: Cannot find name 'bar'.
 
 
 ==== /index.ts (1 errors) ====
     /// <reference types="pkg" />
     foo; // foo should resolve while bar should not, since index.js is esm
-    ~~~
-!!! error TS2304: Cannot find name 'foo'.
     bar;
+    ~~~
+!!! error TS2304: Cannot find name 'bar'.
     export {};
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt.diff
deleted file mode 100644
index f9d9617e1d..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).errors.txt
-@@= skipped -0, +0 lines =@@
--/index.ts(3,1): error TS2304: Cannot find name 'bar'.
-+/index.ts(2,1): error TS2304: Cannot find name 'foo'.
- 
- 
- ==== /index.ts (1 errors) ====
-     /// <reference types="pkg" />
-     foo; // foo should resolve while bar should not, since index.js is esm
--    bar;
-     ~~~
--!!! error TS2304: Cannot find name 'bar'.
-+!!! error TS2304: Cannot find name 'foo'.
-+    bar;
-     export {};
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols
index 834fc88eb4..0f65d258dc 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols
@@ -3,15 +3,15 @@
 === /index.ts ===
 /// <reference types="pkg" />
 foo; // foo should resolve while bar should not, since index.js is esm
-bar;
->bar : Symbol(bar, Decl(require.d.ts, 2, 7))
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
 
+bar;
 export {};
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
->global : Symbol(global, Decl(require.d.ts, 0, 10))
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
 
-    var bar: number;
->bar : Symbol(bar, Decl(require.d.ts, 2, 7))
+    var foo: number;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols.diff
deleted file mode 100644
index 9e864906fd..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols
-+++ new.nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).symbols
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- /// <reference types="pkg" />
- foo; // foo should resolve while bar should not, since index.js is esm
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--
- bar;
-+>bar : Symbol(bar, Decl(require.d.ts, 2, 7))
-+
- export {};
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
-+>global : Symbol(global, Decl(require.d.ts, 0, 10))
- 
--    var foo: number;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
-+    var bar: number;
-+>bar : Symbol(bar, Decl(require.d.ts, 2, 7))
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types
index 235394cd2c..3b7a7ec78e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types
@@ -3,17 +3,17 @@
 === /index.ts ===
 /// <reference types="pkg" />
 foo; // foo should resolve while bar should not, since index.js is esm
->foo : any
+>foo : number
 
 bar;
->bar : number
+>bar : any
 
 export {};
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
 >global : typeof global
 
-    var bar: number;
->bar : number
+    var foo: number;
+>foo : number
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types.diff
deleted file mode 100644
index fc2a4dbfa8..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types
-+++ new.nodeModulesTripleSlashReferenceModeOverride2(module=nodenext).types
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- /// <reference types="pkg" />
- foo; // foo should resolve while bar should not, since index.js is esm
-->foo : number
-+>foo : any
- 
- bar;
-->bar : any
-+>bar : number
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
- >global : typeof global
- 
--    var foo: number;
-->foo : number
-+    var bar: number;
-+>bar : number
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt
index 7b6e35b402..3d7f07f277 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt
@@ -1,12 +1,12 @@
-/index.ts(2,1): error TS2304: Cannot find name 'foo'.
+/index.ts(3,1): error TS2304: Cannot find name 'bar'.
 
 
 ==== /index.ts (1 errors) ====
     /// <reference types="pkg" resolution-mode="import" />
     foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
-    ~~~
-!!! error TS2304: Cannot find name 'foo'.
     bar;
+    ~~~
+!!! error TS2304: Cannot find name 'bar'.
     export {};
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt.diff
deleted file mode 100644
index c10cf47040..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeOverride4(module=node16).errors.txt
-@@= skipped -0, +0 lines =@@
--/index.ts(3,1): error TS2304: Cannot find name 'bar'.
-+/index.ts(2,1): error TS2304: Cannot find name 'foo'.
- 
- 
- ==== /index.ts (1 errors) ====
-     /// <reference types="pkg" resolution-mode="import" />
-     foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
--    bar;
-     ~~~
--!!! error TS2304: Cannot find name 'bar'.
-+!!! error TS2304: Cannot find name 'foo'.
-+    bar;
-     export {};
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js
index 9977854299..74346916b2 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js
@@ -26,7 +26,8 @@ bar;
 export {};
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="import" />
 foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
 bar;
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js.diff
deleted file mode 100644
index f2ca5c405d..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).js.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride4(module=node16).js
-+++ new.nodeModulesTripleSlashReferenceModeOverride4(module=node16).js
-@@= skipped -25, +25 lines =@@
- export {};
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" resolution-mode="import" />
- foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
- bar;
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols
index f4e9e98d23..9f7867c7db 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols
@@ -3,15 +3,15 @@
 === /index.ts ===
 /// <reference types="pkg" resolution-mode="import" />
 foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
-bar;
->bar : Symbol(bar, Decl(require.d.ts, 2, 7))
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
 
+bar;
 export {};
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
->global : Symbol(global, Decl(require.d.ts, 0, 10))
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
 
-    var bar: number;
->bar : Symbol(bar, Decl(require.d.ts, 2, 7))
+    var foo: number;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols.diff
deleted file mode 100644
index 42191bd95a..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols
-+++ new.nodeModulesTripleSlashReferenceModeOverride4(module=node16).symbols
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- /// <reference types="pkg" resolution-mode="import" />
- foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--
- bar;
-+>bar : Symbol(bar, Decl(require.d.ts, 2, 7))
-+
- export {};
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
-+>global : Symbol(global, Decl(require.d.ts, 0, 10))
- 
--    var foo: number;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
-+    var bar: number;
-+>bar : Symbol(bar, Decl(require.d.ts, 2, 7))
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types
index 5b446aa108..88eaf3c3aa 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types
@@ -3,17 +3,17 @@
 === /index.ts ===
 /// <reference types="pkg" resolution-mode="import" />
 foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
->foo : any
+>foo : number
 
 bar;
->bar : number
+>bar : any
 
 export {};
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
 >global : typeof global
 
-    var bar: number;
->bar : number
+    var foo: number;
+>foo : number
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types.diff
deleted file mode 100644
index 448f5a90d1..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=node16).types.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride4(module=node16).types
-+++ new.nodeModulesTripleSlashReferenceModeOverride4(module=node16).types
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- /// <reference types="pkg" resolution-mode="import" />
- foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
-->foo : number
-+>foo : any
- 
- bar;
-->bar : any
-+>bar : number
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
- >global : typeof global
- 
--    var foo: number;
-->foo : number
-+    var bar: number;
-+>bar : number
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt
index 7b6e35b402..3d7f07f277 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt
@@ -1,12 +1,12 @@
-/index.ts(2,1): error TS2304: Cannot find name 'foo'.
+/index.ts(3,1): error TS2304: Cannot find name 'bar'.
 
 
 ==== /index.ts (1 errors) ====
     /// <reference types="pkg" resolution-mode="import" />
     foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
-    ~~~
-!!! error TS2304: Cannot find name 'foo'.
     bar;
+    ~~~
+!!! error TS2304: Cannot find name 'bar'.
     export {};
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt.diff
deleted file mode 100644
index 8a37a63048..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).errors.txt
-@@= skipped -0, +0 lines =@@
--/index.ts(3,1): error TS2304: Cannot find name 'bar'.
-+/index.ts(2,1): error TS2304: Cannot find name 'foo'.
- 
- 
- ==== /index.ts (1 errors) ====
-     /// <reference types="pkg" resolution-mode="import" />
-     foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
--    bar;
-     ~~~
--!!! error TS2304: Cannot find name 'bar'.
-+!!! error TS2304: Cannot find name 'foo'.
-+    bar;
-     export {};
- ==== /node_modules/pkg/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js
index 9977854299..74346916b2 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js
@@ -26,7 +26,8 @@ bar;
 export {};
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="import" />
 foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
 bar;
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js.diff
deleted file mode 100644
index 2c6e7c8b45..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js
-+++ new.nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).js
-@@= skipped -25, +25 lines =@@
- export {};
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" resolution-mode="import" />
- foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
- bar;
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols
index f4e9e98d23..9f7867c7db 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols
@@ -3,15 +3,15 @@
 === /index.ts ===
 /// <reference types="pkg" resolution-mode="import" />
 foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
-bar;
->bar : Symbol(bar, Decl(require.d.ts, 2, 7))
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
 
+bar;
 export {};
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
->global : Symbol(global, Decl(require.d.ts, 0, 10))
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
 
-    var bar: number;
->bar : Symbol(bar, Decl(require.d.ts, 2, 7))
+    var foo: number;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols.diff
deleted file mode 100644
index 3b2c4f2e21..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols
-+++ new.nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).symbols
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- /// <reference types="pkg" resolution-mode="import" />
- foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--
- bar;
-+>bar : Symbol(bar, Decl(require.d.ts, 2, 7))
-+
- export {};
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
-+>global : Symbol(global, Decl(require.d.ts, 0, 10))
- 
--    var foo: number;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
-+    var bar: number;
-+>bar : Symbol(bar, Decl(require.d.ts, 2, 7))
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types
index 5b446aa108..88eaf3c3aa 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types
@@ -3,17 +3,17 @@
 === /index.ts ===
 /// <reference types="pkg" resolution-mode="import" />
 foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
->foo : any
+>foo : number
 
 bar;
->bar : number
+>bar : any
 
 export {};
-=== /node_modules/pkg/require.d.ts ===
+=== /node_modules/pkg/import.d.ts ===
 export {};
 declare global {
 >global : typeof global
 
-    var bar: number;
->bar : number
+    var foo: number;
+>foo : number
 }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types.diff
deleted file mode 100644
index b73c83e6ba..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types
-+++ new.nodeModulesTripleSlashReferenceModeOverride4(module=nodenext).types
-@@= skipped -2, +2 lines =@@
- === /index.ts ===
- /// <reference types="pkg" resolution-mode="import" />
- foo; // foo should resolve while bar should not, since even though index.js is cjs, the refernce is esm
-->foo : number
-+>foo : any
- 
- bar;
-->bar : any
-+>bar : number
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
-+=== /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
- >global : typeof global
- 
--    var foo: number;
-->foo : number
-+    var bar: number;
-+>bar : number
- }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt
deleted file mode 100644
index f326c8740d..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/index.ts(5,1): error TS2304: Cannot find name 'foo'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" resolution-mode="import" />
-    /// <reference types="pkg" resolution-mode="require" />
-    // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
-    // references above.
-    foo;
-    ~~~
-!!! error TS2304: Cannot find name 'foo'.
-    bar;
-    export {};
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        var foo: number;
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        var bar: number;
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt.diff
deleted file mode 100644
index 47d6d62d98..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeOverride5(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(5,1): error TS2304: Cannot find name 'foo'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" resolution-mode="import" />
-+    /// <reference types="pkg" resolution-mode="require" />
-+    // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
-+    // references above.
-+    foo;
-+    ~~~
-+!!! error TS2304: Cannot find name 'foo'.
-+    bar;
-+    export {};
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        var foo: number;
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        var bar: number;
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).js
index 0ba99760e4..0c37dc00e4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).js
@@ -29,10 +29,11 @@ bar;
 export {};
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="import" />
 /// <reference types="pkg" resolution-mode="require" />
 // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
 // references above.
 foo;
 bar;
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).js.diff
deleted file mode 100644
index b95ec00b38..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).js.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride5(module=node16).js
-+++ new.nodeModulesTripleSlashReferenceModeOverride5(module=node16).js
-@@= skipped -28, +28 lines =@@
- export {};
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" resolution-mode="import" />
- /// <reference types="pkg" resolution-mode="require" />
- // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
- // references above.
- foo;
- bar;
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols
index 900f3cdfe2..1e0a2417e6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols
@@ -6,10 +6,20 @@
 // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
 // references above.
 foo;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
+
 bar;
 >bar : Symbol(bar, Decl(require.d.ts, 2, 7))
 
 export {};
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
+
+    var foo: number;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols.diff
deleted file mode 100644
index 4c853682a8..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols
-+++ new.nodeModulesTripleSlashReferenceModeOverride5(module=node16).symbols
-@@= skipped -5, +5 lines =@@
- // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
- // references above.
- foo;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--
- bar;
- >bar : Symbol(bar, Decl(require.d.ts, 2, 7))
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
--
--    var foo: number;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).types
index 7bb23259ab..4d2f714ca5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).types
@@ -6,12 +6,20 @@
 // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
 // references above.
 foo;
->foo : any
+>foo : number
 
 bar;
 >bar : number
 
 export {};
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : typeof global
+
+    var foo: number;
+>foo : number
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).types.diff
deleted file mode 100644
index 2df801e7f6..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=node16).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride5(module=node16).types
-+++ new.nodeModulesTripleSlashReferenceModeOverride5(module=node16).types
-@@= skipped -5, +5 lines =@@
- // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
- // references above.
- foo;
-->foo : number
-+>foo : any
- 
- bar;
- >bar : number
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : typeof global
--
--    var foo: number;
-->foo : number
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt
deleted file mode 100644
index f326c8740d..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/index.ts(5,1): error TS2304: Cannot find name 'foo'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" resolution-mode="import" />
-    /// <reference types="pkg" resolution-mode="require" />
-    // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
-    // references above.
-    foo;
-    ~~~
-!!! error TS2304: Cannot find name 'foo'.
-    bar;
-    export {};
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        var foo: number;
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        var bar: number;
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt.diff
deleted file mode 100644
index 0493eac720..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(5,1): error TS2304: Cannot find name 'foo'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" resolution-mode="import" />
-+    /// <reference types="pkg" resolution-mode="require" />
-+    // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
-+    // references above.
-+    foo;
-+    ~~~
-+!!! error TS2304: Cannot find name 'foo'.
-+    bar;
-+    export {};
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        var foo: number;
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        var bar: number;
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js
index 0ba99760e4..0c37dc00e4 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js
@@ -29,10 +29,11 @@ bar;
 export {};
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="import" />
 /// <reference types="pkg" resolution-mode="require" />
 // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
 // references above.
 foo;
 bar;
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js.diff
deleted file mode 100644
index fce7e0074f..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js
-+++ new.nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).js
-@@= skipped -28, +28 lines =@@
- export {};
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" resolution-mode="import" />
- /// <reference types="pkg" resolution-mode="require" />
- // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
- // references above.
- foo;
- bar;
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols
index 900f3cdfe2..1e0a2417e6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols
@@ -6,10 +6,20 @@
 // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
 // references above.
 foo;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
+
 bar;
 >bar : Symbol(bar, Decl(require.d.ts, 2, 7))
 
 export {};
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
+
+    var foo: number;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols.diff
deleted file mode 100644
index 469b72a557..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols
-+++ new.nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).symbols
-@@= skipped -5, +5 lines =@@
- // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
- // references above.
- foo;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--
- bar;
- >bar : Symbol(bar, Decl(require.d.ts, 2, 7))
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
--
--    var foo: number;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types
index 7bb23259ab..4d2f714ca5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types
@@ -6,12 +6,20 @@
 // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
 // references above.
 foo;
->foo : any
+>foo : number
 
 bar;
 >bar : number
 
 export {};
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : typeof global
+
+    var foo: number;
+>foo : number
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types.diff
deleted file mode 100644
index 6b8dad0a17..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types
-+++ new.nodeModulesTripleSlashReferenceModeOverride5(module=nodenext).types
-@@= skipped -5, +5 lines =@@
- // Both `foo` and `bar` should resolve, as _both_ entrypoints are included by the two
- // references above.
- foo;
-->foo : number
-+>foo : any
- 
- bar;
- >bar : number
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : typeof global
--
--    var foo: number;
-->foo : number
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js
index 39ba674fa0..09540ae8ab 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js
@@ -26,7 +26,8 @@ bar;
 export {};
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="esm"/>
 foo; // bad resolution mode, which resolves is arbitrary
 bar;
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js.diff
deleted file mode 100644
index d314e33262..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js
-+++ new.nodeModulesTripleSlashReferenceModeOverrideModeError(module=node16).js
-@@= skipped -25, +25 lines =@@
- export {};
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" resolution-mode="esm"/>
- foo; // bad resolution mode, which resolves is arbitrary
- bar;
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js
index 39ba674fa0..09540ae8ab 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js
@@ -26,7 +26,8 @@ bar;
 export {};
 
 //// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference types="pkg" resolution-mode="esm"/>
 foo; // bad resolution mode, which resolves is arbitrary
 bar;
-export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js.diff
deleted file mode 100644
index 9b094eb918..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js
-+++ new.nodeModulesTripleSlashReferenceModeOverrideModeError(module=nodenext).js
-@@= skipped -25, +25 lines =@@
- export {};
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
- /// <reference types="pkg" resolution-mode="esm"/>
- foo; // bad resolution mode, which resolves is arbitrary
- bar;
-+export {};
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt
deleted file mode 100644
index 0edc94c7ce..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-/index.ts(3,1): error TS2304: Cannot find name 'foo'.
-
-
-==== /index.ts (1 errors) ====
-    /// <reference types="pkg" resolution-mode="require" />
-    /// <reference types="pkg" resolution-mode="import" />
-    foo;
-    ~~~
-!!! error TS2304: Cannot find name 'foo'.
-    bar;
-    export {};
-==== /node_modules/pkg/package.json (0 errors) ====
-    {
-        "name": "pkg",
-        "version": "0.0.1",
-        "exports": {
-            "import": "./import.js",
-            "require": "./require.js"
-        }
-    }
-==== /node_modules/pkg/import.d.ts (0 errors) ====
-    export {};
-    declare global {
-        var foo: number;
-    }
-==== /node_modules/pkg/require.d.ts (0 errors) ====
-    export {};
-    declare global {
-        var bar: number;
-    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt.diff
deleted file mode 100644
index b364e5e18f..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt
-+++ new.nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/index.ts(3,1): error TS2304: Cannot find name 'foo'.
-+
-+
-+==== /index.ts (1 errors) ====
-+    /// <reference types="pkg" resolution-mode="require" />
-+    /// <reference types="pkg" resolution-mode="import" />
-+    foo;
-+    ~~~
-+!!! error TS2304: Cannot find name 'foo'.
-+    bar;
-+    export {};
-+==== /node_modules/pkg/package.json (0 errors) ====
-+    {
-+        "name": "pkg",
-+        "version": "0.0.1",
-+        "exports": {
-+            "import": "./import.js",
-+            "require": "./require.js"
-+        }
-+    }
-+==== /node_modules/pkg/import.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        var foo: number;
-+    }
-+==== /node_modules/pkg/require.d.ts (0 errors) ====
-+    export {};
-+    declare global {
-+        var bar: number;
-+    }
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols
index 77afd6e0bf..a7da6602ad 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols
@@ -4,10 +4,20 @@
 /// <reference types="pkg" resolution-mode="require" />
 /// <reference types="pkg" resolution-mode="import" />
 foo;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
+
 bar;
 >bar : Symbol(bar, Decl(require.d.ts, 2, 7))
 
 export {};
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : Symbol(global, Decl(import.d.ts, 0, 10))
+
+    var foo: number;
+>foo : Symbol(foo, Decl(import.d.ts, 2, 7))
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols.diff
deleted file mode 100644
index 89b253f4c2..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols
-+++ new.nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.symbols
-@@= skipped -3, +3 lines =@@
- /// <reference types="pkg" resolution-mode="require" />
- /// <reference types="pkg" resolution-mode="import" />
- foo;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--
- bar;
- >bar : Symbol(bar, Decl(require.d.ts, 2, 7))
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : Symbol(global, Decl(import.d.ts, 0, 10))
--
--    var foo: number;
-->foo : Symbol(foo, Decl(import.d.ts, 2, 7))
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types
index 565b4addb4..79c8972776 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types
@@ -4,12 +4,20 @@
 /// <reference types="pkg" resolution-mode="require" />
 /// <reference types="pkg" resolution-mode="import" />
 foo;
->foo : any
+>foo : number
 
 bar;
 >bar : number
 
 export {};
+=== /node_modules/pkg/import.d.ts ===
+export {};
+declare global {
+>global : typeof global
+
+    var foo: number;
+>foo : number
+}
 === /node_modules/pkg/require.d.ts ===
 export {};
 declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types.diff
deleted file mode 100644
index 20ce5c8a4d..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types
-+++ new.nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.types
-@@= skipped -3, +3 lines =@@
- /// <reference types="pkg" resolution-mode="require" />
- /// <reference types="pkg" resolution-mode="import" />
- foo;
-->foo : number
-+>foo : any
- 
- bar;
- >bar : number
- 
- export {};
--=== /node_modules/pkg/import.d.ts ===
--export {};
--declare global {
-->global : typeof global
--
--    var foo: number;
-->foo : number
--}
- === /node_modules/pkg/require.d.ts ===
- export {};
- declare global {
diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node16).errors.txt
new file mode 100644
index 0000000000..0c45f9b8f4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node16).errors.txt
@@ -0,0 +1,24 @@
+index.cts(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as self from "package";
+    self;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as self from "package";
+    self;
+==== index.cts (1 errors) ====
+    // esm format file
+    import * as self from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+    self;
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node16).errors.txt.diff
deleted file mode 100644
index a5333d5cdf..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- old.nodePackageSelfName(module=node16).errors.txt
-+++ new.nodePackageSelfName(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as self from "package";
--    self;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as self from "package";
--    self;
--==== index.cts (1 errors) ====
--    // esm format file
--    import * as self from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--    self;
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=nodenext).errors.txt
new file mode 100644
index 0000000000..0c45f9b8f4
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=nodenext).errors.txt
@@ -0,0 +1,24 @@
+index.cts(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as self from "package";
+    self;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as self from "package";
+    self;
+==== index.cts (1 errors) ====
+    // esm format file
+    import * as self from "package";
+                          ~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+    self;
+==== package.json (0 errors) ====
+    {
+        "name": "package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=nodenext).errors.txt.diff
deleted file mode 100644
index 8e2b4b24c5..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- old.nodePackageSelfName(module=nodenext).errors.txt
-+++ new.nodePackageSelfName(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as self from "package";
--    self;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as self from "package";
--    self;
--==== index.cts (1 errors) ====
--    // esm format file
--    import * as self from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--    self;
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node16).errors.txt
new file mode 100644
index 0000000000..2c0b58848c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node16).errors.txt
@@ -0,0 +1,24 @@
+index.cts(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("@scope/package")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as self from "@scope/package";
+    self;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as self from "@scope/package";
+    self;
+==== index.cts (1 errors) ====
+    // cjs format file
+    import * as self from "@scope/package";
+                          ~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("@scope/package")' call instead.
+    self;
+==== package.json (0 errors) ====
+    {
+        "name": "@scope/package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node16).errors.txt.diff
deleted file mode 100644
index e52b0c89c2..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- old.nodePackageSelfNameScoped(module=node16).errors.txt
-+++ new.nodePackageSelfNameScoped(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("@scope/package")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as self from "@scope/package";
--    self;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as self from "@scope/package";
--    self;
--==== index.cts (1 errors) ====
--    // cjs format file
--    import * as self from "@scope/package";
--                          ~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("@scope/package")' call instead.
--    self;
--==== package.json (0 errors) ====
--    {
--        "name": "@scope/package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=nodenext).errors.txt
new file mode 100644
index 0000000000..2c0b58848c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=nodenext).errors.txt
@@ -0,0 +1,24 @@
+index.cts(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("@scope/package")' call instead.
+
+
+==== index.ts (0 errors) ====
+    // esm format file
+    import * as self from "@scope/package";
+    self;
+==== index.mts (0 errors) ====
+    // esm format file
+    import * as self from "@scope/package";
+    self;
+==== index.cts (1 errors) ====
+    // cjs format file
+    import * as self from "@scope/package";
+                          ~~~~~~~~~~~~~~~~
+!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("@scope/package")' call instead.
+    self;
+==== package.json (0 errors) ====
+    {
+        "name": "@scope/package",
+        "private": true,
+        "type": "module",
+        "exports": "./index.js"
+    }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=nodenext).errors.txt.diff
deleted file mode 100644
index 59b4ae50b0..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- old.nodePackageSelfNameScoped(module=nodenext).errors.txt
-+++ new.nodePackageSelfNameScoped(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cts(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("@scope/package")' call instead.
--
--
--==== index.ts (0 errors) ====
--    // esm format file
--    import * as self from "@scope/package";
--    self;
--==== index.mts (0 errors) ====
--    // esm format file
--    import * as self from "@scope/package";
--    self;
--==== index.cts (1 errors) ====
--    // cjs format file
--    import * as self from "@scope/package";
--                          ~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("@scope/package")' call instead.
--    self;
--==== package.json (0 errors) ====
--    {
--        "name": "@scope/package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/packageJsonMain.errors.txt b/testdata/baselines/reference/submodule/conformance/packageJsonMain.errors.txt
deleted file mode 100644
index 1e69be7d5e..0000000000
--- a/testdata/baselines/reference/submodule/conformance/packageJsonMain.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-/a.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-/a.ts(2,22): error TS2307: Cannot find module 'bar' or its corresponding type declarations.
-/a.ts(3,22): error TS2307: Cannot find module 'baz' or its corresponding type declarations.
-
-
-==== /a.ts (3 errors) ====
-    import foo = require("foo");
-                         ~~~~~
-!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-    import bar = require("bar");
-                         ~~~~~
-!!! error TS2307: Cannot find module 'bar' or its corresponding type declarations.
-    import baz = require("baz");
-                         ~~~~~
-!!! error TS2307: Cannot find module 'baz' or its corresponding type declarations.
-    foo + bar + baz;
-    
-==== /node_modules/foo/package.json (0 errors) ====
-    { "main": "oof" }
-    
-==== /node_modules/foo/oof.js (0 errors) ====
-    module.exports = 0;
-    
-==== /node_modules/bar/package.json (0 errors) ====
-    { "main": "rab.js" }
-    
-==== /node_modules/bar/rab.js (0 errors) ====
-    module.exports = 0;
-    
-==== /node_modules/baz/package.json (0 errors) ====
-    { "main": "zab" }
-    
-==== /node_modules/baz/zab/index.js (0 errors) ====
-    module.exports = 0;
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/packageJsonMain.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/packageJsonMain.errors.txt.diff
deleted file mode 100644
index a89c3e14a3..0000000000
--- a/testdata/baselines/reference/submodule/conformance/packageJsonMain.errors.txt.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- old.packageJsonMain.errors.txt
-+++ new.packageJsonMain.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/a.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-+/a.ts(2,22): error TS2307: Cannot find module 'bar' or its corresponding type declarations.
-+/a.ts(3,22): error TS2307: Cannot find module 'baz' or its corresponding type declarations.
-+
-+
-+==== /a.ts (3 errors) ====
-+    import foo = require("foo");
-+                         ~~~~~
-+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-+    import bar = require("bar");
-+                         ~~~~~
-+!!! error TS2307: Cannot find module 'bar' or its corresponding type declarations.
-+    import baz = require("baz");
-+                         ~~~~~
-+!!! error TS2307: Cannot find module 'baz' or its corresponding type declarations.
-+    foo + bar + baz;
-+    
-+==== /node_modules/foo/package.json (0 errors) ====
-+    { "main": "oof" }
-+    
-+==== /node_modules/foo/oof.js (0 errors) ====
-+    module.exports = 0;
-+    
-+==== /node_modules/bar/package.json (0 errors) ====
-+    { "main": "rab.js" }
-+    
-+==== /node_modules/bar/rab.js (0 errors) ====
-+    module.exports = 0;
-+    
-+==== /node_modules/baz/package.json (0 errors) ====
-+    { "main": "zab" }
-+    
-+==== /node_modules/baz/zab/index.js (0 errors) ====
-+    module.exports = 0;
-+    
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).symbols b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).symbols
index cbb2221d92..3b36b51d0a 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).symbols
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).symbols
@@ -11,11 +11,11 @@ export declare const x: "script";
 === /app.ts ===
 type Default = typeof import("foo").x;
 >Default : Symbol(Default, Decl(app.ts, 0, 0))
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 
 type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
 >Import : Symbol(Import, Decl(app.ts, 0, 38))
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 
 type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
 >Require : Symbol(Require, Decl(app.ts, 1, 82))
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).symbols.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).symbols.diff
deleted file mode 100644
index 7f56618aa9..0000000000
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).symbols.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.resolutionModeImportType1(moduleresolution=bundler).symbols
-+++ new.resolutionModeImportType1(moduleresolution=bundler).symbols
-@@= skipped -10, +10 lines =@@
- === /app.ts ===
- type Default = typeof import("foo").x;
- >Default : Symbol(Default, Decl(app.ts, 0, 0))
-->x : Symbol(x, Decl(index.d.mts, 0, 20))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
- 
- type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
- >Import : Symbol(Import, Decl(app.ts, 0, 38))
-->x : Symbol(x, Decl(index.d.mts, 0, 20))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
- 
- type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
- >Require : Symbol(Require, Decl(app.ts, 1, 82))
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).types b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).types
index 4c1230f56a..376327dbeb 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).types
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).types
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 type Default = typeof import("foo").x;
->Default : "script"
+>Default : "module"
 >x : any
 
 type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
->Import : "script"
+>Import : "module"
 >x : any
 
 type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).types.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).types.diff
index daa054a8af..a67f21321e 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=bundler).types.diff
@@ -1,18 +1,15 @@
 --- old.resolutionModeImportType1(moduleresolution=bundler).types
 +++ new.resolutionModeImportType1(moduleresolution=bundler).types
-@@= skipped -9, +9 lines =@@
- 
+@@= skipped -10, +10 lines =@@
  === /app.ts ===
  type Default = typeof import("foo").x;
-->Default : "module"
+ >Default : "module"
 ->x : error
-+>Default : "script"
 +>x : any
  
  type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
-->Import : "module"
+ >Import : "module"
 ->x : error
-+>Import : "script"
 +>x : any
  
  type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols
index cbb2221d92..3b36b51d0a 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols
@@ -11,11 +11,11 @@ export declare const x: "script";
 === /app.ts ===
 type Default = typeof import("foo").x;
 >Default : Symbol(Default, Decl(app.ts, 0, 0))
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 
 type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
 >Import : Symbol(Import, Decl(app.ts, 0, 38))
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 
 type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
 >Require : Symbol(Require, Decl(app.ts, 1, 82))
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols.diff
index 8c60a03328..f8a1423047 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols.diff
@@ -4,11 +4,11 @@
  === /app.ts ===
  type Default = typeof import("foo").x;
  >Default : Symbol(Default, Decl(app.ts, 0, 0))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  
  type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
  >Import : Symbol(Import, Decl(app.ts, 0, 38))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  
  type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
  >Require : Symbol(Require, Decl(app.ts, 1, 82))
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types
index 4c1230f56a..376327dbeb 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 type Default = typeof import("foo").x;
->Default : "script"
+>Default : "module"
 >x : any
 
 type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
->Import : "script"
+>Import : "module"
 >x : any
 
 type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types.diff
index af8fae1ee4..71c5502352 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types.diff
@@ -5,12 +5,12 @@
  === /app.ts ===
  type Default = typeof import("foo").x;
 ->Default : any
-+>Default : "script"
++>Default : "module"
  >x : any
  
  type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
 ->Import : any
-+>Import : "script"
++>Import : "module"
  >x : any
  
  type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).symbols b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).symbols
index cbb2221d92..3b36b51d0a 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).symbols
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).symbols
@@ -11,11 +11,11 @@ export declare const x: "script";
 === /app.ts ===
 type Default = typeof import("foo").x;
 >Default : Symbol(Default, Decl(app.ts, 0, 0))
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 
 type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
 >Import : Symbol(Import, Decl(app.ts, 0, 38))
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 
 type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
 >Require : Symbol(Require, Decl(app.ts, 1, 82))
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).symbols.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).symbols.diff
index fe3072ffb1..a4f3ede84c 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).symbols.diff
@@ -4,12 +4,7 @@
  === /app.ts ===
  type Default = typeof import("foo").x;
  >Default : Symbol(Default, Decl(app.ts, 0, 0))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  
  type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
  >Import : Symbol(Import, Decl(app.ts, 0, 38))
-->x : Symbol(x, Decl(index.d.mts, 0, 20))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
- 
- type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
- >Require : Symbol(Require, Decl(app.ts, 1, 82))
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).types b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).types
index 4c1230f56a..376327dbeb 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).types
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).types
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 type Default = typeof import("foo").x;
->Default : "script"
+>Default : "module"
 >x : any
 
 type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
->Import : "script"
+>Import : "module"
 >x : any
 
 type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).types.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).types.diff
index 6a9712256a..dae457d335 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=node10).types.diff
@@ -5,12 +5,7 @@
  === /app.ts ===
  type Default = typeof import("foo").x;
 ->Default : any
-+>Default : "script"
++>Default : "module"
  >x : any
  
  type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x;
-->Import : "module"
-+>Import : "script"
- >x : any
- 
- type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x;
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash1.errors.txt b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash1.errors.txt
index fb6c4bade6..963acbfbf2 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash1.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash1.errors.txt
@@ -1,4 +1,4 @@
-/app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
+/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
 
 
 ==== /tsconfig.json (0 errors) ====
@@ -14,9 +14,10 @@
 ==== /app.ts (1 errors) ====
     /// <reference types="foo" />
     MODULE; // ok
-    ~~~~~~
-!!! error TS2304: Cannot find name 'MODULE'.
     SCRIPT; // error
+    ~~~~~~
+!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
+!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here.
     
 ==== /node_modules/@types/foo/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash1.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash1.errors.txt.diff
deleted file mode 100644
index 7b87647896..0000000000
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash1.errors.txt.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- old.resolutionModeTripleSlash1.errors.txt
-+++ new.resolutionModeTripleSlash1.errors.txt
-@@= skipped -0, +0 lines =@@
--/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
-+/app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
- 
- 
- ==== /tsconfig.json (0 errors) ====
-@@= skipped -13, +13 lines =@@
- ==== /app.ts (1 errors) ====
-     /// <reference types="foo" />
-     MODULE; // ok
--    SCRIPT; // error
-     ~~~~~~
--!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
--!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here.
-+!!! error TS2304: Cannot find name 'MODULE'.
-+    SCRIPT; // error
-     
- ==== /node_modules/@types/foo/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash3.errors.txt b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash3.errors.txt
index 8522d5a7a0..e0f57ac5b8 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash3.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash3.errors.txt
@@ -1,4 +1,4 @@
-/app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
+/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
 
 
 ==== /tsconfig.json (0 errors) ====
@@ -14,9 +14,10 @@
 ==== /app.ts (1 errors) ====
     /// <reference types="foo" resolution-mode="import" />
     MODULE; // ok
-    ~~~~~~
-!!! error TS2304: Cannot find name 'MODULE'.
     SCRIPT; // error
+    ~~~~~~
+!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
+!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here.
     
 ==== /node_modules/@types/foo/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash3.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash3.errors.txt.diff
deleted file mode 100644
index 2e763e18b9..0000000000
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash3.errors.txt.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- old.resolutionModeTripleSlash3.errors.txt
-+++ new.resolutionModeTripleSlash3.errors.txt
-@@= skipped -0, +0 lines =@@
--/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
-+/app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
- 
- 
- ==== /tsconfig.json (0 errors) ====
-@@= skipped -13, +13 lines =@@
- ==== /app.ts (1 errors) ====
-     /// <reference types="foo" resolution-mode="import" />
-     MODULE; // ok
--    SCRIPT; // error
-     ~~~~~~
--!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
--!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here.
-+!!! error TS2304: Cannot find name 'MODULE'.
-+    SCRIPT; // error
-     
- ==== /node_modules/@types/foo/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt
index 07724df4cf..d508d82d20 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt
@@ -1,4 +1,4 @@
-/app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
+/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
 
 
 ==== /tsconfig.json (0 errors) ====
@@ -14,9 +14,10 @@
 ==== /app.ts (1 errors) ====
     /// <reference types="foo" />
     MODULE; // error
-    ~~~~~~
-!!! error TS2304: Cannot find name 'MODULE'.
     SCRIPT; // error
+    ~~~~~~
+!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
+!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here.
     
 ==== /node_modules/@types/foo/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt.diff
index e17cf8b321..11858a859e 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt.diff
@@ -2,11 +2,10 @@
 +++ new.resolutionModeTripleSlash4.errors.txt
 @@= skipped -0, +0 lines =@@
 -/app.ts(1,23): error TS2688: Cannot find type definition file for 'foo'.
- /app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
--/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
+-/app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
+ /app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
  
  
- ==== /tsconfig.json (0 errors) ====
 @@= skipped -12, +10 lines =@@
        }
      }
@@ -17,12 +16,8 @@
 -                          ~~~
 -!!! error TS2688: Cannot find type definition file for 'foo'.
      MODULE; // error
-     ~~~~~~
- !!! error TS2304: Cannot find name 'MODULE'.
-     SCRIPT; // error
 -    ~~~~~~
--!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
--!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here.
-     
- ==== /node_modules/@types/foo/package.json (0 errors) ====
-     {
+-!!! error TS2304: Cannot find name 'MODULE'.
+     SCRIPT; // error
+     ~~~~~~
+ !!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt
index c42b8d5251..6618295aa9 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt
@@ -1,4 +1,4 @@
-/app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
+/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
 
 
 ==== /tsconfig.json (0 errors) ====
@@ -14,9 +14,10 @@
 ==== /app.ts (1 errors) ====
     /// <reference types="foo" resolution-mode="import" />
     MODULE; // ok
-    ~~~~~~
-!!! error TS2304: Cannot find name 'MODULE'.
     SCRIPT; // error
+    ~~~~~~
+!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
+!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here.
     
 ==== /node_modules/@types/foo/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt.diff
deleted file mode 100644
index d22d2f3258..0000000000
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- old.resolutionModeTripleSlash5.errors.txt
-+++ new.resolutionModeTripleSlash5.errors.txt
-@@= skipped -0, +0 lines =@@
--/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
-+/app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
- 
- 
- ==== /tsconfig.json (0 errors) ====
-@@= skipped -13, +13 lines =@@
- ==== /app.ts (1 errors) ====
-     /// <reference types="foo" resolution-mode="import" />
-     MODULE; // ok
--    SCRIPT; // error
-     ~~~~~~
--!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
--!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here.
-+!!! error TS2304: Cannot find name 'MODULE'.
-+    SCRIPT; // error
-     
- ==== /node_modules/@types/foo/package.json (0 errors) ====
-     {
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).symbols b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).symbols
index ace9253661..a2d973499f 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).symbols
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).symbols
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 import type { x as Default } from "foo";
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 >Default : Symbol(Default, Decl(app.ts, 0, 13))
 
 import type { x as Import } from "foo" assert { "resolution-mode": "import" };
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 >Import : Symbol(Import, Decl(app.ts, 1, 13))
 
 import type { x as Require } from "foo" assert { "resolution-mode": "require" };
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).symbols.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).symbols.diff
index 9e680d123b..0edf040556 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).symbols.diff
@@ -5,12 +5,12 @@
  === /app.ts ===
  import type { x as Default } from "foo";
 ->x : Symbol(Default, Decl(index.d.mts, 0, 20))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  >Default : Symbol(Default, Decl(app.ts, 0, 13))
  
  import type { x as Import } from "foo" assert { "resolution-mode": "import" };
 ->x : Symbol(Default, Decl(index.d.mts, 0, 20))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  >Import : Symbol(Import, Decl(app.ts, 1, 13))
  
  import type { x as Require } from "foo" assert { "resolution-mode": "require" };
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).types b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).types
index 9b29bc918c..404083065a 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).types
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).types
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 import type { x as Default } from "foo";
->x : "script"
+>x : "module"
 >Default : any
 
 import type { x as Import } from "foo" assert { "resolution-mode": "import" };
->x : "script"
+>x : "module"
 >Import : any
 
 import type { x as Require } from "foo" assert { "resolution-mode": "require" };
@@ -22,12 +22,12 @@ import type { x as Require } from "foo" assert { "resolution-mode": "require" };
 >Require : any
 
 type _Default = typeof Default;
->_Default : "script"
->Default : "script"
+>_Default : "module"
+>Default : "module"
 
 type _Import = typeof Import;
->_Import : "script"
->Import : "script"
+>_Import : "module"
+>Import : "module"
 
 type _Require = typeof Require;
 >_Require : "script"
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).types.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).types.diff
deleted file mode 100644
index 95bd8b1cd7..0000000000
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=bundler).types.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- old.resolutionModeTypeOnlyImport1(moduleresolution=bundler).types
-+++ new.resolutionModeTypeOnlyImport1(moduleresolution=bundler).types
-@@= skipped -9, +9 lines =@@
- 
- === /app.ts ===
- import type { x as Default } from "foo";
-->x : "module"
-+>x : "script"
- >Default : any
- 
- import type { x as Import } from "foo" assert { "resolution-mode": "import" };
-->x : "module"
-+>x : "script"
- >Import : any
- 
- import type { x as Require } from "foo" assert { "resolution-mode": "require" };
-@@= skipped -12, +12 lines =@@
- >Require : any
- 
- type _Default = typeof Default;
-->_Default : "module"
-->Default : "module"
-+>_Default : "script"
-+>Default : "script"
- 
- type _Import = typeof Import;
-->_Import : "module"
-->Import : "module"
-+>_Import : "script"
-+>Import : "script"
- 
- type _Require = typeof Require;
- >_Require : "script"
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols
index ace9253661..a2d973499f 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 import type { x as Default } from "foo";
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 >Default : Symbol(Default, Decl(app.ts, 0, 13))
 
 import type { x as Import } from "foo" assert { "resolution-mode": "import" };
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 >Import : Symbol(Import, Decl(app.ts, 1, 13))
 
 import type { x as Require } from "foo" assert { "resolution-mode": "require" };
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols.diff
index 5c790a2d18..b499915978 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols.diff
@@ -4,11 +4,11 @@
  
  === /app.ts ===
  import type { x as Default } from "foo";
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  >Default : Symbol(Default, Decl(app.ts, 0, 13))
  
  import type { x as Import } from "foo" assert { "resolution-mode": "import" };
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  >Import : Symbol(Import, Decl(app.ts, 1, 13))
  
  import type { x as Require } from "foo" assert { "resolution-mode": "require" };
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types
index 9b29bc918c..404083065a 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 import type { x as Default } from "foo";
->x : "script"
+>x : "module"
 >Default : any
 
 import type { x as Import } from "foo" assert { "resolution-mode": "import" };
->x : "script"
+>x : "module"
 >Import : any
 
 import type { x as Require } from "foo" assert { "resolution-mode": "require" };
@@ -22,12 +22,12 @@ import type { x as Require } from "foo" assert { "resolution-mode": "require" };
 >Require : any
 
 type _Default = typeof Default;
->_Default : "script"
->Default : "script"
+>_Default : "module"
+>Default : "module"
 
 type _Import = typeof Import;
->_Import : "script"
->Import : "script"
+>_Import : "module"
+>Import : "module"
 
 type _Require = typeof Require;
 >_Require : "script"
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types.diff
index ab74a61b82..4f03ffef2e 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types.diff
@@ -5,12 +5,12 @@
  === /app.ts ===
  import type { x as Default } from "foo";
 ->x : any
-+>x : "script"
++>x : "module"
  >Default : any
  
  import type { x as Import } from "foo" assert { "resolution-mode": "import" };
 ->x : any
-+>x : "script"
++>x : "module"
  >Import : any
  
  import type { x as Require } from "foo" assert { "resolution-mode": "require" };
@@ -21,14 +21,14 @@
  type _Default = typeof Default;
 ->_Default : any
 ->Default : any
-+>_Default : "script"
-+>Default : "script"
++>_Default : "module"
++>Default : "module"
  
  type _Import = typeof Import;
 ->_Import : any
 ->Import : any
-+>_Import : "script"
-+>Import : "script"
++>_Import : "module"
++>Import : "module"
  
  type _Require = typeof Require;
 ->_Require : any
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).symbols b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).symbols
index ace9253661..a2d973499f 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).symbols
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).symbols
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 import type { x as Default } from "foo";
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 >Default : Symbol(Default, Decl(app.ts, 0, 13))
 
 import type { x as Import } from "foo" assert { "resolution-mode": "import" };
->x : Symbol(x, Decl(index.d.cts, 0, 20))
+>x : Symbol(x, Decl(index.d.mts, 0, 20))
 >Import : Symbol(Import, Decl(app.ts, 1, 13))
 
 import type { x as Require } from "foo" assert { "resolution-mode": "require" };
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).symbols.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).symbols.diff
index 7c4ca8d5ae..455e07469f 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).symbols.diff
@@ -4,12 +4,12 @@
  
  === /app.ts ===
  import type { x as Default } from "foo";
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  >Default : Symbol(Default, Decl(app.ts, 0, 13))
  
  import type { x as Import } from "foo" assert { "resolution-mode": "import" };
 ->x : Symbol(Import, Decl(index.d.mts, 0, 20))
-+>x : Symbol(x, Decl(index.d.cts, 0, 20))
++>x : Symbol(x, Decl(index.d.mts, 0, 20))
  >Import : Symbol(Import, Decl(app.ts, 1, 13))
  
  import type { x as Require } from "foo" assert { "resolution-mode": "require" };
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).types b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).types
index 9b29bc918c..404083065a 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).types
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).types
@@ -10,11 +10,11 @@ export declare const x: "script";
 
 === /app.ts ===
 import type { x as Default } from "foo";
->x : "script"
+>x : "module"
 >Default : any
 
 import type { x as Import } from "foo" assert { "resolution-mode": "import" };
->x : "script"
+>x : "module"
 >Import : any
 
 import type { x as Require } from "foo" assert { "resolution-mode": "require" };
@@ -22,12 +22,12 @@ import type { x as Require } from "foo" assert { "resolution-mode": "require" };
 >Require : any
 
 type _Default = typeof Default;
->_Default : "script"
->Default : "script"
+>_Default : "module"
+>Default : "module"
 
 type _Import = typeof Import;
->_Import : "script"
->Import : "script"
+>_Import : "module"
+>Import : "module"
 
 type _Require = typeof Require;
 >_Require : "script"
diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).types.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).types.diff
index e5969edbcb..8000a6abbe 100644
--- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=node10).types.diff
@@ -5,29 +5,18 @@
  === /app.ts ===
  import type { x as Default } from "foo";
 ->x : any
-+>x : "script"
++>x : "module"
  >Default : any
  
  import type { x as Import } from "foo" assert { "resolution-mode": "import" };
-->x : "module"
-+>x : "script"
- >Import : any
- 
- import type { x as Require } from "foo" assert { "resolution-mode": "require" };
 @@= skipped -12, +12 lines =@@
  >Require : any
  
  type _Default = typeof Default;
 ->_Default : any
 ->Default : any
-+>_Default : "script"
-+>Default : "script"
++>_Default : "module"
++>Default : "module"
  
  type _Import = typeof Import;
-->_Import : "module"
-->Import : "module"
-+>_Import : "script"
-+>Import : "script"
- 
- type _Require = typeof Require;
- >_Require : "script"
+ >_Import : "module"
diff --git a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt
new file mode 100644
index 0000000000..c282ce8a1f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt
@@ -0,0 +1,72 @@
+/index.mts(1,21): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
+  There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
+/index.mts(2,21): error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
+  There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
+
+
+==== /node_modules/foo/package.json (0 errors) ====
+    {
+        "name": "foo",
+        "version": "1.0.0",
+        "main": "index.js",
+        "types": "index.d.ts",
+        "exports": {
+            ".": {
+                "import": "./index.mjs",
+                "require": "./index.js"
+            }
+        }
+    }
+    
+==== /node_modules/foo/index.js (0 errors) ====
+    module.exports = { foo: 1 };
+    
+==== /node_modules/foo/index.mjs (0 errors) ====
+    export const foo = 1;
+    
+==== /node_modules/foo/index.d.ts (0 errors) ====
+    export declare const foo: number;
+    
+==== /node_modules/@types/bar/package.json (0 errors) ====
+    {
+        "name": "@types/bar",
+        "version": "1.0.0",
+        "types": "index.d.ts",
+        "exports": {
+            ".": {
+                "require": "./index.d.ts"
+            }
+        }
+    }
+    
+==== /node_modules/@types/bar/index.d.ts (0 errors) ====
+    export declare const bar: number;
+    
+==== /node_modules/bar/package.json (0 errors) ====
+    {
+        "name": "bar",
+        "version": "1.0.0",
+        "main": "index.js",
+        "exports": {
+            ".": {
+                "import": "./index.mjs",
+                "require": "./index.js"
+            }
+        }
+    }
+    
+==== /node_modules/bar/index.js (0 errors) ====
+    module.exports = { bar: 1 };
+    
+==== /node_modules/bar/index.mjs (0 errors) ====
+    export const bar = 1;
+    
+==== /index.mts (2 errors) ====
+    import { foo } from "foo";
+                        ~~~~~
+!!! error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
+!!! error TS7016:   There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
+    import { bar } from "bar";
+                        ~~~~~
+!!! error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
+!!! error TS7016:   There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt.diff
index 57dfa0113a..2eb2d823d4 100644
--- a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt.diff
@@ -1,6 +1,6 @@
 --- old.resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt
 +++ new.resolvesWithoutExportsDiagnostic1(moduleresolution=bundler).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS6504: File '/node_modules/bar/index.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -  The file is in the program because:
 -    Root file specified for compilation
@@ -13,12 +13,12 @@
 -error TS6504: File '/node_modules/foo/index.mjs' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -  The file is in the program because:
 -    Root file specified for compilation
--/index.mts(1,21): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
--  There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
--/index.mts(2,21): error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
--  There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
--
--
+ /index.mts(1,21): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
+   There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
+ /index.mts(2,21): error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
+   There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
+ 
+ 
 -!!! error TS6504: File '/node_modules/bar/index.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -!!! error TS6504:   The file is in the program because:
 -!!! error TS6504:     Root file specified for compilation
@@ -31,71 +31,6 @@
 -!!! error TS6504: File '/node_modules/foo/index.mjs' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -!!! error TS6504:   The file is in the program because:
 -!!! error TS6504:     Root file specified for compilation
--==== /node_modules/foo/package.json (0 errors) ====
--    {
--        "name": "foo",
--        "version": "1.0.0",
--        "main": "index.js",
--        "types": "index.d.ts",
--        "exports": {
--            ".": {
--                "import": "./index.mjs",
--                "require": "./index.js"
--            }
--        }
--    }
--    
--==== /node_modules/foo/index.js (0 errors) ====
--    module.exports = { foo: 1 };
--    
--==== /node_modules/foo/index.mjs (0 errors) ====
--    export const foo = 1;
--    
--==== /node_modules/foo/index.d.ts (0 errors) ====
--    export declare const foo: number;
--    
--==== /node_modules/@types/bar/package.json (0 errors) ====
--    {
--        "name": "@types/bar",
--        "version": "1.0.0",
--        "types": "index.d.ts",
--        "exports": {
--            ".": {
--                "require": "./index.d.ts"
--            }
--        }
--    }
--    
--==== /node_modules/@types/bar/index.d.ts (0 errors) ====
--    export declare const bar: number;
--    
--==== /node_modules/bar/package.json (0 errors) ====
--    {
--        "name": "bar",
--        "version": "1.0.0",
--        "main": "index.js",
--        "exports": {
--            ".": {
--                "import": "./index.mjs",
--                "require": "./index.js"
--            }
--        }
--    }
--    
--==== /node_modules/bar/index.js (0 errors) ====
--    module.exports = { bar: 1 };
--    
--==== /node_modules/bar/index.mjs (0 errors) ====
--    export const bar = 1;
--    
--==== /index.mts (2 errors) ====
--    import { foo } from "foo";
--                        ~~~~~
--!!! error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
--!!! error TS7016:   There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
--    import { bar } from "bar";
--                        ~~~~~
--!!! error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
--!!! error TS7016:   There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
-@@= skipped --1, +1 lines =@@
-+<no content>
+ ==== /node_modules/foo/package.json (0 errors) ====
+     {
+         "name": "foo",
diff --git a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt
new file mode 100644
index 0000000000..c282ce8a1f
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt
@@ -0,0 +1,72 @@
+/index.mts(1,21): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
+  There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
+/index.mts(2,21): error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
+  There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
+
+
+==== /node_modules/foo/package.json (0 errors) ====
+    {
+        "name": "foo",
+        "version": "1.0.0",
+        "main": "index.js",
+        "types": "index.d.ts",
+        "exports": {
+            ".": {
+                "import": "./index.mjs",
+                "require": "./index.js"
+            }
+        }
+    }
+    
+==== /node_modules/foo/index.js (0 errors) ====
+    module.exports = { foo: 1 };
+    
+==== /node_modules/foo/index.mjs (0 errors) ====
+    export const foo = 1;
+    
+==== /node_modules/foo/index.d.ts (0 errors) ====
+    export declare const foo: number;
+    
+==== /node_modules/@types/bar/package.json (0 errors) ====
+    {
+        "name": "@types/bar",
+        "version": "1.0.0",
+        "types": "index.d.ts",
+        "exports": {
+            ".": {
+                "require": "./index.d.ts"
+            }
+        }
+    }
+    
+==== /node_modules/@types/bar/index.d.ts (0 errors) ====
+    export declare const bar: number;
+    
+==== /node_modules/bar/package.json (0 errors) ====
+    {
+        "name": "bar",
+        "version": "1.0.0",
+        "main": "index.js",
+        "exports": {
+            ".": {
+                "import": "./index.mjs",
+                "require": "./index.js"
+            }
+        }
+    }
+    
+==== /node_modules/bar/index.js (0 errors) ====
+    module.exports = { bar: 1 };
+    
+==== /node_modules/bar/index.mjs (0 errors) ====
+    export const bar = 1;
+    
+==== /index.mts (2 errors) ====
+    import { foo } from "foo";
+                        ~~~~~
+!!! error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
+!!! error TS7016:   There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
+    import { bar } from "bar";
+                        ~~~~~
+!!! error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
+!!! error TS7016:   There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt.diff
index 721def7f8c..2ce6d2f41c 100644
--- a/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt.diff
@@ -1,6 +1,6 @@
 --- old.resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt
 +++ new.resolvesWithoutExportsDiagnostic1(moduleresolution=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 -error TS6504: File '/node_modules/bar/index.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -  The file is in the program because:
@@ -14,12 +14,12 @@
 -error TS6504: File '/node_modules/foo/index.mjs' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -  The file is in the program because:
 -    Root file specified for compilation
--/index.mts(1,21): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
--  There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
--/index.mts(2,21): error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
--  There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
--
--
+ /index.mts(1,21): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
+   There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
+ /index.mts(2,21): error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
+   There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
+ 
+ 
 -!!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
 -!!! error TS6504: File '/node_modules/bar/index.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -!!! error TS6504:   The file is in the program because:
@@ -33,71 +33,6 @@
 -!!! error TS6504: File '/node_modules/foo/index.mjs' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -!!! error TS6504:   The file is in the program because:
 -!!! error TS6504:     Root file specified for compilation
--==== /node_modules/foo/package.json (0 errors) ====
--    {
--        "name": "foo",
--        "version": "1.0.0",
--        "main": "index.js",
--        "types": "index.d.ts",
--        "exports": {
--            ".": {
--                "import": "./index.mjs",
--                "require": "./index.js"
--            }
--        }
--    }
--    
--==== /node_modules/foo/index.js (0 errors) ====
--    module.exports = { foo: 1 };
--    
--==== /node_modules/foo/index.mjs (0 errors) ====
--    export const foo = 1;
--    
--==== /node_modules/foo/index.d.ts (0 errors) ====
--    export declare const foo: number;
--    
--==== /node_modules/@types/bar/package.json (0 errors) ====
--    {
--        "name": "@types/bar",
--        "version": "1.0.0",
--        "types": "index.d.ts",
--        "exports": {
--            ".": {
--                "require": "./index.d.ts"
--            }
--        }
--    }
--    
--==== /node_modules/@types/bar/index.d.ts (0 errors) ====
--    export declare const bar: number;
--    
--==== /node_modules/bar/package.json (0 errors) ====
--    {
--        "name": "bar",
--        "version": "1.0.0",
--        "main": "index.js",
--        "exports": {
--            ".": {
--                "import": "./index.mjs",
--                "require": "./index.js"
--            }
--        }
--    }
--    
--==== /node_modules/bar/index.js (0 errors) ====
--    module.exports = { bar: 1 };
--    
--==== /node_modules/bar/index.mjs (0 errors) ====
--    export const bar = 1;
--    
--==== /index.mts (2 errors) ====
--    import { foo } from "foo";
--                        ~~~~~
--!!! error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.mjs' implicitly has an 'any' type.
--!!! error TS7016:   There are types at '/node_modules/foo/index.d.ts', but this result could not be resolved when respecting package.json "exports". The 'foo' library may need to update its package.json or typings.
--    import { bar } from "bar";
--                        ~~~~~
--!!! error TS7016: Could not find a declaration file for module 'bar'. '/node_modules/bar/index.mjs' implicitly has an 'any' type.
--!!! error TS7016:   There are types at '/node_modules/@types/bar/index.d.ts', but this result could not be resolved when respecting package.json "exports". The '@types/bar' library may need to update its package.json or typings.
-@@= skipped --1, +1 lines =@@
-+<no content>
+ ==== /node_modules/foo/package.json (0 errors) ====
+     {
+         "name": "foo",
diff --git a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS.errors.txt b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS.errors.txt
new file mode 100644
index 0000000000..dde6c0e433
--- /dev/null
+++ b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS.errors.txt
@@ -0,0 +1,19 @@
+common.cts(1,21): error TS1541: Type-only import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.
+common.cts(4,25): error TS1542: Type import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.
+
+
+==== module.mts (0 errors) ====
+    export {};
+    
+==== common.cts (2 errors) ====
+    import type {} from "./module.mts";
+                        ~~~~~~~~~~~~~~
+!!! error TS1541: Type-only import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.
+    import type {} from "./module.mts" with { "resolution-mode": "import" };
+    import type {} from "./module.mts" with { "resolution-mode": "require" };
+    type _1 = typeof import("./module.mts");
+                            ~~~~~~~~~~~~~~
+!!! error TS1542: Type import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.
+    type _2 = typeof import("./module.mts", { with: { "resolution-mode": "import" } });
+    type _3 = typeof import("./module.mts", { with: { "resolution-mode": "require" } });
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS.errors.txt.diff
deleted file mode 100644
index a7a64c71bb..0000000000
--- a/testdata/baselines/reference/submodule/conformance/typeOnlyESMImportFromCJS.errors.txt.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.typeOnlyESMImportFromCJS.errors.txt
-+++ new.typeOnlyESMImportFromCJS.errors.txt
-@@= skipped -0, +-1 lines =@@
--common.cts(1,21): error TS1541: Type-only import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.
--common.cts(4,25): error TS1542: Type import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.
--
--
--==== module.mts (0 errors) ====
--    export {};
--    
--==== common.cts (2 errors) ====
--    import type {} from "./module.mts";
--                        ~~~~~~~~~~~~~~
--!!! error TS1541: Type-only import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.
--    import type {} from "./module.mts" with { "resolution-mode": "import" };
--    import type {} from "./module.mts" with { "resolution-mode": "require" };
--    type _1 = typeof import("./module.mts");
--                            ~~~~~~~~~~~~~~
--!!! error TS1542: Type import of an ECMAScript module from a CommonJS module must have a 'resolution-mode' attribute.
--    type _2 = typeof import("./module.mts", { with: { "resolution-mode": "import" } });
--    type _3 = typeof import("./module.mts", { with: { "resolution-mode": "require" } });
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport.errors.txt b/testdata/baselines/reference/submodule/conformance/untypedModuleImport.errors.txt
deleted file mode 100644
index 7969f56833..0000000000
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/a.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-/b.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-/c.ts(1,26): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-
-
-==== /c.ts (1 errors) ====
-    import foo, { bar } from "foo";
-                             ~~~~~
-!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-    import "./a";
-    import "./b";
-    foo(bar());
-    
-==== /node_modules/foo/index.js (0 errors) ====
-    This file is not processed.
-    
-==== /a.ts (1 errors) ====
-    import * as foo from "foo";
-                         ~~~~~
-!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-    foo.bar();
-    
-==== /b.ts (1 errors) ====
-    import foo = require("foo");
-                         ~~~~~
-!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-    foo();
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport.errors.txt.diff
deleted file mode 100644
index 45d65a2955..0000000000
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport.errors.txt.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- old.untypedModuleImport.errors.txt
-+++ new.untypedModuleImport.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/a.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-+/b.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-+/c.ts(1,26): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-+
-+
-+==== /c.ts (1 errors) ====
-+    import foo, { bar } from "foo";
-+                             ~~~~~
-+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-+    import "./a";
-+    import "./b";
-+    foo(bar());
-+    
-+==== /node_modules/foo/index.js (0 errors) ====
-+    This file is not processed.
-+    
-+==== /a.ts (1 errors) ====
-+    import * as foo from "foo";
-+                         ~~~~~
-+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-+    foo.bar();
-+    
-+==== /b.ts (1 errors) ====
-+    import foo = require("foo");
-+                         ~~~~~
-+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-+    foo();
-+    
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny.errors.txt b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny.errors.txt
index 02ca1e87eb..f7e0a3b8c2 100644
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny.errors.txt
@@ -1,10 +1,12 @@
-/a.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
+/a.ts(1,22): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
+  Try `npm i --save-dev @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
 
 
 ==== /a.ts (1 errors) ====
     import * as foo from "foo";
                          ~~~~~
-!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
+!!! error TS7016:   Try `npm i --save-dev @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
     
 ==== /node_modules/foo/package.json (0 errors) ====
     { "name": "foo", "version": "1.2.3" }
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny.errors.txt.diff
deleted file mode 100644
index 212c0b54e5..0000000000
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny.errors.txt.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- old.untypedModuleImport_noImplicitAny.errors.txt
-+++ new.untypedModuleImport_noImplicitAny.errors.txt
-@@= skipped -0, +0 lines =@@
--/a.ts(1,22): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
--  Try `npm i --save-dev @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
-+/a.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
- 
- 
- ==== /a.ts (1 errors) ====
-     import * as foo from "foo";
-                          ~~~~~
--!!! error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
--!!! error TS7016:   Try `npm i --save-dev @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
-+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-     
- ==== /node_modules/foo/package.json (0 errors) ====
-     { "name": "foo", "version": "1.2.3" }
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_relativePath.errors.txt b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_relativePath.errors.txt
index 71b22633b7..6047cfa6a6 100644
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_relativePath.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_relativePath.errors.txt
@@ -1,10 +1,10 @@
-/a.ts(1,22): error TS2307: Cannot find module './node_modules/foo' or its corresponding type declarations.
+/a.ts(1,22): error TS7016: Could not find a declaration file for module './node_modules/foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
 
 
 ==== /a.ts (1 errors) ====
     import * as foo from "./node_modules/foo";
                          ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module './node_modules/foo' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module './node_modules/foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
     
 ==== /node_modules/foo/package.json (0 errors) ====
     { "name": "foo", "version": "1.2.3" }
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_relativePath.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_relativePath.errors.txt.diff
deleted file mode 100644
index 536849ac14..0000000000
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_relativePath.errors.txt.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.untypedModuleImport_noImplicitAny_relativePath.errors.txt
-+++ new.untypedModuleImport_noImplicitAny_relativePath.errors.txt
-@@= skipped -0, +0 lines =@@
--/a.ts(1,22): error TS7016: Could not find a declaration file for module './node_modules/foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
-+/a.ts(1,22): error TS2307: Cannot find module './node_modules/foo' or its corresponding type declarations.
- 
- 
- ==== /a.ts (1 errors) ====
-     import * as foo from "./node_modules/foo";
-                          ~~~~~~~~~~~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module './node_modules/foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
-+!!! error TS2307: Cannot find module './node_modules/foo' or its corresponding type declarations.
-     
- ==== /node_modules/foo/package.json (0 errors) ====
-     { "name": "foo", "version": "1.2.3" }
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_scoped.errors.txt b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_scoped.errors.txt
index 2e504e8c40..37858aee3c 100644
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_scoped.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_scoped.errors.txt
@@ -1,10 +1,12 @@
-/a.ts(1,22): error TS2307: Cannot find module '@foo/bar' or its corresponding type declarations.
+/a.ts(1,22): error TS7016: Could not find a declaration file for module '@foo/bar'. '/node_modules/@foo/bar/index.js' implicitly has an 'any' type.
+  Try `npm i --save-dev @types/foo__bar` if it exists or add a new declaration (.d.ts) file containing `declare module '@foo/bar';`
 
 
 ==== /a.ts (1 errors) ====
     import * as foo from "@foo/bar";
                          ~~~~~~~~~~
-!!! error TS2307: Cannot find module '@foo/bar' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module '@foo/bar'. '/node_modules/@foo/bar/index.js' implicitly has an 'any' type.
+!!! error TS7016:   Try `npm i --save-dev @types/foo__bar` if it exists or add a new declaration (.d.ts) file containing `declare module '@foo/bar';`
     
 ==== /node_modules/@foo/bar/package.json (0 errors) ====
     { "name": "@foo/bar", "version": "1.2.3" }
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_scoped.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_scoped.errors.txt.diff
deleted file mode 100644
index 67b129c578..0000000000
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_scoped.errors.txt.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- old.untypedModuleImport_noImplicitAny_scoped.errors.txt
-+++ new.untypedModuleImport_noImplicitAny_scoped.errors.txt
-@@= skipped -0, +0 lines =@@
--/a.ts(1,22): error TS7016: Could not find a declaration file for module '@foo/bar'. '/node_modules/@foo/bar/index.js' implicitly has an 'any' type.
--  Try `npm i --save-dev @types/foo__bar` if it exists or add a new declaration (.d.ts) file containing `declare module '@foo/bar';`
-+/a.ts(1,22): error TS2307: Cannot find module '@foo/bar' or its corresponding type declarations.
- 
- 
- ==== /a.ts (1 errors) ====
-     import * as foo from "@foo/bar";
-                          ~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module '@foo/bar'. '/node_modules/@foo/bar/index.js' implicitly has an 'any' type.
--!!! error TS7016:   Try `npm i --save-dev @types/foo__bar` if it exists or add a new declaration (.d.ts) file containing `declare module '@foo/bar';`
-+!!! error TS2307: Cannot find module '@foo/bar' or its corresponding type declarations.
-     
- ==== /node_modules/@foo/bar/package.json (0 errors) ====
-     { "name": "@foo/bar", "version": "1.2.3" }
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt
index fbcbccce77..29cbe372ab 100644
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt
@@ -1,24 +1,32 @@
-/a.ts(2,25): error TS2307: Cannot find module 'foo/sub' or its corresponding type declarations.
-/a.ts(3,25): error TS2307: Cannot find module 'bar/sub' or its corresponding type declarations.
-/a.ts(5,30): error TS2307: Cannot find module '@scope/foo/sub' or its corresponding type declarations.
-/a.ts(6,30): error TS2307: Cannot find module '@scope/bar/sub' or its corresponding type declarations.
+/a.ts(2,25): error TS7016: Could not find a declaration file for module 'foo/sub'. '/node_modules/foo/sub.js' implicitly has an 'any' type.
+  If the 'foo' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/foo'
+/a.ts(3,25): error TS7016: Could not find a declaration file for module 'bar/sub'. '/node_modules/bar/sub.js' implicitly has an 'any' type.
+  Try `npm i --save-dev @types/bar` if it exists or add a new declaration (.d.ts) file containing `declare module 'bar/sub';`
+/a.ts(5,30): error TS7016: Could not find a declaration file for module '@scope/foo/sub'. '/node_modules/@scope/foo/sub.js' implicitly has an 'any' type.
+  If the '@scope/foo' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/scope__foo'
+/a.ts(6,30): error TS7016: Could not find a declaration file for module '@scope/bar/sub'. '/node_modules/@scope/bar/sub.js' implicitly has an 'any' type.
+  Try `npm i --save-dev @types/scope__bar` if it exists or add a new declaration (.d.ts) file containing `declare module '@scope/bar/sub';`
 
 
 ==== /a.ts (4 errors) ====
     import * as foo from "foo";
     import * as fooSub from "foo/sub";
                             ~~~~~~~~~
-!!! error TS2307: Cannot find module 'foo/sub' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'foo/sub'. '/node_modules/foo/sub.js' implicitly has an 'any' type.
+!!! error TS7016:   If the 'foo' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/foo'
     import * as barSub from "bar/sub";
                             ~~~~~~~~~
-!!! error TS2307: Cannot find module 'bar/sub' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module 'bar/sub'. '/node_modules/bar/sub.js' implicitly has an 'any' type.
+!!! error TS7016:   Try `npm i --save-dev @types/bar` if it exists or add a new declaration (.d.ts) file containing `declare module 'bar/sub';`
     import * as scopeFoo from "@scope/foo";
     import * as scopeFooSub from "@scope/foo/sub";
                                  ~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module '@scope/foo/sub' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module '@scope/foo/sub'. '/node_modules/@scope/foo/sub.js' implicitly has an 'any' type.
+!!! error TS7016:   If the '@scope/foo' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/scope__foo'
     import * as scopeBarSub from "@scope/bar/sub";
                                  ~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module '@scope/bar/sub' or its corresponding type declarations.
+!!! error TS7016: Could not find a declaration file for module '@scope/bar/sub'. '/node_modules/@scope/bar/sub.js' implicitly has an 'any' type.
+!!! error TS7016:   Try `npm i --save-dev @types/scope__bar` if it exists or add a new declaration (.d.ts) file containing `declare module '@scope/bar/sub';`
     
 ==== /node_modules/@types/foo/index.d.ts (0 errors) ====
     export const foo: number;
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt.diff
deleted file mode 100644
index b113c903f0..0000000000
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- old.untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt
-+++ new.untypedModuleImport_noImplicitAny_typesForPackageExist.errors.txt
-@@= skipped -0, +0 lines =@@
--/a.ts(2,25): error TS7016: Could not find a declaration file for module 'foo/sub'. '/node_modules/foo/sub.js' implicitly has an 'any' type.
--  If the 'foo' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/foo'
--/a.ts(3,25): error TS7016: Could not find a declaration file for module 'bar/sub'. '/node_modules/bar/sub.js' implicitly has an 'any' type.
--  Try `npm i --save-dev @types/bar` if it exists or add a new declaration (.d.ts) file containing `declare module 'bar/sub';`
--/a.ts(5,30): error TS7016: Could not find a declaration file for module '@scope/foo/sub'. '/node_modules/@scope/foo/sub.js' implicitly has an 'any' type.
--  If the '@scope/foo' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/scope__foo'
--/a.ts(6,30): error TS7016: Could not find a declaration file for module '@scope/bar/sub'. '/node_modules/@scope/bar/sub.js' implicitly has an 'any' type.
--  Try `npm i --save-dev @types/scope__bar` if it exists or add a new declaration (.d.ts) file containing `declare module '@scope/bar/sub';`
-+/a.ts(2,25): error TS2307: Cannot find module 'foo/sub' or its corresponding type declarations.
-+/a.ts(3,25): error TS2307: Cannot find module 'bar/sub' or its corresponding type declarations.
-+/a.ts(5,30): error TS2307: Cannot find module '@scope/foo/sub' or its corresponding type declarations.
-+/a.ts(6,30): error TS2307: Cannot find module '@scope/bar/sub' or its corresponding type declarations.
- 
- 
- ==== /a.ts (4 errors) ====
-     import * as foo from "foo";
-     import * as fooSub from "foo/sub";
-                             ~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module 'foo/sub'. '/node_modules/foo/sub.js' implicitly has an 'any' type.
--!!! error TS7016:   If the 'foo' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/foo'
-+!!! error TS2307: Cannot find module 'foo/sub' or its corresponding type declarations.
-     import * as barSub from "bar/sub";
-                             ~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module 'bar/sub'. '/node_modules/bar/sub.js' implicitly has an 'any' type.
--!!! error TS7016:   Try `npm i --save-dev @types/bar` if it exists or add a new declaration (.d.ts) file containing `declare module 'bar/sub';`
-+!!! error TS2307: Cannot find module 'bar/sub' or its corresponding type declarations.
-     import * as scopeFoo from "@scope/foo";
-     import * as scopeFooSub from "@scope/foo/sub";
-                                  ~~~~~~~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module '@scope/foo/sub'. '/node_modules/@scope/foo/sub.js' implicitly has an 'any' type.
--!!! error TS7016:   If the '@scope/foo' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/scope__foo'
-+!!! error TS2307: Cannot find module '@scope/foo/sub' or its corresponding type declarations.
-     import * as scopeBarSub from "@scope/bar/sub";
-                                  ~~~~~~~~~~~~~~~~
--!!! error TS7016: Could not find a declaration file for module '@scope/bar/sub'. '/node_modules/@scope/bar/sub.js' implicitly has an 'any' type.
--!!! error TS7016:   Try `npm i --save-dev @types/scope__bar` if it exists or add a new declaration (.d.ts) file containing `declare module '@scope/bar/sub';`
-+!!! error TS2307: Cannot find module '@scope/bar/sub' or its corresponding type declarations.
-     
- ==== /node_modules/@types/foo/index.d.ts (0 errors) ====
-     export const foo: number;
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_withAugmentation.errors.txt b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_withAugmentation.errors.txt
index dcabf0d67e..54a9d18359 100644
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_withAugmentation.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_withAugmentation.errors.txt
@@ -1,16 +1,13 @@
-/a.ts(1,16): error TS2664: Invalid module name in augmentation, module 'foo' cannot be found.
-/a.ts(4,19): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
+/a.ts(1,16): error TS2665: Invalid module name in augmentation. Module 'foo' resolves to an untyped module at '/node_modules/foo/index.js', which cannot be augmented.
 
 
-==== /a.ts (2 errors) ====
+==== /a.ts (1 errors) ====
     declare module "foo" {
                    ~~~~~
-!!! error TS2664: Invalid module name in augmentation, module 'foo' cannot be found.
+!!! error TS2665: Invalid module name in augmentation. Module 'foo' resolves to an untyped module at '/node_modules/foo/index.js', which cannot be augmented.
         export const x: number;
     }
     import { x } from "foo";
-                      ~~~~~
-!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
     x;
     
 ==== /node_modules/foo/index.js (0 errors) ====
diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_withAugmentation.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_withAugmentation.errors.txt.diff
deleted file mode 100644
index fdf6237295..0000000000
--- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_withAugmentation.errors.txt.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.untypedModuleImport_withAugmentation.errors.txt
-+++ new.untypedModuleImport_withAugmentation.errors.txt
-@@= skipped -0, +0 lines =@@
--/a.ts(1,16): error TS2665: Invalid module name in augmentation. Module 'foo' resolves to an untyped module at '/node_modules/foo/index.js', which cannot be augmented.
-+/a.ts(1,16): error TS2664: Invalid module name in augmentation, module 'foo' cannot be found.
-+/a.ts(4,19): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
- 
- 
--==== /a.ts (1 errors) ====
-+==== /a.ts (2 errors) ====
-     declare module "foo" {
-                    ~~~~~
--!!! error TS2665: Invalid module name in augmentation. Module 'foo' resolves to an untyped module at '/node_modules/foo/index.js', which cannot be augmented.
-+!!! error TS2664: Invalid module name in augmentation, module 'foo' cannot be found.
-         export const x: number;
-     }
-     import { x } from "foo";
-+                      ~~~~~
-+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
-     x;
-     
- ==== /node_modules/foo/index.js (0 errors) ====
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve2.errors.txt.diff
deleted file mode 100644
index edec0bb963..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve2.errors.txt.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- old.modulePreserve2.errors.txt
-+++ new.modulePreserve2.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+/main.js(1,10): error TS2305: Module '"/node_modules/dep/require"' has no exported member 'esm'.
-+
-+
-+==== /main.js (1 errors) ====
-+    import { esm } from "dep";
-+             ~~~
-+!!! error TS2305: Module '"/node_modules/dep/require"' has no exported member 'esm'.
-+    const cjs = require("dep");
-+    
-+==== /node_modules/dep/package.json (0 errors) ====
-+    {
-+      "name": "dep",
-+      "exports": {
-+        "import": "./import.mjs",
-+        "require": "./require.js"
-+      }
-+    }
-+    
-+==== /node_modules/dep/import.d.mts (0 errors) ====
-+    export const esm: "esm";
-+    
-+==== /node_modules/dep/require.d.ts (0 errors) ====
-+    declare const cjs: "cjs";
-+    export = cjs;
-+    
-+==== /index.ts (0 errors) ====
-+    import { esm } from "dep";
-+    import cjs = require("dep");
-+    
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve2.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve2.types.diff
deleted file mode 100644
index 0a70f8deb7..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/compiler/modulePreserve2.types.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.modulePreserve2.types
-+++ new.modulePreserve2.types
-@@= skipped -1, +1 lines =@@
- 
- === /main.js ===
- import { esm } from "dep";
-->esm : "esm"
-+>esm : any
- 
- const cjs = require("dep");
- >cjs : "cjs"
-@@= skipped -8, +8 lines =@@
- >require : any
- >"dep" : "dep"
- 
--=== /node_modules/dep/import.d.mts ===
--export const esm: "esm";
-->esm : "esm"
--
- === /node_modules/dep/require.d.ts ===
- declare const cjs: "cjs";
- >cjs : "cjs"
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileInJsFile.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileInJsFile.errors.txt.diff
index d81985857f..005e0c4da1 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileInJsFile.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileInJsFile.errors.txt.diff
@@ -4,7 +4,7 @@
  /user.js(2,7): error TS2339: Property 'b' does not exist on type '{ a: number; }'.
 -/user.js(5,7): error TS2741: Property 'b' is missing in type '{ a: number; }' but required in type '{ b: number; }'.
 +/user.js(5,15): error TS2580: Cannot find name 'require'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
-+/user.js(8,21): error TS2307: Cannot find module './js.js' or its corresponding type declarations.
++/user.js(8,21): error TS7016: Could not find a declaration file for module './js.js'. '/js.js' implicitly has an 'any' type.
  /user.js(9,7): error TS2339: Property 'b' does not exist on type '{ a: number; }'.
 -/user.js(12,7): error TS2741: Property 'b' is missing in type '{ a: number; }' but required in type '{ b: number; }'.
 +/user.js(12,13): error TS2580: Cannot find name 'require'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
@@ -28,7 +28,7 @@
      
      const js0 = require("./js.js");
 +                        ~~~~~~~~~
-+!!! error TS2307: Cannot find module './js.js' or its corresponding type declarations.
++!!! error TS7016: Could not find a declaration file for module './js.js'. '/js.js' implicitly has an 'any' type.
      json0.b; // Error (good)
            ~
  !!! error TS2339: Property 'b' does not exist on type '{ a: number; }'.
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt.diff
deleted file mode 100644
index 9a403f9668..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- old.requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt
-+++ new.requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt
-@@= skipped -0, +0 lines =@@
--/a.ts(1,20): error TS2732: Cannot find module 'foo/bar/foobar.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
-+/a.ts(1,20): error TS2307: Cannot find module 'foo/bar/foobar.json' or its corresponding type declarations.
- 
- 
- ==== /tsconfig.json (0 errors) ====
-@@= skipped -15, +15 lines =@@
- ==== /a.ts (1 errors) ====
-     import foobar from "foo/bar/foobar.json";
-                        ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2732: Cannot find module 'foo/bar/foobar.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
-+!!! error TS2307: Cannot find module 'foo/bar/foobar.json' or its corresponding type declarations.
-     
- ==== /node_modules/foo/bar/foobar.json (0 errors) ====
-     { "a": 10 }
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt.diff
index d77995964d..6910df762d 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt.diff
@@ -1,105 +1,44 @@
 --- old.bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt
 +++ new.bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=false).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS5056: Cannot write file 'out/b.js' because it would be overwritten by multiple input files.
 -error TS5056: Cannot write file 'out/c.js' because it would be overwritten by multiple input files.
 -error TS6054: File '/project/e.txt' has an unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx', '.cts', '.d.cts', '.cjs', '.mts', '.d.mts', '.mjs'.
 -  The file is in the program because:
 -    Root file specified for compilation
--/project/main.ts(3,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--/project/main.ts(7,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--/project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
--/project/main.ts(11,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--/project/main.ts(12,16): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+ /project/main.ts(3,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ /project/main.ts(7,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ /project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
+ /project/main.ts(11,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ /project/main.ts(12,16): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
 -/project/main.ts(12,16): error TS6142: Module './c.tsx' was resolved to '/project/c.tsx', but '--jsx' is not set.
--/project/main.ts(16,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--/project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--
--
+ /project/main.ts(16,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ /project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+ 
+ 
 -!!! error TS5056: Cannot write file 'out/b.js' because it would be overwritten by multiple input files.
 -!!! error TS5056: Cannot write file 'out/c.js' because it would be overwritten by multiple input files.
 -!!! error TS6054: File '/project/e.txt' has an unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx', '.cts', '.d.cts', '.cjs', '.mts', '.d.mts', '.mjs'.
 -!!! error TS6054:   The file is in the program because:
 -!!! error TS6054:     Root file specified for compilation
--==== /project/a.ts (0 errors) ====
--    export {};
--    
--==== /project/b.ts (0 errors) ====
--    export {};
--    
--==== /project/b.js (0 errors) ====
--    export {};
--    
--==== /project/b.d.ts (0 errors) ====
--    export {};
--    
--==== /project/c.ts (0 errors) ====
--    export {};
--    
--==== /project/c.tsx (0 errors) ====
--    export {};
--    
--==== /project/d/index.ts (0 errors) ====
--    export {};
--    
--==== /project/e (0 errors) ====
--    WOMP WOMP BINARY DATA
--    
--==== /project/e.ts (0 errors) ====
--    export {};
--    
--==== /project/e.txt (0 errors) ====
--    The letter e is for elephant
--    This poem is not about elephants
--    It is about the letter e
--    - Authored by GitHub Copilot, Nov 2022
--    
--==== /project/e.txt.ts (0 errors) ====
--    export {};
--    
+ ==== /project/a.ts (0 errors) ====
+     export {};
+     
+@@= skipped -53, +42 lines =@@
+ ==== /project/e.txt.ts (0 errors) ====
+     export {};
+     
 -==== /project/main.ts (7 errors) ====
--    import {} from "./a";
--    import {} from "./a.js";
--    import {} from "./a.ts";
--                   ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    
--    import {} from "./b";
--    import {} from "./b.js";
--    import {} from "./b.ts";
--                   ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import {} from "./b.d.ts";
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
--    import type {} from "./b.d.ts";
--    
--    import {} from "./c.ts";
--                   ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import {} from "./c.tsx";
--                   ~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
++==== /project/main.ts (6 errors) ====
+     import {} from "./a";
+     import {} from "./a.js";
+     import {} from "./a.ts";
+@@= skipped -23, +23 lines =@@
+     import {} from "./c.tsx";
+                    ~~~~~~~~~
+ !!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
 -                   ~~~~~~~~~
 -!!! error TS6142: Module './c.tsx' was resolved to '/project/c.tsx', but '--jsx' is not set.
--    
--    import {} from "./d";
--    import {} from "./d/index";
--    import {} from "./d/index.ts";
--                   ~~~~~~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    
--    // These should not resolve, but preventing them has
--    // relatively little utility compared to the cost of
--    // the filesystem hits.
--    import {} from "./e";
--    import {} from "./e.txt";
--    
--==== /project/types.d.ts (1 errors) ====
--    import {} from "./a.ts";
--    import {} from "./a.d.ts";
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--    import type {} from "./a.d.ts";
-@@= skipped --1, +1 lines =@@
-+<no content>
+     
+     import {} from "./d";
+     import {} from "./d/index";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt.diff
index 47e5ee7378..9e56c7fbea 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt.diff
@@ -1,101 +1,40 @@
 --- old.bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt
 +++ new.bundlerImportTsExtensions(allowimportingtsextensions=false,noemit=true).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS6054: File '/project/e.txt' has an unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx', '.cts', '.d.cts', '.cjs', '.mts', '.d.mts', '.mjs'.
 -  The file is in the program because:
 -    Root file specified for compilation
--/project/main.ts(3,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--/project/main.ts(7,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--/project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
--/project/main.ts(11,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--/project/main.ts(12,16): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
+ /project/main.ts(3,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ /project/main.ts(7,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ /project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
+ /project/main.ts(11,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ /project/main.ts(12,16): error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
 -/project/main.ts(12,16): error TS6142: Module './c.tsx' was resolved to '/project/c.tsx', but '--jsx' is not set.
--/project/main.ts(16,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--/project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--
--
+ /project/main.ts(16,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+ /project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
+ 
+ 
 -!!! error TS6054: File '/project/e.txt' has an unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx', '.cts', '.d.cts', '.cjs', '.mts', '.d.mts', '.mjs'.
 -!!! error TS6054:   The file is in the program because:
 -!!! error TS6054:     Root file specified for compilation
--==== /project/a.ts (0 errors) ====
--    export {};
--    
--==== /project/b.ts (0 errors) ====
--    export {};
--    
--==== /project/b.js (0 errors) ====
--    export {};
--    
--==== /project/b.d.ts (0 errors) ====
--    export {};
--    
--==== /project/c.ts (0 errors) ====
--    export {};
--    
--==== /project/c.tsx (0 errors) ====
--    export {};
--    
--==== /project/d/index.ts (0 errors) ====
--    export {};
--    
--==== /project/e (0 errors) ====
--    WOMP WOMP BINARY DATA
--    
--==== /project/e.ts (0 errors) ====
--    export {};
--    
--==== /project/e.txt (0 errors) ====
--    The letter e is for elephant
--    This poem is not about elephants
--    It is about the letter e
--    - Authored by GitHub Copilot, Nov 2022
--    
--==== /project/e.txt.ts (0 errors) ====
--    export {};
--    
+ ==== /project/a.ts (0 errors) ====
+     export {};
+     
+@@= skipped -49, +42 lines =@@
+ ==== /project/e.txt.ts (0 errors) ====
+     export {};
+     
 -==== /project/main.ts (7 errors) ====
--    import {} from "./a";
--    import {} from "./a.js";
--    import {} from "./a.ts";
--                   ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    
--    import {} from "./b";
--    import {} from "./b.js";
--    import {} from "./b.ts";
--                   ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import {} from "./b.d.ts";
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.js' instead?
--    import type {} from "./b.d.ts";
--    
--    import {} from "./c.ts";
--                   ~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    import {} from "./c.tsx";
--                   ~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
++==== /project/main.ts (6 errors) ====
+     import {} from "./a";
+     import {} from "./a.js";
+     import {} from "./a.ts";
+@@= skipped -23, +23 lines =@@
+     import {} from "./c.tsx";
+                    ~~~~~~~~~
+ !!! error TS5097: An import path can only end with a '.tsx' extension when 'allowImportingTsExtensions' is enabled.
 -                   ~~~~~~~~~
 -!!! error TS6142: Module './c.tsx' was resolved to '/project/c.tsx', but '--jsx' is not set.
--    
--    import {} from "./d";
--    import {} from "./d/index";
--    import {} from "./d/index.ts";
--                   ~~~~~~~~~~~~~~
--!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
--    
--    // These should not resolve, but preventing them has
--    // relatively little utility compared to the cost of
--    // the filesystem hits.
--    import {} from "./e";
--    import {} from "./e.txt";
--    
--==== /project/types.d.ts (1 errors) ====
--    import {} from "./a.ts";
--    import {} from "./a.d.ts";
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.js' instead?
--    import type {} from "./a.d.ts";
-@@= skipped --1, +1 lines =@@
-+<no content>
+     
+     import {} from "./d";
+     import {} from "./d/index";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt.diff
index f300ec0b9a..a137b0e7a2 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt.diff
@@ -1,92 +1,41 @@
 --- old.bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt
 +++ new.bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=false).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS5056: Cannot write file 'out/b.js' because it would be overwritten by multiple input files.
 -error TS5056: Cannot write file 'out/c.js' because it would be overwritten by multiple input files.
 -error TS5096: Option 'allowImportingTsExtensions' can only be used when either 'noEmit' or 'emitDeclarationOnly' is set.
 -error TS6054: File '/project/e.txt' has an unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx', '.cts', '.d.cts', '.cjs', '.mts', '.d.mts', '.mjs'.
 -  The file is in the program because:
 -    Root file specified for compilation
--/project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
+ /project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
 -/project/main.ts(12,16): error TS6142: Module './c.tsx' was resolved to '/project/c.tsx', but '--jsx' is not set.
--/project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
--
--
+ /project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
+ 
+ 
 -!!! error TS5056: Cannot write file 'out/b.js' because it would be overwritten by multiple input files.
 -!!! error TS5056: Cannot write file 'out/c.js' because it would be overwritten by multiple input files.
 -!!! error TS5096: Option 'allowImportingTsExtensions' can only be used when either 'noEmit' or 'emitDeclarationOnly' is set.
 -!!! error TS6054: File '/project/e.txt' has an unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx', '.cts', '.d.cts', '.cjs', '.mts', '.d.mts', '.mjs'.
 -!!! error TS6054:   The file is in the program because:
 -!!! error TS6054:     Root file specified for compilation
--==== /project/a.ts (0 errors) ====
--    export {};
--    
--==== /project/b.ts (0 errors) ====
--    export {};
--    
--==== /project/b.js (0 errors) ====
--    export {};
--    
--==== /project/b.d.ts (0 errors) ====
--    export {};
--    
--==== /project/c.ts (0 errors) ====
--    export {};
--    
--==== /project/c.tsx (0 errors) ====
--    export {};
--    
--==== /project/d/index.ts (0 errors) ====
--    export {};
--    
--==== /project/e (0 errors) ====
--    WOMP WOMP BINARY DATA
--    
--==== /project/e.ts (0 errors) ====
--    export {};
--    
--==== /project/e.txt (0 errors) ====
--    The letter e is for elephant
--    This poem is not about elephants
--    It is about the letter e
--    - Authored by GitHub Copilot, Nov 2022
--    
--==== /project/e.txt.ts (0 errors) ====
--    export {};
--    
+ ==== /project/a.ts (0 errors) ====
+     export {};
+     
+@@= skipped -50, +37 lines =@@
+ ==== /project/e.txt.ts (0 errors) ====
+     export {};
+     
 -==== /project/main.ts (2 errors) ====
--    import {} from "./a";
--    import {} from "./a.js";
--    import {} from "./a.ts";
--    
--    import {} from "./b";
--    import {} from "./b.js";
--    import {} from "./b.ts";
--    import {} from "./b.d.ts";
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
--    import type {} from "./b.d.ts";
--    
--    import {} from "./c.ts";
--    import {} from "./c.tsx";
++==== /project/main.ts (1 errors) ====
+     import {} from "./a";
+     import {} from "./a.js";
+     import {} from "./a.ts";
+@@= skipped -15, +15 lines =@@
+     
+     import {} from "./c.ts";
+     import {} from "./c.tsx";
 -                   ~~~~~~~~~
 -!!! error TS6142: Module './c.tsx' was resolved to '/project/c.tsx', but '--jsx' is not set.
--    
--    import {} from "./d";
--    import {} from "./d/index";
--    import {} from "./d/index.ts";
--    
--    // These should not resolve, but preventing them has
--    // relatively little utility compared to the cost of
--    // the filesystem hits.
--    import {} from "./e";
--    import {} from "./e.txt";
--    
--==== /project/types.d.ts (1 errors) ====
--    import {} from "./a.ts";
--    import {} from "./a.d.ts";
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
--    import type {} from "./a.d.ts";
-@@= skipped --1, +1 lines =@@
-+<no content>
+     
+     import {} from "./d";
+     import {} from "./d/index";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt.diff
index dbacef7e11..dc7c4741cd 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt.diff
@@ -1,86 +1,35 @@
 --- old.bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt
 +++ new.bundlerImportTsExtensions(allowimportingtsextensions=true,noemit=true).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS6054: File '/project/e.txt' has an unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx', '.cts', '.d.cts', '.cjs', '.mts', '.d.mts', '.mjs'.
 -  The file is in the program because:
 -    Root file specified for compilation
--/project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
+ /project/main.ts(8,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
 -/project/main.ts(12,16): error TS6142: Module './c.tsx' was resolved to '/project/c.tsx', but '--jsx' is not set.
--/project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
--
--
+ /project/types.d.ts(2,16): error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
+ 
+ 
 -!!! error TS6054: File '/project/e.txt' has an unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx', '.cts', '.d.cts', '.cjs', '.mts', '.d.mts', '.mjs'.
 -!!! error TS6054:   The file is in the program because:
 -!!! error TS6054:     Root file specified for compilation
--==== /project/a.ts (0 errors) ====
--    export {};
--    
--==== /project/b.ts (0 errors) ====
--    export {};
--    
--==== /project/b.js (0 errors) ====
--    export {};
--    
--==== /project/b.d.ts (0 errors) ====
--    export {};
--    
--==== /project/c.ts (0 errors) ====
--    export {};
--    
--==== /project/c.tsx (0 errors) ====
--    export {};
--    
--==== /project/d/index.ts (0 errors) ====
--    export {};
--    
--==== /project/e (0 errors) ====
--    WOMP WOMP BINARY DATA
--    
--==== /project/e.ts (0 errors) ====
--    export {};
--    
--==== /project/e.txt (0 errors) ====
--    The letter e is for elephant
--    This poem is not about elephants
--    It is about the letter e
--    - Authored by GitHub Copilot, Nov 2022
--    
--==== /project/e.txt.ts (0 errors) ====
--    export {};
--    
+ ==== /project/a.ts (0 errors) ====
+     export {};
+     
+@@= skipped -44, +37 lines =@@
+ ==== /project/e.txt.ts (0 errors) ====
+     export {};
+     
 -==== /project/main.ts (2 errors) ====
--    import {} from "./a";
--    import {} from "./a.js";
--    import {} from "./a.ts";
--    
--    import {} from "./b";
--    import {} from "./b.js";
--    import {} from "./b.ts";
--    import {} from "./b.d.ts";
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './b.ts' instead?
--    import type {} from "./b.d.ts";
--    
--    import {} from "./c.ts";
--    import {} from "./c.tsx";
++==== /project/main.ts (1 errors) ====
+     import {} from "./a";
+     import {} from "./a.js";
+     import {} from "./a.ts";
+@@= skipped -15, +15 lines =@@
+     
+     import {} from "./c.ts";
+     import {} from "./c.tsx";
 -                   ~~~~~~~~~
 -!!! error TS6142: Module './c.tsx' was resolved to '/project/c.tsx', but '--jsx' is not set.
--    
--    import {} from "./d";
--    import {} from "./d/index";
--    import {} from "./d/index.ts";
--    
--    // These should not resolve, but preventing them has
--    // relatively little utility compared to the cost of
--    // the filesystem hits.
--    import {} from "./e";
--    import {} from "./e.txt";
--    
--==== /project/types.d.ts (1 errors) ====
--    import {} from "./a.ts";
--    import {} from "./a.d.ts";
--                   ~~~~~~~~~~
--!!! error TS2846: A declaration file cannot be imported without 'import type'. Did you mean to import an implementation file './a.ts' instead?
--    import type {} from "./a.d.ts";
-@@= skipped --1, +1 lines =@@
-+<no content>
+     
+     import {} from "./d";
+     import {} from "./d/index";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/commonJSAliasedExport.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/commonJSAliasedExport.errors.txt.diff
deleted file mode 100644
index 3270c963bb..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/commonJSAliasedExport.errors.txt.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- old.commonJSAliasedExport.errors.txt
-+++ new.commonJSAliasedExport.errors.txt
-@@= skipped -0, +-1 lines =@@
--<no content>
-@@= skipped --1, +1 lines =@@
-+bug43713.js(1,27): error TS2307: Cannot find module './commonJSAliasedExport' or its corresponding type declarations.
-+
-+
-+==== bug43713.js (1 errors) ====
-+    const { funky } = require('./commonJSAliasedExport');
-+                              ~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module './commonJSAliasedExport' or its corresponding type declarations.
-+    /** @type {boolean} */
-+    var diddy
-+    var diddy = funky(1)
-+    
-+    
-+==== commonJSAliasedExport.js (0 errors) ====
-+    const donkey = (ast) =>  ast;
-+    
-+    function funky(declaration) {
-+        return false;
-+    }
-+    module.exports = donkey;
-+    module.exports.funky = funky;
-+    
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias.errors.txt.diff
index cdd343ee9d..4bfe676cbf 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias.errors.txt.diff
@@ -2,14 +2,14 @@
 +++ new.moduleExportDuplicateAlias.errors.txt
 @@= skipped -0, +0 lines =@@
 -moduleExportAliasDuplicateAlias.js(3,1): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-+test.js(1,27): error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
++test.js(1,27): error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
  
  
 -==== test.js (0 errors) ====
 +==== test.js (1 errors) ====
      const { apply } = require('./moduleExportAliasDuplicateAlias')
 +                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
++!!! error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
      apply()
      
 -==== moduleExportAliasDuplicateAlias.js (1 errors) ====
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias2.errors.txt.diff
index 5d387a8539..b1792b5580 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias2.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias2.errors.txt.diff
@@ -3,13 +3,13 @@
 @@= skipped -0, +-1 lines =@@
 -<no content>
 @@= skipped --1, +1 lines =@@
-+test.js(1,27): error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
++test.js(1,27): error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
 +
 +
 +==== test.js (1 errors) ====
 +    const { apply } = require('./moduleExportAliasDuplicateAlias')
 +                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
++!!! error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
 +    apply()
 +    
 +==== moduleExportAliasDuplicateAlias.js (0 errors) ====
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias3.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias3.errors.txt.diff
index 32939ea6dc..728ae47dd8 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias3.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportDuplicateAlias3.errors.txt.diff
@@ -3,13 +3,13 @@
 @@= skipped -0, +-1 lines =@@
 -<no content>
 @@= skipped --1, +1 lines =@@
-+test.js(1,27): error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
++test.js(1,27): error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
 +
 +
 +==== test.js (1 errors) ====
 +    const { apply } = require('./moduleExportAliasDuplicateAlias')
 +                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module './moduleExportAliasDuplicateAlias' or its corresponding type declarations.
++!!! error TS7016: Could not find a declaration file for module './moduleExportAliasDuplicateAlias'. 'moduleExportAliasDuplicateAlias.js' implicitly has an 'any' type.
 +    const result = apply.toFixed()
 +    
 +==== moduleExportAliasDuplicateAlias.js (0 errors) ====
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeAllowJsPackageSelfName(module=node16).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeAllowJsPackageSelfName(module=node16).errors.txt.diff
index 2430c4a1c9..638fcedaf8 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeAllowJsPackageSelfName(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeAllowJsPackageSelfName(module=node16).errors.txt.diff
@@ -1,31 +1,11 @@
 --- old.nodeAllowJsPackageSelfName(module=node16).errors.txt
 +++ new.nodeAllowJsPackageSelfName(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cjs(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--
--
+ index.cjs(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ 
+ 
 -!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--==== index.js (0 errors) ====
--    // esm format file
--    import * as self from "package";
--    self;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as self from "package";
--    self;
--==== index.cjs (1 errors) ====
--    // esm format file
--    import * as self from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--    self;
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+ ==== index.js (0 errors) ====
+     // esm format file
+     import * as self from "package";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeAllowJsPackageSelfName(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeAllowJsPackageSelfName(module=nodenext).errors.txt.diff
index dade6c7e17..8c3fff1859 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeAllowJsPackageSelfName(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeAllowJsPackageSelfName(module=nodenext).errors.txt.diff
@@ -1,31 +1,11 @@
 --- old.nodeAllowJsPackageSelfName(module=nodenext).errors.txt
 +++ new.nodeAllowJsPackageSelfName(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cjs(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--
--
+ index.cjs(2,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ 
+ 
 -!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--==== index.js (0 errors) ====
--    // esm format file
--    import * as self from "package";
--    self;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as self from "package";
--    self;
--==== index.cjs (1 errors) ====
--    // esm format file
--    import * as self from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--    self;
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+ ==== index.js (0 errors) ====
+     // esm format file
+     import * as self from "package";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=node16).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=node16).errors.txt.diff
index b77373d629..cb7eb48992 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=node16).errors.txt.diff
@@ -1,21 +1,13 @@
 --- old.nodeModulesAllowJs1(module=node16).errors.txt
 +++ new.nodeModulesAllowJs1(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cjs(2,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
--index.cjs(3,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
--index.cjs(6,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
--index.cjs(9,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
--index.cjs(11,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
--index.cjs(12,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
--index.cjs(15,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
--index.cjs(16,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
--index.cjs(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
--index.cjs(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
--index.cjs(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+@@= skipped -8, +8 lines =@@
+ index.cjs(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+ index.cjs(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+ index.cjs(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
 -index.cjs(51,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.cjs(52,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.cjs(53,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.cjs(54,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.cjs(55,1): error TS8002: 'import ... =' can only be used in TypeScript files.
@@ -23,37 +15,21 @@
 -index.cjs(57,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.cjs(58,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.cjs(59,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.cjs(60,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.cjs(61,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cjs(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.cjs(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.cjs(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(78,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(79,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.cjs(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(81,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(82,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.cjs(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(84,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(85,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.js(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.js(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.js(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.js(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.js(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+ index.cjs(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+ index.cjs(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+@@= skipped -38, +27 lines =@@
+ index.js(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+ index.js(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+ index.js(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
 -index.js(50,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(51,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(52,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.js(53,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.js(54,1): error TS8002: 'import ... =' can only be used in TypeScript files.
@@ -61,37 +37,21 @@
 -index.js(56,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.js(57,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.js(58,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(59,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(60,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.js(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.js(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.js(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.js(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.js(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.mjs(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.mjs(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.mjs(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.mjs(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.mjs(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+ index.js(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+ index.js(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+@@= skipped -38, +27 lines =@@
+ index.mjs(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+ index.mjs(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+ index.mjs(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
 -index.mjs(50,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.mjs(51,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.mjs(52,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.mjs(53,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.mjs(54,1): error TS8002: 'import ... =' can only be used in TypeScript files.
@@ -99,570 +59,178 @@
 -index.mjs(56,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.mjs(57,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.mjs(58,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.mjs(59,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.mjs(60,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mjs(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.mjs(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.mjs(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.mjs(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.mjs(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--
--
--==== subfolder/index.js (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder/index.cjs (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder/index.mjs (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.js (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.cjs (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.mjs (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.js (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.cjs (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.mjs (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
+ index.mjs(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+ index.mjs(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+@@= skipped -65, +54 lines =@@
+     // esm format file
+     const x = 1;
+     export {x};
 -==== index.js (38 errors) ====
--    import * as m1 from "./index.js";
--    import * as m2 from "./index.mjs";
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--    import * as m11 from "./subfolder2/another/index.mjs";
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    import * as m15 from "./subfolder";
--                         ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m16 from "./subfolder/";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m17 from "./subfolder/index";
--                         ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    import * as m18 from "./subfolder2";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m19 from "./subfolder2/";
--                         ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m20 from "./subfolder2/index";
--                         ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
++==== index.js (27 errors) ====
+     import * as m1 from "./index.js";
+     import * as m2 from "./index.mjs";
+     import * as m3 from "./index.cjs";
+@@= skipped -73, +73 lines =@@
+     
+     // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+     import m24 = require("./");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
+                          ~~~~
+ !!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m25 = require("./index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
+                          ~~~~~~~~~
+ !!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m26 = require("./subfolder");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m27 = require("./subfolder/");
+     import m27 = require("./subfolder/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m28 = require("./subfolder/index");
+     import m28 = require("./subfolder/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m29 = require("./subfolder2");
+     import m29 = require("./subfolder2");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m30 = require("./subfolder2/");
+     import m30 = require("./subfolder2/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m31 = require("./subfolder2/index");
+     import m31 = require("./subfolder2/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m32 = require("./subfolder2/another");
+     import m32 = require("./subfolder2/another");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
+                          ~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m33 = require("./subfolder2/another/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
+                          ~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m34 = require("./subfolder2/another/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    // esm format file
--    const x = 1;
--    export {x};
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     void m24;
+@@= skipped -91, +69 lines =@@
+     // esm format file
+     const x = 1;
+     export {x};
 -==== index.cjs (38 errors) ====
--    // ESM-format imports below should issue errors
--    import * as m1 from "./index.js";
--                        ~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
--    import * as m2 from "./index.mjs";
--                        ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--                        ~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
--    import * as m11 from "./subfolder2/another/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file)
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
--    import * as m15 from "./subfolder";
--    import * as m16 from "./subfolder/";
--    import * as m17 from "./subfolder/index";
--    import * as m18 from "./subfolder2";
--    import * as m19 from "./subfolder2/";
--    import * as m20 from "./subfolder2/index";
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
++==== index.cjs (27 errors) ====
+     // ESM-format imports below should issue errors
+     import * as m1 from "./index.js";
+                         ~~~~~~~~~~~~
+@@= skipped -74, +74 lines =@@
+     
+     // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+     import m24 = require("./");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
+                          ~~~~
+ !!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m25 = require("./index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
+                          ~~~~~~~~~
+ !!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m26 = require("./subfolder");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m27 = require("./subfolder/");
+     import m27 = require("./subfolder/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m28 = require("./subfolder/index");
+     import m28 = require("./subfolder/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m29 = require("./subfolder2");
+     import m29 = require("./subfolder2");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m30 = require("./subfolder2/");
+     import m30 = require("./subfolder2/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m31 = require("./subfolder2/index");
+     import m31 = require("./subfolder2/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m32 = require("./subfolder2/another");
+     import m32 = require("./subfolder2/another");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
+                          ~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m33 = require("./subfolder2/another/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
+                          ~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m34 = require("./subfolder2/another/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    // cjs format file
--    const x = 1;
--    export {x};
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     void m24;
+@@= skipped -91, +69 lines =@@
+     // cjs format file
+     const x = 1;
+     export {x};
 -==== index.mjs (38 errors) ====
--    import * as m1 from "./index.js";
--    import * as m2 from "./index.mjs";
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--    import * as m11 from "./subfolder2/another/index.mjs";
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones should all fail - esm format files have no index resolution or extension resolution
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    import * as m15 from "./subfolder";
--                         ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m16 from "./subfolder/";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m17 from "./subfolder/index";
--                         ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    import * as m18 from "./subfolder2";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m19 from "./subfolder2/";
--                         ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m20 from "./subfolder2/index";
--                         ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
++==== index.mjs (27 errors) ====
+     import * as m1 from "./index.js";
+     import * as m2 from "./index.mjs";
+     import * as m3 from "./index.cjs";
+@@= skipped -73, +73 lines =@@
+     
+     // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+     import m24 = require("./");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
+                          ~~~~
+ !!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m25 = require("./index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
+                          ~~~~~~~~~
+ !!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m26 = require("./subfolder");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m27 = require("./subfolder/");
+     import m27 = require("./subfolder/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m28 = require("./subfolder/index");
+     import m28 = require("./subfolder/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m29 = require("./subfolder2");
+     import m29 = require("./subfolder2");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m30 = require("./subfolder2/");
+     import m30 = require("./subfolder2/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m31 = require("./subfolder2/index");
+     import m31 = require("./subfolder2/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m32 = require("./subfolder2/another");
+     import m32 = require("./subfolder2/another");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
+                          ~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m33 = require("./subfolder2/another/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
+                          ~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m34 = require("./subfolder2/another/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    
--    // esm format file
--    const x = 1;
--    export {x};
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module"
--    }
--==== subfolder/package.json (0 errors) ====
--    {
--        "type": "commonjs"
--    }
--==== subfolder2/package.json (0 errors) ====
--    {
--    }
--==== subfolder2/another/package.json (0 errors) ====
--    {
--        "type": "module"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     void m24;
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=node16).types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=node16).types.diff
index 47f1cfe2e7..16d3df3037 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=node16).types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=node16).types.diff
@@ -53,48 +53,7 @@
  
  // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
  import * as m13 from "./";
-->m13 : any
-+>m13 : typeof import("index")
- 
- import * as m14 from "./index";
-->m14 : any
-+>m14 : typeof import("index")
- 
- import * as m15 from "./subfolder";
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- import * as m16 from "./subfolder/";
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- import * as m17 from "./subfolder/index";
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- import * as m18 from "./subfolder2";
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- import * as m19 from "./subfolder2/";
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- import * as m20 from "./subfolder2/index";
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- import * as m21 from "./subfolder2/another";
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- import * as m22 from "./subfolder2/another/";
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- import * as m23 from "./subfolder2/another/index";
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -71, +71 lines =@@
  
  void m1;
  >void m1 : undefined
@@ -158,58 +117,7 @@
  
  void m13;
  >void m13 : undefined
-->m13 : any
-+>m13 : typeof import("index")
- 
- void m14;
- >void m14 : undefined
-->m14 : any
-+>m14 : typeof import("index")
- 
- void m15;
- >void m15 : undefined
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- void m16;
- >void m16 : undefined
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- void m17;
- >void m17 : undefined
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- void m18;
- >void m18 : undefined
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- void m19;
- >void m19 : undefined
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- void m20;
- >void m20 : undefined
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- void m21;
- >void m21 : undefined
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- void m22;
- >void m22 : undefined
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- void m23;
- >void m23 : undefined
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -92, +92 lines =@@
  
  // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
  import m24 = require("./");
@@ -313,84 +221,7 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // esm format file
-@@= skipped -306, +306 lines =@@
+@@= skipped -143, +143 lines =@@
  === index.cjs ===
  // ESM-format imports below should issue errors
  import * as m1 from "./index.js";
@@ -703,83 +534,6 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // cjs format file
 @@= skipped -305, +305 lines =@@
  
  === index.mjs ===
@@ -833,48 +587,7 @@
  
  // The next ones should all fail - esm format files have no index resolution or extension resolution
  import * as m13 from "./";
-->m13 : any
-+>m13 : typeof import("index")
- 
- import * as m14 from "./index";
-->m14 : any
-+>m14 : typeof import("index")
- 
- import * as m15 from "./subfolder";
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- import * as m16 from "./subfolder/";
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- import * as m17 from "./subfolder/index";
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- import * as m18 from "./subfolder2";
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- import * as m19 from "./subfolder2/";
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- import * as m20 from "./subfolder2/index";
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- import * as m21 from "./subfolder2/another";
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- import * as m22 from "./subfolder2/another/";
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- import * as m23 from "./subfolder2/another/index";
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -71, +71 lines =@@
  
  void m1;
  >void m1 : undefined
@@ -938,58 +651,7 @@
  
  void m13;
  >void m13 : undefined
-->m13 : any
-+>m13 : typeof import("index")
- 
- void m14;
- >void m14 : undefined
-->m14 : any
-+>m14 : typeof import("index")
- 
- void m15;
- >void m15 : undefined
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- void m16;
- >void m16 : undefined
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- void m17;
- >void m17 : undefined
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- void m18;
- >void m18 : undefined
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- void m19;
- >void m19 : undefined
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- void m20;
- >void m20 : undefined
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- void m21;
- >void m21 : undefined
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- void m22;
- >void m22 : undefined
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- void m23;
- >void m23 : undefined
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -92, +92 lines =@@
  
  // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
  import m24 = require("./");
@@ -1093,80 +755,3 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // esm format file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=nodenext).errors.txt.diff
index 612ca5ca16..05b010b0f6 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=nodenext).errors.txt.diff
@@ -1,21 +1,13 @@
 --- old.nodeModulesAllowJs1(module=nodenext).errors.txt
 +++ new.nodeModulesAllowJs1(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cjs(2,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
--index.cjs(3,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
--index.cjs(6,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
--index.cjs(9,21): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
--index.cjs(11,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
--index.cjs(12,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
--index.cjs(15,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
--index.cjs(16,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
--index.cjs(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
--index.cjs(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
--index.cjs(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
+@@= skipped -8, +8 lines =@@
+ index.cjs(23,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
+ index.cjs(24,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
+ index.cjs(25,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
 -index.cjs(51,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(51,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.cjs(52,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(52,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.cjs(53,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.cjs(54,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.cjs(55,1): error TS8002: 'import ... =' can only be used in TypeScript files.
@@ -23,37 +15,21 @@
 -index.cjs(57,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.cjs(58,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.cjs(59,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(59,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.cjs(60,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(60,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.cjs(61,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.cjs(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.cjs(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.cjs(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.cjs(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(78,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(79,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.cjs(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(81,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(82,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.cjs(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(84,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.cjs(85,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.js(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.js(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.js(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.js(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.js(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+ index.cjs(61,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.cjs(75,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+ index.cjs(76,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+@@= skipped -38, +27 lines =@@
+ index.js(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+ index.js(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+ index.js(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
 -index.js(50,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(51,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(52,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.js(53,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.js(54,1): error TS8002: 'import ... =' can only be used in TypeScript files.
@@ -61,37 +37,21 @@
 -index.js(56,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.js(57,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.js(58,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(59,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(60,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.js(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.js(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.js(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.js(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.js(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.js(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--index.mjs(14,22): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.mjs(15,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.mjs(16,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(17,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(18,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.mjs(19,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(20,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(21,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.mjs(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
+ index.js(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+ index.js(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+@@= skipped -38, +27 lines =@@
+ index.mjs(22,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+ index.mjs(23,22): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
+ index.mjs(24,22): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
 -index.mjs(50,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(50,22): error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.mjs(51,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(51,22): error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.mjs(52,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.mjs(53,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.mjs(54,1): error TS8002: 'import ... =' can only be used in TypeScript files.
@@ -99,570 +59,178 @@
 -index.mjs(56,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.mjs(57,1): error TS8002: 'import ... =' can only be used in TypeScript files.
 -index.mjs(58,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(58,22): error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.mjs(59,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(59,22): error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.mjs(60,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.mjs(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--index.mjs(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
--index.mjs(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--index.mjs(76,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(77,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(78,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--index.mjs(79,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(80,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(81,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--index.mjs(82,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(83,21): error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--index.mjs(84,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--
--
--==== subfolder/index.js (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder/index.cjs (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder/index.mjs (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.js (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.cjs (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/index.mjs (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.js (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.cjs (0 errors) ====
--    // cjs format file
--    const x = 1;
--    export {x};
--==== subfolder2/another/index.mjs (0 errors) ====
--    // esm format file
--    const x = 1;
--    export {x};
+ index.mjs(60,22): error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.mjs(74,21): error TS2307: Cannot find module './' or its corresponding type declarations.
+ index.mjs(75,21): error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
+@@= skipped -65, +54 lines =@@
+     // esm format file
+     const x = 1;
+     export {x};
 -==== index.js (38 errors) ====
--    import * as m1 from "./index.js";
--    import * as m2 from "./index.mjs";
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--    import * as m11 from "./subfolder2/another/index.mjs";
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    import * as m15 from "./subfolder";
--                         ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m16 from "./subfolder/";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m17 from "./subfolder/index";
--                         ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    import * as m18 from "./subfolder2";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m19 from "./subfolder2/";
--                         ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m20 from "./subfolder2/index";
--                         ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
++==== index.js (27 errors) ====
+     import * as m1 from "./index.js";
+     import * as m2 from "./index.mjs";
+     import * as m3 from "./index.cjs";
+@@= skipped -73, +73 lines =@@
+     
+     // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+     import m24 = require("./");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
+                          ~~~~
+ !!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m25 = require("./index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
+                          ~~~~~~~~~
+ !!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m26 = require("./subfolder");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m27 = require("./subfolder/");
+     import m27 = require("./subfolder/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m28 = require("./subfolder/index");
+     import m28 = require("./subfolder/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m29 = require("./subfolder2");
+     import m29 = require("./subfolder2");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m30 = require("./subfolder2/");
+     import m30 = require("./subfolder2/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m31 = require("./subfolder2/index");
+     import m31 = require("./subfolder2/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m32 = require("./subfolder2/another");
+     import m32 = require("./subfolder2/another");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
+                          ~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m33 = require("./subfolder2/another/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
+                          ~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m34 = require("./subfolder2/another/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    // esm format file
--    const x = 1;
--    export {x};
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     void m24;
+@@= skipped -91, +69 lines =@@
+     // esm format file
+     const x = 1;
+     export {x};
 -==== index.cjs (38 errors) ====
--    // ESM-format imports below should issue errors
--    import * as m1 from "./index.js";
--                        ~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.js")' call instead.
--    import * as m2 from "./index.mjs";
--                        ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index.mjs")' call instead.
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder/index.mjs")' call instead.
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--                        ~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/index.mjs")' call instead.
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.js")' call instead.
--    import * as m11 from "./subfolder2/another/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index.mjs")' call instead.
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file)
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./")' call instead.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./index")' call instead.
--    import * as m15 from "./subfolder";
--    import * as m16 from "./subfolder/";
--    import * as m17 from "./subfolder/index";
--    import * as m18 from "./subfolder2";
--    import * as m19 from "./subfolder2/";
--    import * as m20 from "./subfolder2/index";
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another")' call instead.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/")' call instead.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./subfolder2/another/index")' call instead.
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
++==== index.cjs (27 errors) ====
+     // ESM-format imports below should issue errors
+     import * as m1 from "./index.js";
+                         ~~~~~~~~~~~~
+@@= skipped -74, +74 lines =@@
+     
+     // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+     import m24 = require("./");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
+                          ~~~~
+ !!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m25 = require("./index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
+                          ~~~~~~~~~
+ !!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m26 = require("./subfolder");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m27 = require("./subfolder/");
+     import m27 = require("./subfolder/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m28 = require("./subfolder/index");
+     import m28 = require("./subfolder/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m29 = require("./subfolder2");
+     import m29 = require("./subfolder2");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m30 = require("./subfolder2/");
+     import m30 = require("./subfolder2/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m31 = require("./subfolder2/index");
+     import m31 = require("./subfolder2/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m32 = require("./subfolder2/another");
+     import m32 = require("./subfolder2/another");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
+                          ~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m33 = require("./subfolder2/another/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
+                          ~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m34 = require("./subfolder2/another/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    // cjs format file
--    const x = 1;
--    export {x};
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     void m24;
+@@= skipped -91, +69 lines =@@
+     // cjs format file
+     const x = 1;
+     export {x};
 -==== index.mjs (38 errors) ====
--    import * as m1 from "./index.js";
--    import * as m2 from "./index.mjs";
--    import * as m3 from "./index.cjs";
--    import * as m4 from "./subfolder/index.js";
--    import * as m5 from "./subfolder/index.mjs";
--    import * as m6 from "./subfolder/index.cjs";
--    import * as m7 from "./subfolder2/index.js";
--    import * as m8 from "./subfolder2/index.mjs";
--    import * as m9 from "./subfolder2/index.cjs";
--    import * as m10 from "./subfolder2/another/index.js";
--    import * as m11 from "./subfolder2/another/index.mjs";
--    import * as m12 from "./subfolder2/another/index.cjs";
--    // The next ones should all fail - esm format files have no index resolution or extension resolution
--    import * as m13 from "./";
--                         ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    import * as m14 from "./index";
--                         ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    import * as m15 from "./subfolder";
--                         ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m16 from "./subfolder/";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m17 from "./subfolder/index";
--                         ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    import * as m18 from "./subfolder2";
--                         ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m19 from "./subfolder2/";
--                         ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m20 from "./subfolder2/index";
--                         ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    import * as m21 from "./subfolder2/another";
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m22 from "./subfolder2/another/";
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    import * as m23 from "./subfolder2/another/index";
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    void m1;
--    void m2;
--    void m3;
--    void m4;
--    void m5;
--    void m6;
--    void m7;
--    void m8;
--    void m9;
--    void m10;
--    void m11;
--    void m12;
--    void m13;
--    void m14;
--    void m15;
--    void m16;
--    void m17;
--    void m18;
--    void m19;
--    void m20;
--    void m21;
--    void m22;
--    void m23;
--    
--    // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
--    import m24 = require("./");
++==== index.mjs (27 errors) ====
+     import * as m1 from "./index.js";
+     import * as m2 from "./index.mjs";
+     import * as m3 from "./index.cjs";
+@@= skipped -73, +73 lines =@@
+     
+     // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
+     import m24 = require("./");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~
--!!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m25 = require("./index");
+                          ~~~~
+ !!! error TS1471: Module './' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m25 = require("./index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~
--!!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m26 = require("./subfolder");
+                          ~~~~~~~~~
+ !!! error TS1471: Module './index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m26 = require("./subfolder");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m27 = require("./subfolder/");
+     import m27 = require("./subfolder/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m28 = require("./subfolder/index");
+     import m28 = require("./subfolder/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m29 = require("./subfolder2");
+     import m29 = require("./subfolder2");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m30 = require("./subfolder2/");
+     import m30 = require("./subfolder2/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m31 = require("./subfolder2/index");
+     import m31 = require("./subfolder2/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    import m32 = require("./subfolder2/another");
+     import m32 = require("./subfolder2/another");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m33 = require("./subfolder2/another/");
+                          ~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m33 = require("./subfolder2/another/");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import m34 = require("./subfolder2/another/index");
+                          ~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import m34 = require("./subfolder2/another/index");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    void m24;
--    void m25;
--    void m26;
--    void m27;
--    void m28;
--    void m29;
--    void m30;
--    void m31;
--    void m32;
--    void m33;
--    void m34;
--    
--    // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
--    const _m35 = import("./");
--                        ~~~~
--!!! error TS2307: Cannot find module './' or its corresponding type declarations.
--    const _m36 = import("./index");
--                        ~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './index.mjs'?
--    const _m37 = import("./subfolder");
--                        ~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m38 = import("./subfolder/");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m39 = import("./subfolder/index");
--                        ~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder/index.mjs'?
--    const _m40 = import("./subfolder2");
--                        ~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m41 = import("./subfolder2/");
--                        ~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m42 = import("./subfolder2/index");
--                        ~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/index.mjs'?
--    const _m43 = import("./subfolder2/another");
--                        ~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m44 = import("./subfolder2/another/");
--                        ~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2834: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Consider adding an extension to the import path.
--    const _m45 = import("./subfolder2/another/index");
--                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--!!! error TS2835: Relative import paths need explicit file extensions in ECMAScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './subfolder2/another/index.mjs'?
--    
--    // esm format file
--    const x = 1;
--    export {x};
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module"
--    }
--==== subfolder/package.json (0 errors) ====
--    {
--        "type": "commonjs"
--    }
--==== subfolder2/package.json (0 errors) ====
--    {
--    }
--==== subfolder2/another/package.json (0 errors) ====
--    {
--        "type": "module"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1471: Module './subfolder2/another/index' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     void m24;
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=nodenext).types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=nodenext).types.diff
index 1efbd7d99f..03dcecc24f 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJs1(module=nodenext).types.diff
@@ -53,48 +53,7 @@
  
  // The next ones shouldn't all work - esm format files have no index resolution or extension resolution
  import * as m13 from "./";
-->m13 : any
-+>m13 : typeof import("index")
- 
- import * as m14 from "./index";
-->m14 : any
-+>m14 : typeof import("index")
- 
- import * as m15 from "./subfolder";
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- import * as m16 from "./subfolder/";
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- import * as m17 from "./subfolder/index";
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- import * as m18 from "./subfolder2";
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- import * as m19 from "./subfolder2/";
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- import * as m20 from "./subfolder2/index";
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- import * as m21 from "./subfolder2/another";
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- import * as m22 from "./subfolder2/another/";
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- import * as m23 from "./subfolder2/another/index";
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -71, +71 lines =@@
  
  void m1;
  >void m1 : undefined
@@ -158,58 +117,7 @@
  
  void m13;
  >void m13 : undefined
-->m13 : any
-+>m13 : typeof import("index")
- 
- void m14;
- >void m14 : undefined
-->m14 : any
-+>m14 : typeof import("index")
- 
- void m15;
- >void m15 : undefined
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- void m16;
- >void m16 : undefined
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- void m17;
- >void m17 : undefined
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- void m18;
- >void m18 : undefined
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- void m19;
- >void m19 : undefined
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- void m20;
- >void m20 : undefined
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- void m21;
- >void m21 : undefined
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- void m22;
- >void m22 : undefined
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- void m23;
- >void m23 : undefined
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -92, +92 lines =@@
  
  // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
  import m24 = require("./");
@@ -313,84 +221,7 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // esm format file
-@@= skipped -306, +306 lines =@@
+@@= skipped -143, +143 lines =@@
  === index.cjs ===
  // ESM-format imports below should issue errors
  import * as m1 from "./index.js";
@@ -703,83 +534,6 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // cjs format file
 @@= skipped -305, +305 lines =@@
  
  === index.mjs ===
@@ -833,48 +587,7 @@
  
  // The next ones should all fail - esm format files have no index resolution or extension resolution
  import * as m13 from "./";
-->m13 : any
-+>m13 : typeof import("index")
- 
- import * as m14 from "./index";
-->m14 : any
-+>m14 : typeof import("index")
- 
- import * as m15 from "./subfolder";
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- import * as m16 from "./subfolder/";
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- import * as m17 from "./subfolder/index";
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- import * as m18 from "./subfolder2";
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- import * as m19 from "./subfolder2/";
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- import * as m20 from "./subfolder2/index";
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- import * as m21 from "./subfolder2/another";
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- import * as m22 from "./subfolder2/another/";
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- import * as m23 from "./subfolder2/another/index";
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -71, +71 lines =@@
  
  void m1;
  >void m1 : undefined
@@ -938,58 +651,7 @@
  
  void m13;
  >void m13 : undefined
-->m13 : any
-+>m13 : typeof import("index")
- 
- void m14;
- >void m14 : undefined
-->m14 : any
-+>m14 : typeof import("index")
- 
- void m15;
- >void m15 : undefined
-->m15 : any
-+>m15 : typeof import("subfolder/index")
- 
- void m16;
- >void m16 : undefined
-->m16 : any
-+>m16 : typeof import("subfolder/index")
- 
- void m17;
- >void m17 : undefined
-->m17 : any
-+>m17 : typeof import("subfolder/index")
- 
- void m18;
- >void m18 : undefined
-->m18 : any
-+>m18 : typeof import("subfolder2/index")
- 
- void m19;
- >void m19 : undefined
-->m19 : any
-+>m19 : typeof import("subfolder2/index")
- 
- void m20;
- >void m20 : undefined
-->m20 : any
-+>m20 : typeof import("subfolder2/index")
- 
- void m21;
- >void m21 : undefined
-->m21 : any
-+>m21 : typeof import("subfolder2/another/index")
- 
- void m22;
- >void m22 : undefined
-->m22 : any
-+>m22 : typeof import("subfolder2/another/index")
- 
- void m23;
- >void m23 : undefined
-->m23 : any
-+>m23 : typeof import("subfolder2/another/index")
+@@= skipped -92, +92 lines =@@
  
  // These should _mostly_ work - `import = require` always desugars to require calls, which do have extension and index resolution (but can't load anything that resolves to esm!)
  import m24 = require("./");
@@ -1093,80 +755,3 @@
  
  // These shouldn't work - dynamic `import()` always uses the esm resolver, which does not have extension resolution
  const _m35 = import("./");
-->_m35 : Promise<any>
-->import("./") : Promise<any>
-+>_m35 : Promise<typeof import("index")>
-+>import("./") : Promise<typeof import("index")>
- >"./" : "./"
- 
- const _m36 = import("./index");
-->_m36 : Promise<any>
-->import("./index") : Promise<any>
-+>_m36 : Promise<typeof import("index")>
-+>import("./index") : Promise<typeof import("index")>
- >"./index" : "./index"
- 
- const _m37 = import("./subfolder");
-->_m37 : Promise<any>
-->import("./subfolder") : Promise<any>
-+>_m37 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder") : Promise<typeof import("subfolder/index")>
- >"./subfolder" : "./subfolder"
- 
- const _m38 = import("./subfolder/");
-->_m38 : Promise<any>
-->import("./subfolder/") : Promise<any>
-+>_m38 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/") : Promise<typeof import("subfolder/index")>
- >"./subfolder/" : "./subfolder/"
- 
- const _m39 = import("./subfolder/index");
-->_m39 : Promise<any>
-->import("./subfolder/index") : Promise<any>
-+>_m39 : Promise<typeof import("subfolder/index")>
-+>import("./subfolder/index") : Promise<typeof import("subfolder/index")>
- >"./subfolder/index" : "./subfolder/index"
- 
- const _m40 = import("./subfolder2");
-->_m40 : Promise<any>
-->import("./subfolder2") : Promise<any>
-+>_m40 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2" : "./subfolder2"
- 
- const _m41 = import("./subfolder2/");
-->_m41 : Promise<any>
-->import("./subfolder2/") : Promise<any>
-+>_m41 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/" : "./subfolder2/"
- 
- const _m42 = import("./subfolder2/index");
-->_m42 : Promise<any>
-->import("./subfolder2/index") : Promise<any>
-+>_m42 : Promise<typeof import("subfolder2/index")>
-+>import("./subfolder2/index") : Promise<typeof import("subfolder2/index")>
- >"./subfolder2/index" : "./subfolder2/index"
- 
- const _m43 = import("./subfolder2/another");
-->_m43 : Promise<any>
-->import("./subfolder2/another") : Promise<any>
-+>_m43 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another" : "./subfolder2/another"
- 
- const _m44 = import("./subfolder2/another/");
-->_m44 : Promise<any>
-->import("./subfolder2/another/") : Promise<any>
-+>_m44 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/" : "./subfolder2/another/"
- 
- const _m45 = import("./subfolder2/another/index");
-->_m45 : Promise<any>
-->import("./subfolder2/another/index") : Promise<any>
-+>_m45 : Promise<typeof import("subfolder2/another/index")>
-+>import("./subfolder2/another/index") : Promise<typeof import("subfolder2/another/index")>
- >"./subfolder2/another/index" : "./subfolder2/another/index"
- 
- // esm format file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt.diff
index d8d3c8af21..5c51ea3a73 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt.diff
@@ -2,8 +2,8 @@
 +++ new.nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 -node_modules/inner/index.d.mts(2,13): error TS2303: Circular definition of import alias 'cjs'.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
 +index.cjs(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
@@ -34,7 +34,7 @@
      // esm format file
      import * as cjs from "package/cjs";
      import * as mjs from "package/mjs";
-@@= skipped -14, +28 lines =@@
+@@= skipped -14, +30 lines =@@
      mjs;
      type;
      import * as cjsi from "inner/a";
@@ -78,16 +78,11 @@
 +!!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
      ts.mjsSource;
 -==== index.cjs (2 errors) ====
-+==== index.cjs (3 errors) ====
++==== index.cjs (5 errors) ====
      // cjs format file
      import * as cjs from "package/cjs";
      import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
-     import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
-     cjs;
+@@= skipped -20, +28 lines =@@
      mjs;
      type;
      import * as cjsi from "inner/a";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt.diff
index dd7bac280a..a586fd7d31 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt.diff
@@ -2,8 +2,8 @@
 +++ new.nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
 -node_modules/inner/index.d.mts(2,13): error TS2303: Circular definition of import alias 'cjs'.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
 +index.cjs(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
@@ -34,7 +34,7 @@
      // esm format file
      import * as cjs from "package/cjs";
      import * as mjs from "package/mjs";
-@@= skipped -14, +28 lines =@@
+@@= skipped -14, +30 lines =@@
      mjs;
      type;
      import * as cjsi from "inner/a";
@@ -78,16 +78,11 @@
 +!!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
      ts.mjsSource;
 -==== index.cjs (2 errors) ====
-+==== index.cjs (3 errors) ====
++==== index.cjs (5 errors) ====
      // cjs format file
      import * as cjs from "package/cjs";
      import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
-     import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
-     cjs;
+@@= skipped -20, +28 lines =@@
      mjs;
      type;
      import * as cjsi from "inner/a";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageExports(module=node16).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageExports(module=node16).errors.txt.diff
index e5b929dcc0..cf48af7d9f 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageExports(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageExports(module=node16).errors.txt.diff
@@ -1,114 +1,29 @@
 --- old.nodeModulesAllowJsPackageExports(module=node16).errors.txt
 +++ new.nodeModulesAllowJsPackageExports(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--index.cjs(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cjs(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--
--
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ 
+ 
 -!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--==== index.js (0 errors) ====
--    // esm format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--    import * as type from "package";
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--    import * as type from "package";
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cjs (3 errors) ====
--    // cjs format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--    import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--                          ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
+ ==== index.js (0 errors) ====
+     // esm format file
+     import * as cjs from "package/cjs";
+@@= skipped -55, +52 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs";
--    import * as mjs from "inner/mjs";
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs";
--    import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": {
--            "./cjs": "./index.cjs",
--            "./mjs": "./index.mjs",
--            ".": "./index.js"
--        }
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs": "./index.cjs",
--            "./mjs": "./index.mjs",
--            ".": "./index.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs";
+                          ~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageExports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageExports(module=nodenext).errors.txt.diff
index c7ea197886..36ce535798 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageExports(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageExports(module=nodenext).errors.txt.diff
@@ -1,114 +1,29 @@
 --- old.nodeModulesAllowJsPackageExports(module=nodenext).errors.txt
 +++ new.nodeModulesAllowJsPackageExports(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--index.cjs(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
+ index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
+ index.cjs(9,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--
--
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
+ 
+ 
 -!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--==== index.js (0 errors) ====
--    // esm format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--    import * as type from "package";
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--    import * as type from "package";
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cjs (3 errors) ====
--    // cjs format file
--    import * as cjs from "package/cjs";
--    import * as mjs from "package/mjs";
--                         ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
--    import * as type from "package";
--                          ~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
--    cjs;
--    mjs;
--    type;
--    import * as cjsi from "inner/cjs";
--    import * as mjsi from "inner/mjs";
--                          ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as typei from "inner";
--    cjsi;
--    mjsi;
--    typei;
+ ==== index.js (0 errors) ====
+     // esm format file
+     import * as cjs from "package/cjs";
+@@= skipped -55, +52 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs";
--    import * as mjs from "inner/mjs";
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs";
--    import * as mjs from "inner/mjs";
--                         ~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
--    import * as type from "inner";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": {
--            "./cjs": "./index.cjs",
--            "./mjs": "./index.mjs",
--            ".": "./index.js"
--        }
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs": "./index.cjs",
--            "./mjs": "./index.mjs",
--            ".": "./index.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs";
+                          ~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs")' call instead.
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageImports(module=node16).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageImports(module=node16).errors.txt.diff
index 1fd07f2f6d..e6460418c8 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageImports(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageImports(module=node16).errors.txt.diff
@@ -1,51 +1,12 @@
 --- old.nodeModulesAllowJsPackageImports(module=node16).errors.txt
 +++ new.nodeModulesAllowJsPackageImports(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS2210: The project root is ambiguous, but is required to resolve import map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
--index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
--
--
+ index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+ index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+ 
+ 
 -!!! error TS2210: The project root is ambiguous, but is required to resolve import map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--==== index.js (0 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--    import * as type from "#type";
--    cjs;
--    mjs;
--    type;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--    import * as type from "#type";
--    cjs;
--    mjs;
--    type;
--==== index.cjs (2 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--                         ~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
--    import * as type from "#type";
--                          ~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
--    cjs;
--    mjs;
--    type;
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js",
--        "imports": {
--            "#cjs": "./index.cjs",
--            "#mjs": "./index.mjs",
--            "#type": "./index.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+ ==== index.js (0 errors) ====
+     // esm format file
+     import * as cjs from "#cjs";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageImports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageImports(module=nodenext).errors.txt.diff
index 2f917ca205..ec5db91b87 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageImports(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackageImports(module=nodenext).errors.txt.diff
@@ -1,51 +1,12 @@
 --- old.nodeModulesAllowJsPackageImports(module=nodenext).errors.txt
 +++ new.nodeModulesAllowJsPackageImports(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -error TS2210: The project root is ambiguous, but is required to resolve import map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
--index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
--
--
+ index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
+ index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
+ 
+ 
 -!!! error TS2210: The project root is ambiguous, but is required to resolve import map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
--==== index.js (0 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--    import * as type from "#type";
--    cjs;
--    mjs;
--    type;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--    import * as type from "#type";
--    cjs;
--    mjs;
--    type;
--==== index.cjs (2 errors) ====
--    // esm format file
--    import * as cjs from "#cjs";
--    import * as mjs from "#mjs";
--                         ~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#mjs")' call instead.
--    import * as type from "#type";
--                          ~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("#type")' call instead.
--    cjs;
--    mjs;
--    type;
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--        "exports": "./index.js",
--        "imports": {
--            "#cjs": "./index.cjs",
--            "#mjs": "./index.mjs",
--            "#type": "./index.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+ ==== index.js (0 errors) ====
+     // esm format file
+     import * as cjs from "#cjs";
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt.diff
index ed103c6d81..29b6ffd15c 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt.diff
@@ -1,83 +1,22 @@
 --- old.nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt
 +++ new.nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+@@= skipped -0, +0 lines =@@
+ index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--
--
--==== index.js (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cjs (1 errors) ====
--    // cjs format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--                          ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ 
+ 
+@@= skipped -29, +28 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs/index";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs/index";
--    import * as mjs from "inner/mjs/index";
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index";
--    import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs/*": "./*.cjs",
--            "./mjs/*": "./*.mjs",
--            "./js/*": "./*.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs/index";
+                          ~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt.diff
index 4bfdbb3204..254f3ebe06 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt.diff
@@ -1,83 +1,22 @@
 --- old.nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt
 +++ new.nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+@@= skipped -0, +0 lines =@@
+ index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--
--
--==== index.js (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cjs (1 errors) ====
--    // cjs format file
--    import * as cjsi from "inner/cjs/index";
--    import * as mjsi from "inner/mjs/index";
--                          ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as typei from "inner/js/index";
--    cjsi;
--    mjsi;
--    typei;
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
+ 
+ 
+@@= skipped -29, +28 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs/index";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs/index";
--    import * as mjs from "inner/mjs/index";
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index";
--    import * as mjs from "inner/mjs/index";
--                         ~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
--    import * as type from "inner/js/index";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs/*": "./*.cjs",
--            "./mjs/*": "./*.mjs",
--            "./js/*": "./*.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs/index";
+                          ~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index")' call instead.
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt.diff
index f12832aa73..852583d9fb 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt.diff
@@ -1,83 +1,22 @@
 --- old.nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt
 +++ new.nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+@@= skipped -0, +0 lines =@@
+ index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--
--
--==== index.js (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cjs (1 errors) ====
--    // cjs format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--                          ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+ 
+ 
+@@= skipped -29, +28 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index.cjs";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs/index.cjs";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs/index.cjs";
--    import * as mjs from "inner/mjs/index.mjs";
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index.cjs";
--    import * as mjs from "inner/mjs/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs/*.cjs": "./*.cjs",
--            "./mjs/*.mjs": "./*.mjs",
--            "./js/*.js": "./*.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs/index.mjs";
+                          ~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt.diff
index c9c0f652b6..4d838bb66e 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt.diff
@@ -1,83 +1,22 @@
 --- old.nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt
 +++ new.nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
--index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+@@= skipped -0, +0 lines =@@
+ index.cjs(3,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+ node_modules/inner/index.d.cts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
 -node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
--node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--
--
--==== index.js (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
--==== index.mjs (0 errors) ====
--    // esm format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
--==== index.cjs (1 errors) ====
--    // cjs format file
--    import * as cjsi from "inner/cjs/index.cjs";
--    import * as mjsi from "inner/mjs/index.mjs";
--                          ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as typei from "inner/js/index.js";
--    cjsi;
--    mjsi;
--    typei;
+ node_modules/inner/index.d.ts(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
+ 
+ 
+@@= skipped -29, +28 lines =@@
+     cjsi;
+     mjsi;
+     typei;
 -==== node_modules/inner/index.d.ts (2 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index.cjs";
++==== node_modules/inner/index.d.ts (1 errors) ====
+     // cjs format file
+     import * as cjs from "inner/cjs/index.cjs";
 -                ~~~
 -!!! error TS2303: Circular definition of import alias 'cjs'.
--    import * as mjs from "inner/mjs/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.mts (0 errors) ====
--    // esm format file
--    import * as cjs from "inner/cjs/index.cjs";
--    import * as mjs from "inner/mjs/index.mjs";
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== node_modules/inner/index.d.cts (1 errors) ====
--    // cjs format file
--    import * as cjs from "inner/cjs/index.cjs";
--    import * as mjs from "inner/mjs/index.mjs";
--                         ~~~~~~~~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
--    import * as type from "inner/js/index.js";
--    export { cjs };
--    export { mjs };
--    export { type };
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module",
--    }
--==== node_modules/inner/package.json (0 errors) ====
--    {
--        "name": "inner",
--        "private": true,
--        "exports": {
--            "./cjs/*.cjs": "./*.cjs",
--            "./mjs/*.mjs": "./*.mjs",
--            "./js/*.js": "./*.js"
--        }
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     import * as mjs from "inner/mjs/index.mjs";
+                          ~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("inner/mjs/index.mjs")' call instead.
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt.diff
index 87a2818f6a..58d0b5b325 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt.diff
@@ -1,62 +1,50 @@
 --- old.nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt
 +++ new.nodeModulesAllowJsSynchronousCallErrors(module=node16).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -index.js(3,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(5,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--subfolder/index.js(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+ subfolder/index.js(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
 -subfolder/index.js(3,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--subfolder/index.js(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ subfolder/index.js(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -subfolder/index.js(5,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--
--
+ 
+ 
 -==== subfolder/index.js (4 errors) ====
--    // cjs format file
--    import {h} from "../index.js";
--                    ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
--    import mod = require("../index.js");
++==== subfolder/index.js (2 errors) ====
+     // cjs format file
+     import {h} from "../index.js";
+                     ~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+ !!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+     import mod = require("../index.js");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~
--!!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import {f as _f} from "./index.js";
--    import mod2 = require("./index.js");
+                          ~~~~~~~~~~~~~
+ !!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import {f as _f} from "./index.js";
+     import mod2 = require("./index.js");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    export async function f() {
--        const mod3 = await import ("../index.js");
--        const mod4 = await import ("./index.js");
--        h();
--    }
+     export async function f() {
+         const mod3 = await import ("../index.js");
+         const mod4 = await import ("./index.js");
+         h();
+     }
 -==== index.js (3 errors) ====
--    // esm format file
--    import {h as _h} from "./index.js";
--    import mod = require("./index.js");
++==== index.js (1 errors) ====
+     // esm format file
+     import {h as _h} from "./index.js";
+     import mod = require("./index.js");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~
--!!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import {f} from "./subfolder/index.js";
--    import mod2 = require("./subfolder/index.js");
+                          ~~~~~~~~~~~~
+ !!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import {f} from "./subfolder/index.js";
+     import mod2 = require("./subfolder/index.js");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    export async function h() {
--        const mod3 = await import ("./index.js");
--        const mod4 = await import ("./subfolder/index.js");
--        f();
--    }
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module"
--    }
--==== subfolder/package.json (0 errors) ====
--    {
--        "type": "commonjs"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     export async function h() {
+         const mod3 = await import ("./index.js");
+         const mod4 = await import ("./subfolder/index.js");
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt.diff
index e16fbb3b9c..8463182439 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt.diff
@@ -1,62 +1,50 @@
 --- old.nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt
 +++ new.nodeModulesAllowJsSynchronousCallErrors(module=nodenext).errors.txt
-@@= skipped -0, +-1 lines =@@
+@@= skipped -0, +0 lines =@@
 -index.js(3,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--index.js(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ index.js(3,22): error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -index.js(5,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--subfolder/index.js(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+ subfolder/index.js(2,17): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
 -subfolder/index.js(3,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--subfolder/index.js(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+ subfolder/index.js(3,22): error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
 -subfolder/index.js(5,1): error TS8002: 'import ... =' can only be used in TypeScript files.
--
--
+ 
+ 
 -==== subfolder/index.js (4 errors) ====
--    // cjs format file
--    import {h} from "../index.js";
--                    ~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
--    import mod = require("../index.js");
++==== subfolder/index.js (2 errors) ====
+     // cjs format file
+     import {h} from "../index.js";
+                     ~~~~~~~~~~~~~
+ !!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("../index.js")' call instead.
+ !!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
+     import mod = require("../index.js");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~~
--!!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import {f as _f} from "./index.js";
--    import mod2 = require("./index.js");
+                          ~~~~~~~~~~~~~
+ !!! error TS1471: Module '../index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import {f as _f} from "./index.js";
+     import mod2 = require("./index.js");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    export async function f() {
--        const mod3 = await import ("../index.js");
--        const mod4 = await import ("./index.js");
--        h();
--    }
+     export async function f() {
+         const mod3 = await import ("../index.js");
+         const mod4 = await import ("./index.js");
+         h();
+     }
 -==== index.js (3 errors) ====
--    // esm format file
--    import {h as _h} from "./index.js";
--    import mod = require("./index.js");
++==== index.js (1 errors) ====
+     // esm format file
+     import {h as _h} from "./index.js";
+     import mod = require("./index.js");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--                         ~~~~~~~~~~~~
--!!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
--    import {f} from "./subfolder/index.js";
--    import mod2 = require("./subfolder/index.js");
+                          ~~~~~~~~~~~~
+ !!! error TS1471: Module './index.js' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported with 'require'. Use an ECMAScript import instead.
+     import {f} from "./subfolder/index.js";
+     import mod2 = require("./subfolder/index.js");
 -    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -!!! error TS8002: 'import ... =' can only be used in TypeScript files.
--    export async function h() {
--        const mod3 = await import ("./index.js");
--        const mod4 = await import ("./subfolder/index.js");
--        f();
--    }
--==== package.json (0 errors) ====
--    {
--        "name": "package",
--        "private": true,
--        "type": "module"
--    }
--==== subfolder/package.json (0 errors) ====
--    {
--        "type": "commonjs"
--    }
-@@= skipped --1, +1 lines =@@
-+<no content>
+     export async function h() {
+         const mod3 = await import ("./index.js");
+         const mod4 = await import ("./subfolder/index.js");
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt.diff
deleted file mode 100644
index 8af41b9af3..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- old.nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt
-+++ new.nodeModulesCJSResolvingToESM1_emptyPackageJson.errors.txt
-@@= skipped -0, +-1 lines =@@
--/ctsExtension.cts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--/jsExtension.js(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mjs', or add the field `"type": "module"` to '/package.json'.
--/tsExtension.ts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mts', or add the field `"type": "module"` to '/package.json'.
--/tsxExtension.tsx(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, add the field `"type": "module"` to '/package.json'.
--
--
--==== /package.json (0 errors) ====
--    {}
--    
--==== /module.mts (0 errors) ====
--    export {};
--    
--==== /tsExtension.ts (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts', or add the field `"type": "module"` to '/package.json'.
--    
--==== /jsExtension.js (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs', or add the field `"type": "module"` to '/package.json'.
--    
--==== /ctsExtension.cts (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--    
--==== /tsxExtension.tsx (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, add the field `"type": "module"` to '/package.json'.
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt.diff
deleted file mode 100644
index 2e56a33537..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- old.nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt
-+++ new.nodeModulesCJSResolvingToESM2_cjsPackageJson.errors.txt
-@@= skipped -0, +-1 lines =@@
--/ctsExtension.cts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--/jsExtension.js(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
--/tsExtension.ts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
--/tsxExtension.tsx(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.
--
--
--==== /package.json (0 errors) ====
--    { "type": "commonjs" }
--    
--==== /module.mts (0 errors) ====
--    export {};
--    
--==== /tsExtension.ts (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
--    
--==== /jsExtension.js (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
--    
--==== /ctsExtension.cts (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--    
--==== /tsxExtension.tsx (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt.diff
deleted file mode 100644
index f3698508bd..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- old.nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt
-+++ new.nodeModulesCJSResolvingToESM3_modulePackageJson.errors.txt
-@@= skipped -0, +-1 lines =@@
--/ctsExtension.cts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--
--
--==== /package.json (0 errors) ====
--    { "type": "module" }
--    
--==== /module.mts (0 errors) ====
--    export {};
--    
--==== /tsExtension.ts (0 errors) ====
--    import {} from "./module.mjs";
--    
--==== /jsExtension.js (0 errors) ====
--    import {} from "./module.mjs";
--    
--==== /ctsExtension.cts (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--    
--==== /tsxExtension.tsx (0 errors) ====
--    import {} from "./module.mjs";
--    
-@@= skipped --1, +1 lines =@@
-+<no content>
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt.diff
deleted file mode 100644
index f34a9b13b5..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- old.nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt
-+++ new.nodeModulesCJSResolvingToESM4_noPackageJson.errors.txt
-@@= skipped -0, +-1 lines =@@
--/ctsExtension.cts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--/jsExtension.js(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
--/tsExtension.ts(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
--/tsxExtension.tsx(1,16): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--  To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.
--
--
--==== /module.mts (0 errors) ====
--    export {};
--    
--==== /tsExtension.ts (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ "type": "module" }`.
--    
--==== /jsExtension.js (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, change its file extension to '.mjs' or create a local package.json file with `{ "type": "module" }`.
--    
--==== /ctsExtension.cts (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--    
--==== /tsxExtension.tsx (1 errors) ====
--    import {} from "./module.mjs";
--                   ~~~~~~~~~~~~~~
--!!! error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("./module.mjs")' call instead.
--!!! error TS1479:   To convert this file to an ECMAScript module, create a local package.json file with `{ "type": "module" }`.
--    
-@@= skipped --1, +1 lines =@@
-+<no content>

From 45fd7b71e65050aed766d5582c3cfb7540879932 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Fri, 30 May 2025 14:31:46 -0700
Subject: [PATCH 4/7] Thread resolution mode through module specifier
 generation

---
 internal/checker/checker.go                   |   7 +-
 internal/checker/nodebuilderimpl.go           |   6 +-
 internal/compiler/emitHost.go                 |   4 +
 internal/compiler/fileloader.go               |   3 +-
 internal/compiler/program.go                  |   2 +-
 internal/modulespecifiers/specifiers.go       |  15 +-
 internal/modulespecifiers/types.go            |   1 +
 internal/transformers/importelision_test.go   |   6 +-
 .../allowSyntheticDefaultImports8.errors.txt  |   4 +-
 .../compiler/ambientExportDefaultErrors.types |   2 +-
 .../ambientExportDefaultErrors.types.diff     |   2 +-
 .../compiler/checkMergedGlobalUMDSymbol.types |   6 +-
 .../checkMergedGlobalUMDSymbol.types.diff     |   6 +-
 ...nstEnumNoPreserveDeclarationReexport.types |   4 +-
 ...umNoPreserveDeclarationReexport.types.diff |   4 +-
 .../declarationEmitAliasFromIndirectFile.js   |   6 +-
 ...clarationEmitAliasFromIndirectFile.js.diff |  12 -
 ...declarationEmitAliasFromIndirectFile.types |   4 +-
 ...rationEmitAliasFromIndirectFile.types.diff |   4 +-
 ...eclarationEmitBundlerConditions.errors.txt |  35 +++
 ...ationEmitBundlerConditions.errors.txt.diff |  10 +-
 .../declarationEmitBundlerConditions.js       |   3 +-
 .../declarationEmitBundlerConditions.js.diff  |  10 +-
 ...nEmitCrossFileCopiedGeneratedImportType.js |   2 +-
 ...CrossFileCopiedGeneratedImportType.js.diff |   8 -
 ...itCrossFileCopiedGeneratedImportType.types |  14 +-
 ...ssFileCopiedGeneratedImportType.types.diff |  20 +-
 ...DoesNotUseReexportedNamespaceAsLocal.types |   2 +-
 ...otUseReexportedNamespaceAsLocal.types.diff |   2 +-
 ...rationEmitForGlobalishSpecifierSymlink2.js |   2 +-
 ...nEmitForGlobalishSpecifierSymlink2.js.diff |   2 +-
 ...ionEmitForGlobalishSpecifierSymlink2.types |  10 +-
 ...itForGlobalishSpecifierSymlink2.types.diff |  10 +-
 ...clarationEmitQualifiedAliasTypeArgument.js |   4 +-
 ...tionEmitQualifiedAliasTypeArgument.js.diff |   8 -
 ...rationEmitQualifiedAliasTypeArgument.types |  14 +-
 ...nEmitQualifiedAliasTypeArgument.types.diff |  14 +-
 ...clarationEmitReexportedSymlinkReference.js |   2 +-
 ...tionEmitReexportedSymlinkReference.js.diff |   2 +-
 ...rationEmitReexportedSymlinkReference.types |   8 +-
 ...nEmitReexportedSymlinkReference.types.diff |   8 +-
 ...larationEmitReexportedSymlinkReference2.js |   2 +-
 ...ionEmitReexportedSymlinkReference2.js.diff |   2 +-
 ...ationEmitReexportedSymlinkReference2.types |  10 +-
 ...EmitReexportedSymlinkReference2.types.diff |  10 +-
 ...larationEmitReexportedSymlinkReference3.js |   2 +-
 ...ionEmitReexportedSymlinkReference3.js.diff |   2 +-
 ...ationEmitReexportedSymlinkReference3.types |  10 +-
 ...EmitReexportedSymlinkReference3.types.diff |  10 +-
 ...clarationEmitTopLevelNodeFromCrossFile2.js |   4 +-
 ...tionEmitTopLevelNodeFromCrossFile2.js.diff |  11 +-
 ...rationEmitTopLevelNodeFromCrossFile2.types |  10 +-
 ...nEmitTopLevelNodeFromCrossFile2.types.diff |  10 +-
 ...itTransitiveImportOfHtmlDeclarationItem.js |   2 +-
 ...nsitiveImportOfHtmlDeclarationItem.js.diff |   7 +
 ...ransitiveImportOfHtmlDeclarationItem.types |   8 +-
 ...tiveImportOfHtmlDeclarationItem.types.diff |   8 +-
 ...ngAlternativeContainingModules1.errors.txt | 239 ++++++++++++++++++
 ...ernativeContainingModules1.errors.txt.diff |  11 +-
 ...nEmitUsingAlternativeContainingModules1.js |  12 +-
 ...UsingAlternativeContainingModules1.js.diff |  21 +-
 ...AlternativeContainingModules1.symbols.diff |   6 -
 ...itUsingAlternativeContainingModules1.types |  10 +-
 ...ngAlternativeContainingModules1.types.diff |  64 +----
 ...ngAlternativeContainingModules2.errors.txt | 239 ++++++++++++++++++
 ...ernativeContainingModules2.errors.txt.diff |  11 +-
 ...nEmitUsingAlternativeContainingModules2.js |  12 +-
 ...UsingAlternativeContainingModules2.js.diff |  21 +-
 ...AlternativeContainingModules2.symbols.diff |   6 -
 ...itUsingAlternativeContainingModules2.types |  10 +-
 ...ngAlternativeContainingModules2.types.diff |  64 +----
 .../declarationEmitUsingTypeAlias1.errors.txt |   8 +-
 ...arationEmitUsingTypeAlias1.errors.txt.diff |  25 --
 .../declarationEmitUsingTypeAlias1.types      |  24 +-
 .../declarationEmitUsingTypeAlias1.types.diff |  24 +-
 .../declarationEmitUsingTypeAlias2.errors.txt |   4 +-
 ...arationEmitUsingTypeAlias2.errors.txt.diff |   4 +-
 .../declarationEmitUsingTypeAlias2.js         |   8 -
 .../declarationEmitUsingTypeAlias2.js.diff    |  32 +--
 .../declarationEmitUsingTypeAlias2.types      |   4 +-
 .../declarationEmitUsingTypeAlias2.types.diff |   4 +-
 .../compiler/duplicatePackage_subModule.types |   4 +-
 .../duplicatePackage_subModule.types.diff     |   4 +-
 ...ngFollowedWithNamedImport1InEs5.errors.txt |  24 +-
 ...lowedWithNamedImport1InEs5.errors.txt.diff |  49 ----
 ...lowedWithNamedImport1WithExport.errors.txt |  24 +-
 ...WithNamedImport1WithExport.errors.txt.diff |  77 ------
 ...dingFollowedWithNamedImportDts1.errors.txt |  24 +-
 ...ollowedWithNamedImportDts1.errors.txt.diff |  48 ----
 ...ImportNamedImportNoExportMember.errors.txt |   8 +-
 ...tNamedImportNoExportMember.errors.txt.diff |  20 --
 ...ImportNamedImportNoNamedExports.errors.txt |   8 +-
 ...tNamedImportNoNamedExports.errors.txt.diff |  20 --
 .../compiler/esModuleIntersectionCrash.types  |   4 +-
 .../esModuleIntersectionCrash.types.diff      |   4 +-
 .../compiler/exportAsNamespace.d.types        |   2 +-
 .../compiler/exportAsNamespace.d.types.diff   |   2 +-
 .../compiler/exportAsNamespace_augment.types  |   2 +-
 .../exportAsNamespace_augment.types.diff      |   2 +-
 ...gnedNamespaceIsVisibleInDeclarationEmit.js |   2 +-
 ...amespaceIsVisibleInDeclarationEmit.js.diff |   4 -
 ...dNamespaceIsVisibleInDeclarationEmit.types |   8 +-
 ...spaceIsVisibleInDeclarationEmit.types.diff |   8 +-
 ...esmoduleinterop=false,module=es2015).types |   2 +-
 ...uleinterop=false,module=es2015).types.diff |   2 +-
 ...esmoduleinterop=false,module=es2020).types |   2 +-
 ...uleinterop=false,module=es2020).types.diff |   2 +-
 ...(esmoduleinterop=true,module=es2015).types |   2 +-
 ...duleinterop=true,module=es2015).types.diff |   2 +-
 ...(esmoduleinterop=true,module=es2020).types |   2 +-
 ...duleinterop=true,module=es2020).types.diff |   2 +-
 .../importNonExportedMember.errors.txt        |   4 +-
 .../importNonExportedMember.errors.txt.diff   |  16 --
 .../importNonExportedMember1.errors.txt       |   4 +-
 .../importNonExportedMember1.errors.txt.diff  |  16 --
 .../importNonExportedMember2.errors.txt       |   4 +-
 .../importNonExportedMember2.errors.txt.diff  |  16 --
 .../importNonExportedMember3.errors.txt       |   4 +-
 .../importNonExportedMember3.errors.txt.diff  |  17 --
 .../importNonExportedMember4.errors.txt       |   4 +-
 .../importNonExportedMember4.errors.txt.diff  |  16 --
 .../importNonExportedMember5.errors.txt       |   4 +-
 .../importNonExportedMember5.errors.txt.diff  |  16 --
 .../importNonExportedMember8.errors.txt       |   4 +-
 .../importNonExportedMember9.errors.txt       |   4 +-
 .../importPropertyFromMappedType.types        |   4 +-
 .../importPropertyFromMappedType.types.diff   |   4 +-
 .../importUsedInGenericImportResolves.types   |   2 +-
 ...portUsedInGenericImportResolves.types.diff |   2 +-
 .../inferrenceInfiniteLoopWithSubtyping.types |   4 +-
 ...rrenceInfiniteLoopWithSubtyping.types.diff |   4 +-
 ...tionsWithDefaultAsNamespaceLikeMerge.types |  18 +-
 .../jsdocReferenceGlobalTypeInCommonJs.types  |   2 +-
 .../mergeSymbolReexportInterface.types        |   4 +-
 .../mergeSymbolReexportInterface.types.diff   |   4 +-
 ...mbolReexportedTypeAliasInstantiation.types |   4 +-
 ...eexportedTypeAliasInstantiation.types.diff |   4 +-
 .../compiler/mergeSymbolRexportFunction.types |   2 +-
 .../mergeSymbolRexportFunction.types.diff     |   2 +-
 .../missingMemberErrorHasShortPath.errors.txt |   4 +-
 ...ingMemberErrorHasShortPath.errors.txt.diff |  17 --
 ...ationWithNonExistentNamedImport.errors.txt |   4 +-
 ...WithNonExistentNamedImport.errors.txt.diff |  16 --
 ...uleMemberMissingErrorIsRelative.errors.txt |   4 +-
 ...mberMissingErrorIsRelative.errors.txt.diff |  14 -
 ...PackageIdWithRelativeAndAbsolutePath.types |   2 +-
 ...geIdWithRelativeAndAbsolutePath.types.diff |   2 +-
 ...itNodeModulesImport_implicitAny.errors.txt |   4 +-
 .../namedImportNonExistentName.errors.txt     |  24 +-
 ...namedImportNonExistentName.errors.txt.diff |  42 ---
 ...MergedWithFunctionWithOverloadsUsage.types |  10 +-
 ...dWithFunctionWithOverloadsUsage.types.diff |  10 +-
 .../noCrashUMDMergedWithGlobalValue.types     |   4 +-
 ...noCrashUMDMergedWithGlobalValue.types.diff |   4 +-
 .../compiler/parseAssertEntriesError.types    |   2 +-
 .../parseAssertEntriesError.types.diff        |   2 +-
 .../compiler/parseImportAttributesError.types |   2 +-
 .../parseImportAttributesError.types.diff     |   2 +-
 .../compiler/reactImportDropped.types         |  10 +-
 .../compiler/reexportDefaultIsCallable.types  |   2 +-
 .../reexportDefaultIsCallable.types.diff      |   2 +-
 .../reexportMissingDefault.errors.txt         |   4 +-
 .../reexportMissingDefault.errors.txt.diff    |  14 -
 .../reexportMissingDefault1.errors.txt        |   4 +-
 .../reexportMissingDefault1.errors.txt.diff   |  15 --
 .../reexportMissingDefault2.errors.txt        |   4 +-
 .../reexportMissingDefault2.errors.txt.diff   |  14 -
 .../reexportMissingDefault3.errors.txt        |   4 +-
 .../reexportMissingDefault3.errors.txt.diff   |  14 -
 .../compiler/reexportMissingDefault4.types    |   2 +-
 .../reexportMissingDefault4.types.diff        |   2 +-
 .../compiler/reexportMissingDefault5.types    |   4 +-
 .../reexportMissingDefault5.types.diff        |   4 +-
 .../reexportMissingDefault6.errors.txt        |   4 +-
 .../reexportMissingDefault6.errors.txt.diff   |  14 -
 .../reexportMissingDefault7.errors.txt        |   4 +-
 .../reexportMissingDefault7.errors.txt.diff   |   4 +-
 ...ortTypeInGlobalThisTypeArgument.errors.txt |   4 +-
 ...inkDeclarationEmitModuleNamesRootDir.types |   4 +-
 ...clarationEmitModuleNamesRootDir.types.diff |   4 +-
 ...oDirectLinkGeneratesDeepNonrelativeName.js |  10 +-
 ...ctLinkGeneratesDeepNonrelativeName.js.diff |  87 +------
 ...rectLinkGeneratesDeepNonrelativeName.types |  14 +-
 ...inkGeneratesDeepNonrelativeName.types.diff |  14 +-
 ...iesNoDirectLinkGeneratesNonrelativeName.js |   2 +-
 ...DirectLinkGeneratesNonrelativeName.js.diff |   2 +-
 ...NoDirectLinkGeneratesNonrelativeName.types |   8 +-
 ...ectLinkGeneratesNonrelativeName.types.diff |   8 +-
 ...ectLinkOptionalGeneratesNonrelativeName.js |   2 +-
 ...nkOptionalGeneratesNonrelativeName.js.diff |   2 +-
 ...LinkOptionalGeneratesNonrelativeName.types |   8 +-
 ...ptionalGeneratesNonrelativeName.types.diff |   8 +-
 ...oDirectLinkPeerGeneratesNonrelativeName.js |   2 +-
 ...ctLinkPeerGeneratesNonrelativeName.js.diff |   2 +-
 ...rectLinkPeerGeneratesNonrelativeName.types |   8 +-
 ...inkPeerGeneratesNonrelativeName.types.diff |   8 +-
 .../umdGlobalAugmentationNoCrash.types        |   8 +-
 .../umdGlobalAugmentationNoCrash.types.diff   |   8 +-
 .../compiler/umdGlobalConflict.types          |   4 +-
 .../compiler/umdGlobalConflict.types.diff     |   4 +-
 ...dWithGlobalAugmentationIsNotCircular.types |   6 +-
 ...GlobalAugmentationIsNotCircular.types.diff |   6 +-
 ...EscapesInNames02(target=es2015).errors.txt |   8 +-
 ...esInNames02(target=es2015).errors.txt.diff |  22 +-
 ...odeEscapesInNames02(target=es5).errors.txt |  12 +-
 ...capesInNames02(target=es5).errors.txt.diff |  34 +--
 ...amespaceIdentifiers_importEmpty.errors.txt |  12 +-
 ...aceIdentifiers_importEmpty.errors.txt.diff |  12 +-
 ...duleNamespaceIdentifiers_syntax.errors.txt |  12 +-
 ...amespaceIdentifiers_syntax.errors.txt.diff |  12 +-
 ...aryModuleNamespaceIdentifiers_syntax.types |   4 +-
 ...duleNamespaceIdentifiers_syntax.types.diff |   4 +-
 ...dlerNodeModules1(module=esnext).errors.txt |  12 +-
 ...odeModules1(module=esnext).errors.txt.diff |  12 +-
 ...erNodeModules1(module=preserve).errors.txt |  12 +-
 ...eModules1(module=preserve).errors.txt.diff |  12 +-
 ...mmonJsImportBindingElementNarrowType.types |   2 +-
 ...FileForHtmlFileWithinDeclarationFile.types |   2 +-
 ...orHtmlFileWithinDeclarationFile.types.diff |   2 +-
 .../exportAsNamespace1(module=es2015).types   |   2 +-
 ...portAsNamespace1(module=es2015).types.diff |   2 +-
 .../exportAsNamespace1(module=esnext).types   |   2 +-
 ...portAsNamespace1(module=esnext).types.diff |   2 +-
 .../exportAsNamespace2(module=es2015).types   |   2 +-
 ...portAsNamespace2(module=es2015).types.diff |   2 +-
 .../exportAsNamespace2(module=esnext).types   |   2 +-
 ...portAsNamespace2(module=esnext).types.diff |   2 +-
 .../exportAsNamespace3(module=es2015).types   |   2 +-
 ...portAsNamespace3(module=es2015).types.diff |   2 +-
 .../exportAsNamespace3(module=esnext).types   |   2 +-
 ...portAsNamespace3(module=esnext).types.diff |   2 +-
 .../exportAsNamespace4(module=es2015).types   |   2 +-
 ...portAsNamespace4(module=es2015).types.diff |   2 +-
 .../exportAsNamespace4(module=esnext).types   |   2 +-
 ...portAsNamespace4(module=esnext).types.diff |   2 +-
 .../exportSpellingSuggestion.errors.txt       |   4 +-
 .../exportSpellingSuggestion.errors.txt.diff  |  16 --
 .../importAssertion2(module=es2015).types     |   2 +-
 ...importAssertion2(module=es2015).types.diff |   2 +-
 .../importAssertion2(module=esnext).types     |   2 +-
 ...importAssertion2(module=esnext).types.diff |   2 +-
 ...importAssertion3(module=es2015).errors.txt |  16 +-
 ...tAssertion3(module=es2015).errors.txt.diff |  43 ----
 .../importAssertion3(module=es2015).types     |   2 +-
 ...importAssertion3(module=es2015).types.diff |   2 +-
 .../importAssertion3(module=esnext).types     |   2 +-
 ...importAssertion3(module=esnext).types.diff |   2 +-
 .../importAttributes2(module=es2015).types    |   2 +-
 ...mportAttributes2(module=es2015).types.diff |   2 +-
 .../importAttributes2(module=esnext).types    |   2 +-
 ...mportAttributes2(module=esnext).types.diff |   2 +-
 ...mportAttributes3(module=es2015).errors.txt |  16 +-
 ...Attributes3(module=es2015).errors.txt.diff |  42 ---
 .../importAttributes3(module=es2015).types    |   2 +-
 ...mportAttributes3(module=es2015).types.diff |   2 +-
 .../importAttributes3(module=esnext).types    |   2 +-
 ...mportAttributes3(module=esnext).types.diff |   2 +-
 .../conformance/importFromDot.errors.txt      |   4 +-
 .../conformance/importFromDot.errors.txt.diff |  15 --
 .../conformance/importSpecifiers1.errors.txt  |   4 +-
 .../importSpecifiers1.errors.txt.diff         |  20 --
 .../importTag15(module=es2015).errors.txt     |   8 +-
 .../conformance/importTypeInJSDoc.types       |  24 +-
 ...lineJsxFactoryDeclarationsLocalTypes.types |  20 +-
 ...sxFactoryDeclarationsLocalTypes.types.diff |  20 +-
 ...ineJsxFactoryLocalTypeGlobalFallback.types |   8 +-
 ...xFactoryLocalTypeGlobalFallback.types.diff |   8 +-
 .../intersectionsAndEmptyObjects.types        |   2 +-
 .../intersectionsAndEmptyObjects.types.diff   |   2 +-
 .../submodule/conformance/jsdocThisType.types |  12 +-
 ...tsSpecifierGenerationConditions.errors.txt |   4 +-
 ...cifierGenerationConditions.errors.txt.diff |   4 +-
 ...ExportsSpecifierGenerationConditions.types |  16 +-
 ...tsSpecifierGenerationConditions.types.diff |  16 +-
 ...e10AlternateResult_noResolution.errors.txt |   4 +-
 .../node10Alternateresult_noTypes.errors.txt  |   4 +-
 ...DynamicImportWithPackageExports.errors.txt |   4 +-
 ...icImportWithPackageExports.errors.txt.diff |   4 +-
 ...tionEmitDynamicImportWithPackageExports.js |   4 +-
 ...mitDynamicImportWithPackageExports.js.diff |   4 +-
 ...nEmitDynamicImportWithPackageExports.types |  16 +-
 ...DynamicImportWithPackageExports.types.diff |  16 +-
 ...sExportsSourceTs(module=node16).errors.txt |   4 +-
 ...rtsSourceTs(module=node16).errors.txt.diff |  18 --
 ...odulesExportsSourceTs(module=node16).types |  18 +-
 ...sExportsSourceTs(module=node16).types.diff |  18 +-
 ...xportsSourceTs(module=nodenext).errors.txt |   4 +-
 ...sSourceTs(module=nodenext).errors.txt.diff |  18 --
 ...ulesExportsSourceTs(module=nodenext).types |  18 +-
 ...xportsSourceTs(module=nodenext).types.diff |  18 +-
 ...DeclarationEmit1(module=node16).errors.txt |  12 +-
 ...rationEmit1(module=node16).errors.txt.diff |  20 +-
 ...clarationEmit1(module=nodenext).errors.txt |  12 +-
 ...tionEmit1(module=nodenext).errors.txt.diff |  20 +-
 ...DeclarationEmit2(module=node16).errors.txt |  12 +-
 ...rationEmit2(module=node16).errors.txt.diff |  23 +-
 ...clarationEmit2(module=nodenext).errors.txt |  12 +-
 ...tionEmit2(module=nodenext).errors.txt.diff |  28 +-
 ...rationEmitErrors(module=node16).errors.txt |  15 +-
 ...nEmitErrors(module=node16).errors.txt.diff |  29 +--
 ...tionEmitErrors(module=nodenext).errors.txt |  15 +-
 ...mitErrors(module=nodenext).errors.txt.diff |  29 +--
 ...eDeclarationEmit(module=node16).errors.txt |  15 +-
 ...arationEmit(module=node16).errors.txt.diff |  15 +-
 ...sTypeModeDeclarationEmit(module=node16).js |   8 -
 ...ModeDeclarationEmit(module=node16).js.diff |  46 +---
 ...eclarationEmit(module=node16).symbols.diff |  22 --
 ...peModeDeclarationEmit(module=node16).types |  12 +-
 ...eDeclarationEmit(module=node16).types.diff |  52 +---
 ...eclarationEmit(module=nodenext).errors.txt |  15 +-
 ...ationEmit(module=nodenext).errors.txt.diff |  15 +-
 ...ypeModeDeclarationEmit(module=nodenext).js |   8 -
 ...deDeclarationEmit(module=nodenext).js.diff |  46 +---
 ...larationEmit(module=nodenext).symbols.diff |  22 --
 ...ModeDeclarationEmit(module=nodenext).types |  12 +-
 ...eclarationEmit(module=nodenext).types.diff |  52 +---
 ...rationEmitErrors(module=node16).errors.txt |  27 +-
 ...nEmitErrors(module=node16).errors.txt.diff |  87 ++-----
 ...odeDeclarationEmitErrors(module=node16).js |   8 -
 ...clarationEmitErrors(module=node16).js.diff | 212 +---------------
 ...tionEmitErrors(module=node16).symbols.diff |  40 ---
 ...DeclarationEmitErrors(module=node16).types |  48 ++--
 ...rationEmitErrors(module=node16).types.diff |  91 ++-----
 ...tionEmitErrors(module=nodenext).errors.txt |  27 +-
 ...mitErrors(module=nodenext).errors.txt.diff |  87 ++-----
 ...eDeclarationEmitErrors(module=nodenext).js |   8 -
 ...arationEmitErrors(module=nodenext).js.diff | 212 +---------------
 ...onEmitErrors(module=nodenext).symbols.diff |  40 ---
 ...clarationEmitErrors(module=nodenext).types |  48 ++--
 ...tionEmitErrors(module=nodenext).types.diff |  91 ++-----
 ...DeclarationEmit1(module=node16).errors.txt |  12 +-
 ...rationEmit1(module=node16).errors.txt.diff |  20 +-
 ...clarationEmit1(module=nodenext).errors.txt |  12 +-
 ...tionEmit1(module=nodenext).errors.txt.diff |  20 +-
 ...DeclarationEmit2(module=node16).errors.txt |  12 +-
 ...rationEmit2(module=node16).errors.txt.diff |  23 +-
 ...clarationEmit2(module=nodenext).errors.txt |  12 +-
 ...tionEmit2(module=nodenext).errors.txt.diff |  28 +-
 ...ationEmitErrors1(module=node16).errors.txt |  15 +-
 ...EmitErrors1(module=node16).errors.txt.diff |  29 +--
 ...ionEmitErrors1(module=nodenext).errors.txt |  15 +-
 ...itErrors1(module=nodenext).errors.txt.diff |  29 +--
 ...DeclarationEmit1(module=node16).errors.txt |  15 +-
 ...rationEmit1(module=node16).errors.txt.diff |  15 +-
 ...TypeModeDeclarationEmit1(module=node16).js |   8 -
 ...odeDeclarationEmit1(module=node16).js.diff |  46 +---
 ...clarationEmit1(module=node16).symbols.diff |  22 --
 ...eModeDeclarationEmit1(module=node16).types |  12 +-
 ...DeclarationEmit1(module=node16).types.diff |  52 +---
 ...clarationEmit1(module=nodenext).errors.txt |  15 +-
 ...tionEmit1(module=nodenext).errors.txt.diff |  15 +-
 ...peModeDeclarationEmit1(module=nodenext).js |   8 -
 ...eDeclarationEmit1(module=nodenext).js.diff |  46 +---
 ...arationEmit1(module=nodenext).symbols.diff |  22 --
 ...odeDeclarationEmit1(module=nodenext).types |  12 +-
 ...clarationEmit1(module=nodenext).types.diff |  52 +---
 ...ationEmitErrors1(module=node16).errors.txt |  27 +-
 ...EmitErrors1(module=node16).errors.txt.diff |  87 ++-----
 ...deDeclarationEmitErrors1(module=node16).js |   8 -
 ...larationEmitErrors1(module=node16).js.diff | 212 +---------------
 ...ionEmitErrors1(module=node16).symbols.diff |  40 ---
 ...eclarationEmitErrors1(module=node16).types |  48 ++--
 ...ationEmitErrors1(module=node16).types.diff |  91 ++-----
 ...ionEmitErrors1(module=nodenext).errors.txt |  27 +-
 ...itErrors1(module=nodenext).errors.txt.diff |  87 ++-----
 ...DeclarationEmitErrors1(module=nodenext).js |   8 -
 ...rationEmitErrors1(module=nodenext).js.diff | 212 +---------------
 ...nEmitErrors1(module=nodenext).symbols.diff |  40 ---
 ...larationEmitErrors1(module=nodenext).types |  48 ++--
 ...ionEmitErrors1(module=nodenext).types.diff |  91 ++-----
 ...mports_errors(isolatedmodules=false).types |  10 +-
 ...s_errors(isolatedmodules=false).types.diff |  10 +-
 ...Imports_errors(isolatedmodules=true).types |  10 +-
 ...ts_errors(isolatedmodules=true).types.diff |  10 +-
 .../requireAssertsFromTypescript.types        |   2 +-
 .../sourceFileMergeWithFunction.types         |   4 +-
 .../sourceFileMergeWithFunction.types.diff    |   4 +-
 ...it.multiFileBackReferenceToSelf.errors.txt |   4 +-
 ...ltiFileBackReferenceToSelf.errors.txt.diff |  17 --
 ...rationEmit.multiFileBackReferenceToSelf.js |   2 +-
 ...nEmit.multiFileBackReferenceToSelf.js.diff |   8 -
 ...ionEmit.multiFileBackReferenceToSelf.types |   8 +-
 ...it.multiFileBackReferenceToSelf.types.diff |   8 +-
 ...onEmit.multiFileBackReferenceToUnmapped.js |   4 +-
 ...t.multiFileBackReferenceToUnmapped.js.diff |  10 -
 ...mit.multiFileBackReferenceToUnmapped.types |  18 +-
 ...ultiFileBackReferenceToUnmapped.types.diff |  18 +-
 .../submodule/conformance/umd-errors.types    |   8 +-
 .../conformance/umd-errors.types.diff         |   8 +-
 .../submodule/conformance/umd1.types          |   2 +-
 .../submodule/conformance/umd1.types.diff     |   2 +-
 .../submodule/conformance/umd3.types          |   2 +-
 .../submodule/conformance/umd3.types.diff     |   2 +-
 .../submodule/conformance/umd4.types          |   2 +-
 .../submodule/conformance/umd4.types.diff     |   2 +-
 .../submodule/conformance/umd5.types          |   2 +-
 .../submodule/conformance/umd5.types.diff     |   2 +-
 .../submodule/conformance/umd9.types          |   4 +-
 .../submodule/conformance/umd9.types.diff     |   4 +-
 ...owSyntheticDefaultImports8.errors.txt.diff |  16 --
 .../importNonExportedMember8.errors.txt.diff  |   4 +-
 .../importNonExportedMember9.errors.txt.diff  |   4 +-
 ...WithDefaultAsNamespaceLikeMerge.types.diff |  18 +-
 ...ocReferenceGlobalTypeInCommonJs.types.diff |   2 +-
 ...eModulesImport_implicitAny.errors.txt.diff |   4 +-
 .../compiler/reactImportDropped.types.diff    |  10 +-
 ...peInGlobalThisTypeArgument.errors.txt.diff |   4 +-
 ...sImportBindingElementNarrowType.types.diff |   2 +-
 ...importTag15(module=es2015).errors.txt.diff |  12 +-
 .../conformance/importTypeInJSDoc.types.diff  |  24 +-
 .../conformance/jsdocThisType.types.diff      |  16 +-
 ...ternateResult_noResolution.errors.txt.diff |   4 +-
 ...e10Alternateresult_noTypes.errors.txt.diff |   4 +-
 .../requireAssertsFromTypescript.types.diff   |   2 +-
 414 files changed, 1858 insertions(+), 4726 deletions(-)
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt
 create mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoExportMember.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/importNonExportedMember.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/importNonExportedMember1.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/importNonExportedMember2.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/importNonExportedMember3.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/importNonExportedMember5.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/missingMemberErrorHasShortPath.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleAugmentationWithNonExistentNamedImport.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/moduleMemberMissingErrorIsRelative.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/namedImportNonExistentName.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/reexportMissingDefault.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/reexportMissingDefault1.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/exportSpellingSuggestion.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/importFromDot.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/importSpecifiers1.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js.diff
 delete mode 100644 testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/compiler/allowSyntheticDefaultImports8.errors.txt.diff

diff --git a/internal/checker/checker.go b/internal/checker/checker.go
index 31978a1c17..19849f143e 100644
--- a/internal/checker/checker.go
+++ b/internal/checker/checker.go
@@ -535,7 +535,6 @@ type Program interface {
 	GetJSXRuntimeImportSpecifier(path tspath.Path) (moduleReference string, specifier *ast.Node)
 	GetImportHelpersImportSpecifier(path tspath.Path) *ast.Node
 	GetModeForUsageLocation(sourceFile *ast.SourceFile, location *ast.Node) core.ResolutionMode
-	GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode
 }
 
 type Host interface {
@@ -5115,11 +5114,13 @@ func (c *Checker) checkImportAttributes(declaration *ast.Node) {
 			message = diagnostics.Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext_nodenext_or_preserve
 		}
 		c.grammarErrorOnNode(node, message)
+		return
 	}
 	if isTypeOnly {
 		c.grammarErrorOnNode(node, core.IfElse(isImportAttributes,
 			diagnostics.Import_attributes_cannot_be_used_with_type_only_imports_or_exports,
 			diagnostics.Import_assertions_cannot_be_used_with_type_only_imports_or_exports))
+		return
 	}
 	if override != core.ResolutionModeNone {
 		c.grammarErrorOnNode(node, diagnostics.X_resolution_mode_can_only_be_set_for_type_only_imports)
@@ -14315,7 +14316,7 @@ func (c *Checker) resolveExternalModule(location *ast.Node, moduleReference stri
 		mode             core.ResolutionMode
 	)
 
-	if ast.IsStringLiteralLike(location) || ast.IsModuleDeclaration(location.Parent) && location.Parent.AsModuleDeclaration().Name() == location {
+	if ast.IsStringLiteralLike(location) || location.Parent != nil && ast.IsModuleDeclaration(location.Parent) && location.Parent.AsModuleDeclaration().Name() == location {
 		contextSpecifier = location
 	} else if ast.IsModuleDeclaration(location) {
 		contextSpecifier = location.AsModuleDeclaration().Name()
@@ -14930,7 +14931,7 @@ func (c *Checker) getFullyQualifiedName(symbol *ast.Symbol, containingLocation *
 	if symbol.Parent != nil {
 		return c.getFullyQualifiedName(symbol.Parent, containingLocation) + "." + c.symbolToString(symbol)
 	}
-	return c.symbolToString(symbol) // !!!
+	return c.symbolToStringEx(symbol, containingLocation, ast.SymbolFlagsAll, SymbolFormatFlagsDoNotIncludeSymbolChain|SymbolFormatFlagsAllowAnyNodeKind, nil /*writer*/)
 }
 
 func (c *Checker) getExportsOfSymbol(symbol *ast.Symbol) ast.SymbolTable {
diff --git a/internal/checker/nodebuilderimpl.go b/internal/checker/nodebuilderimpl.go
index fe3a665e88..e4ecddbc2b 100644
--- a/internal/checker/nodebuilderimpl.go
+++ b/internal/checker/nodebuilderimpl.go
@@ -1074,11 +1074,9 @@ func (b *nodeBuilderImpl) getSpecifierForModuleSymbol(symbol *ast.Symbol, overri
 	contextFile := b.ctx.enclosingFile
 	resolutionMode := overrideImportMode
 	if resolutionMode == core.ResolutionModeNone && originalModuleSpecifier != nil {
-		// !!! import resolution mode support
-		// resolutionMode = b.ch.host.GetModeForUsageLocation(contextFile, originalModuleSpecifier)
+		resolutionMode = b.ch.program.GetModeForUsageLocation(contextFile, originalModuleSpecifier)
 	} else if resolutionMode == core.ResolutionModeNone && contextFile != nil {
-		// !!! import resolution mode support
-		// resolutionMode = b.ch.host.GetDefaultResolutionModeForFile(contextFile)
+		resolutionMode = b.ch.program.GetDefaultResolutionModeForFile(contextFile)
 	}
 	cacheKey := module.ModeAwareCacheKey{Name: string(contextFile.Path()), Mode: resolutionMode}
 	links := b.symbolLinks.Get(symbol)
diff --git a/internal/compiler/emitHost.go b/internal/compiler/emitHost.go
index 8690394062..62fb6b4256 100644
--- a/internal/compiler/emitHost.go
+++ b/internal/compiler/emitHost.go
@@ -40,6 +40,10 @@ type emitHost struct {
 	program *Program
 }
 
+func (host *emitHost) GetDefaultResolutionModeForFile(file modulespecifiers.SourceFileForSpecifierGeneration) core.ResolutionMode {
+	return host.program.GetDefaultResolutionModeForFile(file)
+}
+
 func (host *emitHost) FileExists(path string) bool {
 	return host.program.FileExists(path)
 }
diff --git a/internal/compiler/fileloader.go b/internal/compiler/fileloader.go
index dd28ed1652..65d5dc36c6 100644
--- a/internal/compiler/fileloader.go
+++ b/internal/compiler/fileloader.go
@@ -12,6 +12,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/collections"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/module"
+	"github.com/microsoft/typescript-go/internal/modulespecifiers"
 	"github.com/microsoft/typescript-go/internal/tsoptions"
 	"github.com/microsoft/typescript-go/internal/tspath"
 )
@@ -467,7 +468,7 @@ func getModeForTypeReferenceDirectiveInFile(ref *ast.FileReference, file *ast.So
 	}
 }
 
-func getDefaultResolutionModeForFile(file *ast.SourceFile, meta *ast.SourceFileMetaData, options *core.CompilerOptions) core.ResolutionMode {
+func getDefaultResolutionModeForFile(file modulespecifiers.SourceFileForSpecifierGeneration, meta *ast.SourceFileMetaData, options *core.CompilerOptions) core.ResolutionMode {
 	if importSyntaxAffectsModuleResolution(options) {
 		return ast.GetImpliedNodeFormatForEmitWorker(file.FileName(), options, meta)
 	} else {
diff --git a/internal/compiler/program.go b/internal/compiler/program.go
index 1dac009329..f6d2603a83 100644
--- a/internal/compiler/program.go
+++ b/internal/compiler/program.go
@@ -749,7 +749,7 @@ func (p *Program) GetModeForUsageLocation(sourceFile *ast.SourceFile, location *
 	return getModeForUsageLocation(sourceFile, p.sourceFileMetaDatas[sourceFile.Path()], location, p.compilerOptions)
 }
 
-func (p *Program) GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode {
+func (p *Program) GetDefaultResolutionModeForFile(sourceFile modulespecifiers.SourceFileForSpecifierGeneration) core.ResolutionMode {
 	return getDefaultResolutionModeForFile(sourceFile, p.sourceFileMetaDatas[sourceFile.Path()], p.compilerOptions)
 }
 
diff --git a/internal/modulespecifiers/specifiers.go b/internal/modulespecifiers/specifiers.go
index 6fdf74e879..4df9b5cb81 100644
--- a/internal/modulespecifiers/specifiers.go
+++ b/internal/modulespecifiers/specifiers.go
@@ -563,7 +563,7 @@ func processEnding(
 	if tspath.FileExtensionIsOneOf(fileName, []string{tspath.ExtensionMts, tspath.ExtensionCts}) && tsPriority < jsPriority {
 		return fileName
 	}
-	if tspath.IsDeclarationFileName(fileName) {
+	if tspath.FileExtensionIsOneOf(fileName, []string{tspath.ExtensionDmts, tspath.ExtensionMts, tspath.ExtensionDcts, tspath.ExtensionCts}) {
 		inputExt := tspath.GetDeclarationFileExtension(fileName)
 		ext := getJsExtensionForDeclarationFileExtension(inputExt)
 		return tspath.RemoveExtension(fileName, inputExt) + ext
@@ -660,6 +660,7 @@ func tryGetModuleNameAsNodeModule(
 			pkgJsonResults := tryDirectoryWithPackageJson(
 				*parts,
 				pathObj,
+				importingSourceFile,
 				host,
 				overrideMode,
 				options,
@@ -669,8 +670,6 @@ func tryGetModuleNameAsNodeModule(
 			packageRootPath := pkgJsonResults.packageRootPath
 			blockedByExports := pkgJsonResults.blockedByExports
 			verbatimFromExports := pkgJsonResults.verbatimFromExports
-			// !!! classic resolution is dead?
-			// if options.GetModuleResolutionKind() != core.ModuleResolutionKindClassic {
 			if blockedByExports {
 				return "" // File is under this package.json, but is not publicly exported - there's no way to name it via `node_modules` resolution
 			}
@@ -729,6 +728,7 @@ type pkgJsonDirAttemptResult struct {
 func tryDirectoryWithPackageJson(
 	parts NodeModulePathParts,
 	pathObj ModulePath,
+	importingSourceFile SourceFileForSpecifierGeneration,
 	host ModuleSpecifierGenerationHost,
 	overrideMode core.ResolutionMode,
 	options *core.CompilerOptions,
@@ -752,10 +752,9 @@ func tryDirectoryWithPackageJson(
 	}
 
 	importMode := overrideMode
-	// !!! TODO: real resolutionMode support
-	// if importMode == core.ResolutionModeNone {
-	// 	importMode =  getDefaultResolutionModeForFile(importingSourceFile, host, options);
-	// }
+	if importMode == core.ResolutionModeNone {
+		importMode = host.GetDefaultResolutionModeForFile(importingSourceFile)
+	}
 
 	var packageJsonContent *packagejson.PackageJson
 	if packageJson != nil {
@@ -868,7 +867,7 @@ func tryGetModuleNameFromExports(
 	exports packagejson.ExportsOrImports,
 	conditions []string,
 ) string {
-	if exports.Type == packagejson.JSONValueTypeObject && allKeysStartWithDot(exports.AsObject()) {
+	if exports.IsSubpaths() {
 		// sub-mappings
 		// 3 cases:
 		// * directory mappings (legacyish, key ends with / (technically allows index/extension resolution under cjs mode))
diff --git a/internal/modulespecifiers/types.go b/internal/modulespecifiers/types.go
index 5022f25477..6658fe6722 100644
--- a/internal/modulespecifiers/types.go
+++ b/internal/modulespecifiers/types.go
@@ -58,6 +58,7 @@ type ModuleSpecifierGenerationHost interface {
 
 	GetNearestAncestorDirectoryWithPackageJson(dirname string) string
 	GetPackageJsonInfo(pkgJsonPath string) PackageJsonInfo
+	GetDefaultResolutionModeForFile(file SourceFileForSpecifierGeneration) core.ResolutionMode
 }
 
 type ImportModuleSpecifierPreference string
diff --git a/internal/transformers/importelision_test.go b/internal/transformers/importelision_test.go
index a356e327d9..f4db82942b 100644
--- a/internal/transformers/importelision_test.go
+++ b/internal/transformers/importelision_test.go
@@ -19,7 +19,7 @@ type fakeProgram struct {
 	singleThreaded              bool
 	compilerOptions             *core.CompilerOptions
 	files                       []*ast.SourceFile
-	getEmitModuleFormatOfFile   func(sourceFile *ast.SourceFile) core.ModuleKind
+	getEmitModuleFormatOfFile   func(sourceFile modulespecifiers.SourceFileForSpecifierGeneration) core.ModuleKind
 	getImpliedNodeFormatForEmit func(sourceFile *ast.SourceFile) core.ModuleKind
 	getResolvedModule           func(currentSourceFile *ast.SourceFile, moduleReference string, mode core.ResolutionMode) *module.ResolvedModule
 	getSourceFile               func(FileName string) *ast.SourceFile
@@ -89,7 +89,7 @@ func (p *fakeProgram) GetImpliedNodeFormatForEmit(sourceFile *ast.SourceFile) co
 	return p.getImpliedNodeFormatForEmit(sourceFile)
 }
 
-func (p *fakeProgram) GetDefaultResolutionModeForFile(sourceFile *ast.SourceFile) core.ResolutionMode {
+func (p *fakeProgram) GetDefaultResolutionModeForFile(sourceFile modulespecifiers.SourceFileForSpecifierGeneration) core.ResolutionMode {
 	return p.getEmitModuleFormatOfFile(sourceFile)
 }
 
@@ -173,7 +173,7 @@ func TestImportElision(t *testing.T) {
 				singleThreaded:  true,
 				compilerOptions: compilerOptions,
 				files:           files,
-				getEmitModuleFormatOfFile: func(sourceFile *ast.SourceFile) core.ModuleKind {
+				getEmitModuleFormatOfFile: func(sourceFile modulespecifiers.SourceFileForSpecifierGeneration) core.ModuleKind {
 					return core.ModuleKindESNext
 				},
 				getImpliedNodeFormatForEmit: func(sourceFile *ast.SourceFile) core.ModuleKind {
diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports8.errors.txt b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports8.errors.txt
index b8a48b7bde..4b35802264 100644
--- a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports8.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports8.errors.txt
@@ -1,4 +1,4 @@
-a.ts(1,10): error TS2305: Module '"b"' has no exported member 'default'.
+a.ts(1,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
 ==== b.d.ts (0 errors) ====
@@ -9,6 +9,6 @@ a.ts(1,10): error TS2305: Module '"b"' has no exported member 'default'.
 ==== a.ts (1 errors) ====
     import { default as Foo } from "./b";
              ~~~~~~~
-!!! error TS2305: Module '"b"' has no exported member 'default'.
+!!! error TS2305: Module '"./b"' has no exported member 'default'.
     Foo.bar();
     Foo.foo();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types b/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types
index 140b78f173..1844f50943 100644
--- a/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types
+++ b/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types
@@ -15,7 +15,7 @@ export default 2 + 2;
 >2 : 2
 
 export as namespace Foo;
->Foo : typeof import("./foo.js")
+>Foo : typeof import("./foo")
 
 === foo2.d.ts ===
 export = 2 + 2;
diff --git a/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types.diff b/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types.diff
index 6b2cb6c619..3e7edfcb65 100644
--- a/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/ambientExportDefaultErrors.types.diff
@@ -5,7 +5,7 @@
 
  export as namespace Foo;
 ->Foo : typeof import("foo")
-+>Foo : typeof import("./foo.js")
++>Foo : typeof import("./foo")
 
  === foo2.d.ts ===
  export = 2 + 2;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types b/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types
index 33b7624316..5717513d28 100644
--- a/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types
+++ b/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types
@@ -13,7 +13,7 @@ import * as _three from './three';
 >_three : typeof _three
 
 export as namespace THREE;
->THREE : typeof import("./global.js")
+>THREE : typeof import("./global")
 
 declare global {
 >global : typeof global
@@ -25,6 +25,6 @@ declare global {
 
 === test.ts ===
 const m = THREE
->m : typeof import("./three.js")
->THREE : typeof import("./three.js")
+>m : typeof import("./three")
+>THREE : typeof import("./three")
 
diff --git a/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types.diff b/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types.diff
index 4aecfbddbb..80c9740f75 100644
--- a/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/checkMergedGlobalUMDSymbol.types.diff
@@ -5,7 +5,7 @@
 
  export as namespace THREE;
 ->THREE : typeof import("global")
-+>THREE : typeof import("./global.js")
++>THREE : typeof import("./global")
 
  declare global {
  >global : typeof global
@@ -15,5 +15,5 @@
  const m = THREE
 ->m : typeof import("three")
 ->THREE : typeof import("three")
-+>m : typeof import("./three.js")
-+>THREE : typeof import("./three.js")
++>m : typeof import("./three")
++>THREE : typeof import("./three")
diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types b/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types
index 219539b252..41525d7d9c 100644
--- a/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types
+++ b/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types
@@ -19,8 +19,8 @@ export default MyConstEnum;
 
 === ReExport.d.ts ===
 export { MyConstEnum as default } from './ConstEnum';
->MyConstEnum : typeof import("./ConstEnum.js").MyConstEnum
->default : typeof import("./ConstEnum.js").MyConstEnum
+>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
+>default : typeof import("./ConstEnum").MyConstEnum
 
 === usages.ts ===
 import {MyConstEnum} from "./ConstEnum";
diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types.diff b/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types.diff
index ab25b16491..d62d450055 100644
--- a/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/constEnumNoPreserveDeclarationReexport.types.diff
@@ -6,8 +6,8 @@
  export { MyConstEnum as default } from './ConstEnum';
 ->MyConstEnum : typeof import("ConstEnum").MyConstEnum
 ->default : typeof import("ConstEnum").MyConstEnum
-+>MyConstEnum : typeof import("./ConstEnum.js").MyConstEnum
-+>default : typeof import("./ConstEnum.js").MyConstEnum
++>MyConstEnum : typeof import("./ConstEnum").MyConstEnum
++>default : typeof import("./ConstEnum").MyConstEnum
 
  === usages.ts ===
  import {MyConstEnum} from "./ConstEnum";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.js b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.js
index 0b71f4f3bd..a9487d6b32 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.js
@@ -36,9 +36,9 @@ exports.default = fp.l10ns;
 
 //// [app.d.ts]
 declare const _default: {
-    ar?: import("./locale.js").CustomLocale;
-    bg?: import("./locale.js").CustomLocale;
+    ar?: import("./locale").CustomLocale;
+    bg?: import("./locale").CustomLocale;
 } & {
-    default: import("./locale.js").Locale;
+    default: import("./locale").Locale;
 };
 export default _default;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.js.diff
index 15aadb1aa0..b1770d23af 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.js.diff
@@ -8,15 +8,3 @@
 +const fp = { l10ns: {} };
  exports.default = fp.l10ns;
 
-
- //// [app.d.ts]
- declare const _default: {
--    ar?: import("./locale").CustomLocale;
--    bg?: import("./locale").CustomLocale;
-+    ar?: import("./locale.js").CustomLocale;
-+    bg?: import("./locale.js").CustomLocale;
- } & {
--    default: import("./locale").Locale;
-+    default: import("./locale.js").Locale;
- };
- export default _default;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types
index e802576791..d1c88c91c8 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types
@@ -57,7 +57,7 @@ const fp = { l10ns: {} } as FlatpickrFn;
 >{} : {}
 
 export default fp.l10ns;
->fp.l10ns : { ar?: import("./locale.js").CustomLocale; bg?: import("./locale.js").CustomLocale; } & { default: import("./locale.js").Locale; }
+>fp.l10ns : { ar?: import("./locale").CustomLocale; bg?: import("./locale").CustomLocale; } & { default: import("./locale").Locale; }
 >fp : FlatpickrFn
->l10ns : { ar?: import("./locale.js").CustomLocale; bg?: import("./locale.js").CustomLocale; } & { default: import("./locale.js").Locale; }
+>l10ns : { ar?: import("./locale").CustomLocale; bg?: import("./locale").CustomLocale; } & { default: import("./locale").Locale; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types.diff
index f0d3e5a2a0..f62cb0d58a 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAliasFromIndirectFile.types.diff
@@ -5,7 +5,7 @@
 
  export default fp.l10ns;
 ->fp.l10ns : { ar?: import("locale").CustomLocale; bg?: import("locale").CustomLocale; } & { default: import("locale").Locale; }
-+>fp.l10ns : { ar?: import("./locale.js").CustomLocale; bg?: import("./locale.js").CustomLocale; } & { default: import("./locale.js").Locale; }
++>fp.l10ns : { ar?: import("./locale").CustomLocale; bg?: import("./locale").CustomLocale; } & { default: import("./locale").Locale; }
  >fp : FlatpickrFn
 ->l10ns : { ar?: import("locale").CustomLocale; bg?: import("locale").CustomLocale; } & { default: import("locale").Locale; }
-+>l10ns : { ar?: import("./locale.js").CustomLocale; bg?: import("./locale.js").CustomLocale; } & { default: import("./locale.js").Locale; }
++>l10ns : { ar?: import("./locale").CustomLocale; bg?: import("./locale").CustomLocale; } & { default: import("./locale").Locale; }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt
new file mode 100644
index 0000000000..51403f7c7e
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt
@@ -0,0 +1,35 @@
+/index.ts(2,14): error TS2742: The inferred type of 'c' cannot be named without a reference to './node_modules/pkg'. This is likely not portable. A type annotation is necessary.
+
+
+==== /node_modules/pkg/package.json (0 errors) ====
+    {
+      "name": "pkg",
+      "type": "module",
+      "exports": {
+        ".": {
+          "import": "./index.js",
+          "require": "./index.cjs"
+        }
+      }
+    }
+    
+==== /node_modules/pkg/index.d.ts (0 errors) ====
+    export declare class C {
+      private p;
+    }
+    
+==== /node_modules/pkg/index.d.cts (0 errors) ====
+    export {};
+    
+==== /makeC.ts (0 errors) ====
+    import { C } from "pkg";
+    export function makeC() {
+      return new C();
+    }
+    
+==== /index.ts (1 errors) ====
+    import { makeC } from "./makeC";
+    export const c = makeC();
+                 ~
+!!! error TS2742: The inferred type of 'c' cannot be named without a reference to './node_modules/pkg'. This is likely not portable. A type annotation is necessary.
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff
index 63e1bdbd61..be55f0d1c1 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff
@@ -2,7 +2,7 @@
 +++ new.declarationEmitBundlerConditions.errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+/makeC.ts(1,10): error TS2305: Module '"/node_modules/pkg/index"' has no exported member 'C'.
++/index.ts(2,14): error TS2742: The inferred type of 'c' cannot be named without a reference to './node_modules/pkg'. This is likely not portable. A type annotation is necessary.
 +
 +
 +==== /node_modules/pkg/package.json (0 errors) ====
@@ -25,15 +25,15 @@
 +==== /node_modules/pkg/index.d.cts (0 errors) ====
 +    export {};
 +    
-+==== /makeC.ts (1 errors) ====
++==== /makeC.ts (0 errors) ====
 +    import { C } from "pkg";
-+             ~
-+!!! error TS2305: Module '"/node_modules/pkg/index"' has no exported member 'C'.
 +    export function makeC() {
 +      return new C();
 +    }
 +    
-+==== /index.ts (0 errors) ====
++==== /index.ts (1 errors) ====
 +    import { makeC } from "./makeC";
 +    export const c = makeC();
++                 ~
++!!! error TS2742: The inferred type of 'c' cannot be named without a reference to './node_modules/pkg'. This is likely not portable. A type annotation is necessary.
 +    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js
index b3c15757be..e54034e41c 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js
@@ -34,6 +34,7 @@ export const c = makeC();
 
 
 //// [makeC.d.ts]
-export declare function makeC(): any;
+import { C } from "pkg";
+export declare function makeC(): C;
 //// [index.d.ts]
 export declare const c: any;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js.diff
index a2c4eff626..2d4ba0874a 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js.diff
@@ -1,12 +1,8 @@
 --- old.declarationEmitBundlerConditions.js
 +++ new.declarationEmitBundlerConditions.js
-@@= skipped -33, +33 lines =@@
-
-
- //// [makeC.d.ts]
--import { C } from "pkg";
--export declare function makeC(): C;
-+export declare function makeC(): any;
+@@= skipped -36, +36 lines =@@
+ import { C } from "pkg";
+ export declare function makeC(): C;
  //// [index.d.ts]
 -export declare const c: import("pkg").C;
 +export declare const c: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.js b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.js
index f934448d70..b33ee3070f 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.js
@@ -27,6 +27,6 @@ exports.d = { e: projC_1.e };
 //// [index.d.ts]
 export declare const d: {
     e: {
-        f: (foo: import("../projA/index.js").Foo) => boolean;
+        f: (foo: import("../projA").Foo) => boolean;
     };
 };
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.js.diff
index a4517fe8eb..eba36378c1 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.js.diff
@@ -8,11 +8,3 @@
 +const projC_1 = require("../projC");
  exports.d = { e: projC_1.e };
 
-
- //// [index.d.ts]
- export declare const d: {
-     e: {
--        f: (foo: import("../projA").Foo) => boolean;
-+        f: (foo: import("../projA/index.js").Foo) => boolean;
-     };
- };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
index 78fc6a937a..57460ab6f4 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types
@@ -18,19 +18,19 @@ export declare const f: (foo: Foo) => boolean;
 
 === projC/index.d.ts ===
 export declare const e: {
->e : { f: (foo: import("../projA/index.js").Foo) => boolean; }
+>e : { f: (foo: import("../projA").Foo) => boolean; }
 
     f: (foo: import("../projA").Foo) => boolean;
->f : (foo: import("../projA/index.js").Foo) => boolean
->foo : import("../projA/index.js").Foo
+>f : (foo: import("../projA").Foo) => boolean
+>foo : import("../projA").Foo
 
 };
 === projD/index.ts ===
 import {e} from "../projC";
->e : { f: (foo: import("../projA/index.js").Foo) => boolean; }
+>e : { f: (foo: import("../projA").Foo) => boolean; }
 
 export const d = {e};
->d : { e: { f: (foo: import("../projA/index.js").Foo) => boolean; }; }
->{e} : { e: { f: (foo: import("../projA/index.js").Foo) => boolean; }; }
->e : { f: (foo: import("../projA/index.js").Foo) => boolean; }
+>d : { e: { f: (foo: import("../projA").Foo) => boolean; }; }
+>{e} : { e: { f: (foo: import("../projA").Foo) => boolean; }; }
+>e : { f: (foo: import("../projA").Foo) => boolean; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
index 5cf6052820..ccc72218d2 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitCrossFileCopiedGeneratedImportType.types.diff
@@ -1,28 +1,22 @@
 --- old.declarationEmitCrossFileCopiedGeneratedImportType.types
 +++ new.declarationEmitCrossFileCopiedGeneratedImportType.types
-@@= skipped -17, +17 lines =@@
-
- === projC/index.d.ts ===
- export declare const e: {
-->e : { f: (foo: import("../projA").Foo) => boolean; }
-+>e : { f: (foo: import("../projA/index.js").Foo) => boolean; }
+@@= skipped -21, +21 lines =@@
 
      f: (foo: import("../projA").Foo) => boolean;
-->f : (foo: import("../projA").Foo) => boolean
+ >f : (foo: import("../projA").Foo) => boolean
 ->foo : import("projA/index").Foo
-+>f : (foo: import("../projA/index.js").Foo) => boolean
-+>foo : import("../projA/index.js").Foo
++>foo : import("../projA").Foo
 
  };
  === projD/index.ts ===
  import {e} from "../projC";
 ->e : { f: (foo: import("projA/index").Foo) => boolean; }
-+>e : { f: (foo: import("../projA/index.js").Foo) => boolean; }
++>e : { f: (foo: import("../projA").Foo) => boolean; }
 
  export const d = {e};
 ->d : { e: { f: (foo: import("projA/index").Foo) => boolean; }; }
 ->{e} : { e: { f: (foo: import("projA/index").Foo) => boolean; }; }
 ->e : { f: (foo: import("projA/index").Foo) => boolean; }
-+>d : { e: { f: (foo: import("../projA/index.js").Foo) => boolean; }; }
-+>{e} : { e: { f: (foo: import("../projA/index.js").Foo) => boolean; }; }
-+>e : { f: (foo: import("../projA/index.js").Foo) => boolean; }
++>d : { e: { f: (foo: import("../projA").Foo) => boolean; }; }
++>{e} : { e: { f: (foo: import("../projA").Foo) => boolean; }; }
++>e : { f: (foo: import("../projA").Foo) => boolean; }
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
index dc15c089d7..3df63b2ac0 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types
@@ -13,7 +13,7 @@ export const x = add(import("./sub"));
 >"./sub" : "./sub"
 
 export * as Q from "./sub";
->Q : typeof import("./sub")
+>Q : typeof import("./sub.js")
 
 declare function add<T>(x: Promise<T>): T;
 >add : <T>(x: Promise<T>) => T
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types.diff
index 148ccb5cfa..750bfc4c10 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitDoesNotUseReexportedNamespaceAsLocal.types.diff
@@ -15,7 +15,7 @@
 
  export * as Q from "./sub";
 ->Q : typeof import("sub")
-+>Q : typeof import("./sub")
++>Q : typeof import("./sub.js")
 
  declare function add<T>(x: Promise<T>): T;
  >add : <T>(x: Promise<T>) => T
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.js b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.js
index dcc6c8a39d..91254750e8 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.js
@@ -31,4 +31,4 @@ exports.a = (0, typescript_fsa_1.getA)();
 
 
 //// [index.d.ts]
-export declare const a: import("../cache/typescript-fsa/index.js").A;
+export declare const a: import("../cache/typescript-fsa").A;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.js.diff
index 4571acc533..aebc51e130 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.js.diff
@@ -11,4 +11,4 @@
 
  //// [index.d.ts]
 -export declare const a: import("typescript-fsa").A;
-+export declare const a: import("../cache/typescript-fsa/index.js").A;
\ No newline at end of file
++export declare const a: import("../cache/typescript-fsa").A;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types
index 05fe1dea9c..878ea15aa9 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types
@@ -18,15 +18,15 @@ import * as _whatever from "p2";
 >_whatever : typeof _whatever
 
 import { getA } from "typescript-fsa";
->getA : () => import("../cache/typescript-fsa/index.js").A
+>getA : () => import("../cache/typescript-fsa").A
 
 export const a = getA();
->a : import("../cache/typescript-fsa/index.js").A
->getA() : import("../cache/typescript-fsa/index.js").A
->getA : () => import("../cache/typescript-fsa/index.js").A
+>a : import("../cache/typescript-fsa").A
+>getA() : import("../cache/typescript-fsa").A
+>getA : () => import("../cache/typescript-fsa").A
 
 === /p2/index.d.ts ===
 export const a: import("typescript-fsa").A;
->a : import("../cache/typescript-fsa/index.js").A
+>a : import("../cache/typescript-fsa").A
 
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types.diff
index 8df52d2e5e..0725825517 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitForGlobalishSpecifierSymlink2.types.diff
@@ -5,18 +5,18 @@
 
  import { getA } from "typescript-fsa";
 ->getA : () => import("/cache/typescript-fsa/index").A
-+>getA : () => import("../cache/typescript-fsa/index.js").A
++>getA : () => import("../cache/typescript-fsa").A
 
  export const a = getA();
 ->a : import("/cache/typescript-fsa/index").A
 ->getA() : import("/cache/typescript-fsa/index").A
 ->getA : () => import("/cache/typescript-fsa/index").A
-+>a : import("../cache/typescript-fsa/index.js").A
-+>getA() : import("../cache/typescript-fsa/index.js").A
-+>getA : () => import("../cache/typescript-fsa/index.js").A
++>a : import("../cache/typescript-fsa").A
++>getA() : import("../cache/typescript-fsa").A
++>getA : () => import("../cache/typescript-fsa").A
 
  === /p2/index.d.ts ===
  export const a: import("typescript-fsa").A;
 ->a : import("/cache/typescript-fsa/index").A
-+>a : import("../cache/typescript-fsa/index.js").A
++>a : import("../cache/typescript-fsa").A
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.js b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.js
index 340a0f3845..043b2d9ee6 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.js
@@ -38,5 +38,5 @@ exports.fun2 = (0, bbb_1.create)();
 
 //// [index.d.ts]
 import { T, Q } from "./lib";
-export declare const fun: () => import("./bbb.js").INode<T>;
-export declare const fun2: () => import("./bbb.js").INode<Q>;
+export declare const fun: () => import("./bbb").INode<T>;
+export declare const fun2: () => import("./bbb").INode<Q>;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.js.diff
index da7a8fcb0f..e09ce24362 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.js.diff
@@ -8,11 +8,3 @@
 +const bbb_1 = require("./bbb");
  exports.fun = (0, bbb_1.create)();
  exports.fun2 = (0, bbb_1.create)();
-
-
- //// [index.d.ts]
- import { T, Q } from "./lib";
--export declare const fun: () => import("./bbb").INode<T>;
--export declare const fun2: () => import("./bbb").INode<Q>;
-+export declare const fun: () => import("./bbb.js").INode<T>;
-+export declare const fun2: () => import("./bbb.js").INode<Q>;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types
index 3802f00102..9c72ab5937 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types
@@ -38,15 +38,15 @@ import { T, Q } from "./lib";
 >Q : any
 
 import { create } from "./bbb";
->create : <T>() => () => import("./bbb.js").INode<T>
+>create : <T>() => () => import("./bbb").INode<T>
 
 export const fun = create<T>();
->fun : () => import("./bbb.js").INode<T>
->create<T>() : () => import("./bbb.js").INode<T>
->create : <T>() => () => import("./bbb.js").INode<T>
+>fun : () => import("./bbb").INode<T>
+>create<T>() : () => import("./bbb").INode<T>
+>create : <T>() => () => import("./bbb").INode<T>
 
 export const fun2 = create<Q>();
->fun2 : () => import("./bbb.js").INode<Q>
->create<Q>() : () => import("./bbb.js").INode<Q>
->create : <T>() => () => import("./bbb.js").INode<T>
+>fun2 : () => import("./bbb").INode<Q>
+>create<Q>() : () => import("./bbb").INode<Q>
+>create : <T>() => () => import("./bbb").INode<T>
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types.diff
index 098b0313bf..af87da2e3c 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitQualifiedAliasTypeArgument.types.diff
@@ -5,20 +5,20 @@
 
  import { create } from "./bbb";
 ->create : <T>() => () => import("bbb").INode<T>
-+>create : <T>() => () => import("./bbb.js").INode<T>
++>create : <T>() => () => import("./bbb").INode<T>
 
  export const fun = create<T>();
 ->fun : () => import("bbb").INode<T>
 ->create<T>() : () => import("bbb").INode<T>
 ->create : <T>() => () => import("bbb").INode<T>
-+>fun : () => import("./bbb.js").INode<T>
-+>create<T>() : () => import("./bbb.js").INode<T>
-+>create : <T>() => () => import("./bbb.js").INode<T>
++>fun : () => import("./bbb").INode<T>
++>create<T>() : () => import("./bbb").INode<T>
++>create : <T>() => () => import("./bbb").INode<T>
 
  export const fun2 = create<Q>();
 ->fun2 : () => import("bbb").INode<Q>
 ->create<Q>() : () => import("bbb").INode<Q>
 ->create : <T>() => () => import("bbb").INode<T>
-+>fun2 : () => import("./bbb.js").INode<Q>
-+>create<Q>() : () => import("./bbb.js").INode<Q>
-+>create : <T>() => () => import("./bbb.js").INode<T>
++>fun2 : () => import("./bbb").INode<Q>
++>create<Q>() : () => import("./bbb").INode<Q>
++>create : <T>() => () => import("./bbb").INode<T>
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.js b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.js
index 8bd4f15a8a..a052f78c20 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.js
@@ -71,6 +71,6 @@ __exportStar(require("./keys"), exports);
 
 //// [keys.d.ts]
 import { MetadataAccessor } from "@raymondfeng/pkg2";
-export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>;
+export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist").IdType>;
 //// [index.d.ts]
 export * from './keys';
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.js.diff
index 24dd71e50d..2c631d0f54 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.js.diff
@@ -14,6 +14,6 @@
  //// [keys.d.ts]
  import { MetadataAccessor } from "@raymondfeng/pkg2";
 -export declare const ADMIN: MetadataAccessor<boolean, import("@raymondfeng/pkg2").IdType>;
-+export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>;
++export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist").IdType>;
  //// [index.d.ts]
  export * from './keys';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types
index b3e38d0c38..a6ce84ee96 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types
@@ -8,11 +8,11 @@ import {MetadataAccessor} from "@raymondfeng/pkg2";
 >MetadataAccessor : typeof MetadataAccessor
 
 export const ADMIN = MetadataAccessor.create<boolean>('1');
->ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
->MetadataAccessor.create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
+>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >MetadataAccessor : typeof MetadataAccessor
->create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
+>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >'1' : "1"
 
 === monorepo/pkg1/dist/index.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types.diff
index 59ccbb01c7..eb9a2111e7 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference.types.diff
@@ -7,12 +7,12 @@
 ->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
 ->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
 ->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
-+>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
-+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
-+>MetadataAccessor.create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
++>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
  >MetadataAccessor : typeof MetadataAccessor
 ->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
-+>create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
++>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
  >'1' : "1"
 
  === monorepo/pkg1/dist/index.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.js b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.js
index 7258430ab5..04f9db1d53 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.js
@@ -74,6 +74,6 @@ __exportStar(require("./keys"), exports);
 
 //// [keys.d.ts]
 import { MetadataAccessor } from "@raymondfeng/pkg2";
-export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>;
+export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist").IdType>;
 //// [index.d.ts]
 export * from './keys';
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.js.diff
index 48deacffd8..e4c91af8f8 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.js.diff
@@ -14,6 +14,6 @@
  //// [keys.d.ts]
  import { MetadataAccessor } from "@raymondfeng/pkg2";
 -export declare const ADMIN: MetadataAccessor<boolean, import("@raymondfeng/pkg2/dist/secondary").IdType>;
-+export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>;
++export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist").IdType>;
  //// [index.d.ts]
  export * from './keys';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types
index 3879b1b483..8a7267b255 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types
@@ -8,11 +8,11 @@ import {MetadataAccessor} from "@raymondfeng/pkg2";
 >MetadataAccessor : typeof MetadataAccessor
 
 export const ADMIN = MetadataAccessor.create<boolean>('1');
->ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
->MetadataAccessor.create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
+>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >MetadataAccessor : typeof MetadataAccessor
->create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
+>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >'1' : "1"
 
 === monorepo/pkg1/dist/index.d.ts ===
@@ -56,7 +56,7 @@ import "./secondary";
 export * from './types';
 === monorepo/pkg2/dist/types.d.ts ===
 export {MetadataAccessor} from '@raymondfeng/pkg1';
->MetadataAccessor : typeof import("../../pkg1/dist/types.js").MetadataAccessor
+>MetadataAccessor : typeof import("../../pkg1/dist").MetadataAccessor
 
 === monorepo/pkg2/dist/secondary.d.ts ===
 export {IdType} from '@raymondfeng/pkg1';
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types.diff
index 39b43eb295..b945f2fef7 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference2.types.diff
@@ -7,12 +7,12 @@
 ->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
 ->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
 ->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
-+>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
-+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
-+>MetadataAccessor.create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
++>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
  >MetadataAccessor : typeof MetadataAccessor
 ->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
-+>create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
++>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
  >'1' : "1"
 
  === monorepo/pkg1/dist/index.d.ts ===
@@ -21,7 +21,7 @@
  === monorepo/pkg2/dist/types.d.ts ===
  export {MetadataAccessor} from '@raymondfeng/pkg1';
 ->MetadataAccessor : typeof import("monorepo/pkg1/dist/types").MetadataAccessor
-+>MetadataAccessor : typeof import("../../pkg1/dist/types.js").MetadataAccessor
++>MetadataAccessor : typeof import("../../pkg1/dist").MetadataAccessor
 
  === monorepo/pkg2/dist/secondary.d.ts ===
  export {IdType} from '@raymondfeng/pkg1';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.js b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.js
index 481fee6889..ca11f0526b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.js
@@ -71,6 +71,6 @@ __exportStar(require("./keys"), exports);
 
 //// [keys.d.ts]
 import { MetadataAccessor } from "@raymondfeng/pkg2";
-export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>;
+export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist").IdType>;
 //// [index.d.ts]
 export * from './keys';
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.js.diff
index a77228f3f5..63337a5943 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.js.diff
@@ -15,6 +15,6 @@
 
 +//// [keys.d.ts]
 +import { MetadataAccessor } from "@raymondfeng/pkg2";
-+export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>;
++export declare const ADMIN: MetadataAccessor<boolean, import("../../pkg1/dist").IdType>;
  //// [index.d.ts]
  export * from './keys';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types
index 8b1ce5c1f2..4175506338 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types
@@ -8,11 +8,11 @@ import {MetadataAccessor} from "@raymondfeng/pkg2";
 >MetadataAccessor : typeof MetadataAccessor
 
 export const ADMIN = MetadataAccessor.create<boolean>('1');
->ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
->MetadataAccessor.create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
+>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
+>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >MetadataAccessor : typeof MetadataAccessor
->create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
+>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
 >'1' : "1"
 
 === monorepo/pkg1/dist/index.d.ts ===
@@ -55,5 +55,5 @@ export declare class MetadataAccessor<T, D extends IdType = IdType> {
 export * from './types';
 === monorepo/pkg2/dist/types.d.ts ===
 export {MetadataAccessor} from '@raymondfeng/pkg1';
->MetadataAccessor : typeof import("../../pkg1/dist/types.js").MetadataAccessor
+>MetadataAccessor : typeof import("../../pkg1/dist").MetadataAccessor
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types.diff
index fbfe101a75..114161545b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitReexportedSymlinkReference3.types.diff
@@ -7,12 +7,12 @@
 ->ADMIN : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
 ->MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("monorepo/pkg1/dist/types").IdType>
 ->MetadataAccessor.create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
-+>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
-+>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist/types.js").IdType>
-+>MetadataAccessor.create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
++>ADMIN : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create<boolean>('1') : MetadataAccessor<boolean, import("../../pkg1/dist").IdType>
++>MetadataAccessor.create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
  >MetadataAccessor : typeof MetadataAccessor
 ->create : <T, D extends import("monorepo/pkg1/dist/types").IdType = import("monorepo/pkg1/dist/types").IdType>(key: string) => MetadataAccessor<T, D>
-+>create : <T, D extends import("../../pkg1/dist/types.js").IdType = import("../../pkg1/dist/types.js").IdType>(key: string) => MetadataAccessor<T, D>
++>create : <T, D extends import("../../pkg1/dist").IdType = import("../../pkg1/dist").IdType>(key: string) => MetadataAccessor<T, D>
  >'1' : "1"
 
  === monorepo/pkg1/dist/index.d.ts ===
@@ -21,4 +21,4 @@
  === monorepo/pkg2/dist/types.d.ts ===
  export {MetadataAccessor} from '@raymondfeng/pkg1';
 ->MetadataAccessor : typeof import("monorepo/pkg1/dist/types").MetadataAccessor
-+>MetadataAccessor : typeof import("../../pkg1/dist/types.js").MetadataAccessor
++>MetadataAccessor : typeof import("../../pkg1/dist").MetadataAccessor
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.js b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.js
index d3d3fadfb2..fb29e29d67 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.js
@@ -35,8 +35,8 @@ exports._ = boxedBox_1.boxedBox;
 
 
 //// [a.d.ts]
-export declare const _: import("./box.js").Box<{
-    boxed: import("./box.js").Box<number>;
+export declare const _: import("./box").Box<{
+    boxed: import("./box").Box<number>;
 }>;
 // At index 83
 /**
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.js.diff
index 75004a1aa5..929a139ce3 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.js.diff
@@ -9,14 +9,9 @@
  exports._ = boxedBox_1.boxedBox;
  // At index 83
  /**
-@@= skipped -9, +9 lines =@@
-
-
- //// [a.d.ts]
--export declare const _: import("./box").Box<{
--    boxed: import("./box").Box<number>;
-+export declare const _: import("./box.js").Box<{
-+    boxed: import("./box.js").Box<number>;
+@@= skipped -12, +12 lines =@@
+ export declare const _: import("./box").Box<{
+     boxed: import("./box").Box<number>;
  }>;
 +// At index 83
  /**
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types
index f588f4f13b..f7aeef6b40 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types
@@ -2,11 +2,11 @@
 
 === a.ts ===
 import { boxedBox } from "./boxedBox";
->boxedBox : import("./box.js").Box<{ boxed: import("./box.js").Box<number>; }>
+>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
 export const _ = boxedBox;
->_ : import("./box.js").Box<{ boxed: import("./box.js").Box<number>; }>
->boxedBox : import("./box.js").Box<{ boxed: import("./box.js").Box<number>; }>
+>_ : import("./box").Box<{ boxed: import("./box").Box<number>; }>
+>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
 // At index 83
 /**
@@ -15,10 +15,10 @@ export const _ = boxedBox;
 
 === boxedBox.d.ts ===
 export declare const boxedBox: import("./box").Box<{
->boxedBox : import("./box.js").Box<{ boxed: import("./box.js").Box<number>; }>
+>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
     boxed: import("./box").Box<number>;
->boxed : import("./box.js").Box<number>
+>boxed : import("./box").Box<number>
 
 }>;                        // ^This is index 83 in this file
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types.diff
index 5ebdea7e3d..f5cd0e4e3d 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTopLevelNodeFromCrossFile2.types.diff
@@ -5,13 +5,13 @@
  === a.ts ===
  import { boxedBox } from "./boxedBox";
 ->boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
-+>boxedBox : import("./box.js").Box<{ boxed: import("./box.js").Box<number>; }>
++>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
  export const _ = boxedBox;
 ->_ : import("box").Box<{ boxed: import("box").Box<number>; }>
 ->boxedBox : import("box").Box<{ boxed: import("box").Box<number>; }>
-+>_ : import("./box.js").Box<{ boxed: import("./box.js").Box<number>; }>
-+>boxedBox : import("./box.js").Box<{ boxed: import("./box.js").Box<number>; }>
++>_ : import("./box").Box<{ boxed: import("./box").Box<number>; }>
++>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
  // At index 83
  /**
@@ -20,10 +20,10 @@
  === boxedBox.d.ts ===
  export declare const boxedBox: import("./box").Box<{
 ->boxedBox : import("box").Box<{ boxed: import("./box").Box<number>; }>
-+>boxedBox : import("./box.js").Box<{ boxed: import("./box.js").Box<number>; }>
++>boxedBox : import("./box").Box<{ boxed: import("./box").Box<number>; }>
 
      boxed: import("./box").Box<number>;
 ->boxed : import("box").Box<number>
-+>boxed : import("./box.js").Box<number>
++>boxed : import("./box").Box<number>
 
  }>;                        // ^This is index 83 in this file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.js b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.js
index c38bf06893..a18008a66c 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.js
@@ -34,4 +34,4 @@ exports.c = (0, reexporter_1.func)();
 import { CustomHtmlRepresentationThing } from "./foo.html";
 export declare function func(): CustomHtmlRepresentationThing;
 //// [index.d.ts]
-export declare const c: import("./foo.html").CustomHtmlRepresentationThing;
+export declare const c: import("./foo.d.html").CustomHtmlRepresentationThing;
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.js.diff
index 5ecdc4749a..0b54229003 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.js.diff
@@ -17,3 +17,10 @@
 +const reexporter_1 = require("./reexporter");
  exports.c = (0, reexporter_1.func)();
 
+
+@@= skipped -8, +8 lines =@@
+ import { CustomHtmlRepresentationThing } from "./foo.html";
+ export declare function func(): CustomHtmlRepresentationThing;
+ //// [index.d.ts]
+-export declare const c: import("./foo.html").CustomHtmlRepresentationThing;
++export declare const c: import("./foo.d.html").CustomHtmlRepresentationThing;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types
index 1173381a51..06f3e101ce 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types
@@ -18,10 +18,10 @@ export function func() {
 
 === index.ts ===
 import { func } from "./reexporter";
->func : () => import("./foo.html").CustomHtmlRepresentationThing
+>func : () => import("./foo.d.html").CustomHtmlRepresentationThing
 
 export const c = func();
->c : import("./foo.html").CustomHtmlRepresentationThing
->func() : import("./foo.html").CustomHtmlRepresentationThing
->func : () => import("./foo.html").CustomHtmlRepresentationThing
+>c : import("./foo.d.html").CustomHtmlRepresentationThing
+>func() : import("./foo.d.html").CustomHtmlRepresentationThing
+>func : () => import("./foo.d.html").CustomHtmlRepresentationThing
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types.diff
index 728e3f9532..cc371f9deb 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.types.diff
@@ -5,12 +5,12 @@
  === index.ts ===
  import { func } from "./reexporter";
 ->func : () => import("foo.d.html").CustomHtmlRepresentationThing
-+>func : () => import("./foo.html").CustomHtmlRepresentationThing
++>func : () => import("./foo.d.html").CustomHtmlRepresentationThing
 
  export const c = func();
 ->c : import("foo.d.html").CustomHtmlRepresentationThing
 ->func() : import("foo.d.html").CustomHtmlRepresentationThing
 ->func : () => import("foo.d.html").CustomHtmlRepresentationThing
-+>c : import("./foo.html").CustomHtmlRepresentationThing
-+>func() : import("./foo.html").CustomHtmlRepresentationThing
-+>func : () => import("./foo.html").CustomHtmlRepresentationThing
++>c : import("./foo.d.html").CustomHtmlRepresentationThing
++>func() : import("./foo.d.html").CustomHtmlRepresentationThing
++>func : () => import("./foo.d.html").CustomHtmlRepresentationThing
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt
new file mode 100644
index 0000000000..998453e31c
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt
@@ -0,0 +1,239 @@
+src/index.mts(29,14): error TS2742: The inferred type of 'useEntries' cannot be named without a reference to '../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js'. This is likely not portable. A type annotation is necessary.
+
+
+==== node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.d.ts (0 errors) ====
+    type QueryKey = ReadonlyArray<unknown>;
+    
+    interface Register {}
+    
+    type DefaultError = Register extends {
+      defaultError: infer TError;
+    }
+      ? TError
+      : Error;
+    
+    type ShouldRetryFunction<TError = DefaultError> = (
+      failureCount: number,
+      error: TError,
+    ) => boolean;
+    type RetryValue<TError> = boolean | number | ShouldRetryFunction<TError>;
+    
+    type QueryFunctionContext<
+      TQueryKey extends QueryKey = QueryKey,
+      TPageParam = never,
+    > = [TPageParam] extends [never]
+      ? {
+          queryKey: TQueryKey;
+        }
+      : {
+          queryKey: TQueryKey;
+          pageParam: TPageParam;
+        };
+    
+    type QueryFunction<
+      T = unknown,
+      TQueryKey extends QueryKey = QueryKey,
+      TPageParam = never,
+    > = (context: QueryFunctionContext<TQueryKey, TPageParam>) => T | Promise<T>;
+    
+    interface QueryOptions<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+      TPageParam = never,
+    > {
+      retry?: RetryValue<TError>;
+      queryFn?: QueryFunction<TQueryFnData, TQueryKey, TPageParam>;
+      queryKey?: TQueryKey;
+      initialData?: TData;
+      initialDataUpdatedAt?: number | (() => number | undefined);
+    }
+    
+    interface QueryObserverOptions<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+      TPageParam = never,
+    > extends QueryOptions<
+        TQueryFnData,
+        TError,
+        TQueryData,
+        TQueryKey,
+        TPageParam
+      > {
+      enabled?: boolean;
+      refetchInterval?: number;
+      select?: (data: TQueryData) => TData;
+    }
+    
+    type UseQueryOptions<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+    > = {
+      [Property in keyof QueryObserverOptions<
+        TQueryFnData,
+        TError,
+        TData,
+        TQueryData,
+        TQueryKey
+      >]: QueryObserverOptions<
+        TQueryFnData,
+        TError,
+        TData,
+        TQueryData,
+        TQueryKey
+      >[Property];
+    };
+    
+    type UndefinedInitialQueryOptions<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+    > = UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
+      initialData?: undefined;
+    };
+    
+    interface QueryObserverBaseResult<TData = unknown, TError = DefaultError> {
+      data: TData | undefined;
+      dataUpdatedAt: number;
+      error: TError | null;
+      errorUpdatedAt: number;
+      failureCount: number;
+      failureReason: TError | null;
+      errorUpdateCount: number;
+      isError: boolean;
+      isFetched: boolean;
+      isFetchedAfterMount: boolean;
+      isFetching: boolean;
+      isLoading: boolean;
+      isPending: boolean;
+      isLoadingError: boolean;
+      isInitialLoading: boolean;
+      isPaused: boolean;
+      isPlaceholderData: boolean;
+      isRefetchError: boolean;
+      isRefetching: boolean;
+      isStale: boolean;
+      isSuccess: boolean;
+    }
+    
+    interface QueryObserverSuccessResult<TData = unknown, TError = DefaultError>
+      extends QueryObserverBaseResult<TData, TError> {
+      data: TData;
+      error: null;
+      isError: false;
+      isPending: false;
+      isLoadingError: false;
+      isRefetchError: false;
+      isSuccess: true;
+      status: "success";
+    }
+    
+    type DefinedQueryObserverResult<
+      TData = unknown,
+      TError = DefaultError,
+    > = QueryObserverSuccessResult<TData, TError>;
+    type QueryObserverResult<
+      TData = unknown,
+      TError = DefaultError,
+    > = DefinedQueryObserverResult<TData, TError>;
+    
+    type ToRef<T> = {
+      value: T;
+    };
+    
+    type UseBaseQueryReturnType<
+      TData,
+      TError,
+      Result = QueryObserverResult<TData, TError>,
+    > = {
+      [K in keyof Result]: K extends
+        | "fetchNextPage"
+        | "fetchPreviousPage"
+        | "refetch"
+        ? Result[K]
+        : ToRef<Readonly<Result>[K]>;
+    } & {
+      suspense: () => Promise<Result>;
+    };
+    
+    type UseQueryReturnType<TData, TError> = UseBaseQueryReturnType<TData, TError>;
+    
+    declare function useQuery<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+    >(
+      options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
+    ): UseQueryReturnType<TData, TError>;
+    
+    export { type UseQueryReturnType, useQuery };
+    
+==== node_modules/@tanstack/vue-query/build/modern/index.d.ts (0 errors) ====
+    export { UseQueryReturnType, useQuery } from './useQuery-CPqkvEsh.js';
+    
+==== node_modules/@tanstack/vue-query/package.json (0 errors) ====
+    {
+      "name": "@tanstack/vue-query",
+      "type": "module",
+      "exports": {
+        ".": {
+          "import": {
+            "types": "./build/modern/index.d.ts",
+            "default": "./build/modern/index.js"
+          },
+          "require": {
+            "types": "./build/modern/index.d.cts",
+            "default": "./build/modern/index.cjs"
+          }
+        }
+      }
+    }
+    
+==== src/index.mts (1 errors) ====
+    import { useQuery } from '@tanstack/vue-query'
+    
+    const baseUrl = 'https://api.publicapis.org/'
+    
+    interface IEntry {
+      API: string
+      Description: string
+      Auth: string
+      HTTPS: boolean
+      Cors: string
+      Link: string
+      Category: string
+    }
+    
+    const testApi = {
+      getEntries: (): Promise<IEntry[]> => {
+        return fetch(baseUrl + 'entries')
+          .then((res) => res.json())
+          .then((data) => data.entries)
+          .catch((err) => console.log(err))
+      }
+    }
+    
+    const entryKeys = {
+      all: ['entries'] as const,
+      list: () => [...entryKeys.all, 'list'] as const
+    }
+    
+    export const useEntries = () => {
+                 ~~~~~~~~~~
+!!! error TS2742: The inferred type of 'useEntries' cannot be named without a reference to '../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js'. This is likely not portable. A type annotation is necessary.
+      return useQuery({
+        queryKey: entryKeys.list(),
+        queryFn: testApi.getEntries,
+        select: (data) => data.slice(0, 10)
+      })
+    }
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt.diff
index d85afc4f46..97f91b4e7e 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.errors.txt.diff
@@ -2,8 +2,7 @@
 +++ new.declarationEmitUsingAlternativeContainingModules1.errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+src/index.mts(1,26): error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-+src/index.mts(33,14): error TS7006: Parameter 'data' implicitly has an 'any' type.
++src/index.mts(29,14): error TS2742: The inferred type of 'useEntries' cannot be named without a reference to '../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js'. This is likely not portable. A type annotation is necessary.
 +
 +
 +==== node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.d.ts (0 errors) ====
@@ -203,10 +202,8 @@
 +      }
 +    }
 +    
-+==== src/index.mts (2 errors) ====
++==== src/index.mts (1 errors) ====
 +    import { useQuery } from '@tanstack/vue-query'
-+                             ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
 +    
 +    const baseUrl = 'https://api.publicapis.org/'
 +    
@@ -235,12 +232,12 @@
 +    }
 +    
 +    export const useEntries = () => {
++                 ~~~~~~~~~~
++!!! error TS2742: The inferred type of 'useEntries' cannot be named without a reference to '../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js'. This is likely not portable. A type annotation is necessary.
 +      return useQuery({
 +        queryKey: entryKeys.list(),
 +        queryFn: testApi.getEntries,
 +        select: (data) => data.slice(0, 10)
-+                 ~~~~
-+!!! error TS7006: Parameter 'data' implicitly has an 'any' type.
 +      })
 +    }
 +    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.js b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.js
index bb90bc0cc0..d733d2e7d8 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.js
@@ -260,4 +260,14 @@ export const useEntries = () => {
 
 
 //// [index.d.mts]
-export declare const useEntries: () => any;
+interface IEntry {
+    API: string;
+    Description: string;
+    Auth: string;
+    HTTPS: boolean;
+    Cors: string;
+    Link: string;
+    Category: string;
+}
+export declare const useEntries: any;
+export {};
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.js.diff
index 959df674fb..8c1852a224 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.js.diff
@@ -1,18 +1,9 @@
 --- old.declarationEmitUsingAlternativeContainingModules1.js
 +++ new.declarationEmitUsingAlternativeContainingModules1.js
-@@= skipped -259, +259 lines =@@
-
-
- //// [index.d.mts]
--interface IEntry {
--    API: string;
--    Description: string;
--    Auth: string;
--    HTTPS: boolean;
--    Cors: string;
--    Link: string;
--    Category: string;
--}
+@@= skipped -268, +268 lines =@@
+     Link: string;
+     Category: string;
+ }
 -export declare const useEntries: () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>;
--export {};
-+export declare const useEntries: () => any;
\ No newline at end of file
++export declare const useEntries: any;
+ export {};
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols.diff
index 4850a478fd..98a8fb06fa 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.symbols.diff
@@ -264,13 +264,7 @@
 +>data.slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
  >data : Symbol(data, Decl(index.mts, 32, 13))
 ->slice : Symbol(Array.slice, Decl(lib.es5.d.ts, --, --))
-<<<<<<< HEAD
 +>slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
- 
-||||||| 2303c3a6e
- 
-=======
 
->>>>>>> main
    })
  }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
index ab287dc7c8..ca51c63b33 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types
@@ -305,7 +305,7 @@ export { UseQueryReturnType, useQuery } from './useQuery-CPqkvEsh.js';
 
 === src/index.mts ===
 import { useQuery } from '@tanstack/vue-query'
->useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<TData, TError>
 
 const baseUrl = 'https://api.publicapis.org/'
 >baseUrl : "https://api.publicapis.org/"
@@ -407,12 +407,12 @@ const entryKeys = {
 }
 
 export const useEntries = () => {
->useEntries : () => UseQueryReturnType<IEntry[], Error>
->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => UseQueryReturnType<IEntry[], Error>
+>useEntries : () => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<IEntry[], Error>
+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<IEntry[], Error>
 
   return useQuery({
->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : UseQueryReturnType<IEntry[], Error>
->useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<IEntry[], Error>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<TData, TError>
 >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
 
     queryKey: entryKeys.list(),
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
index 157fecf62f..4da8b36fba 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules1.types.diff
@@ -10,16 +10,8 @@
  === src/index.mts ===
  import { useQuery } from '@tanstack/vue-query'
 ->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: (number | (() => number | undefined)) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
-<<<<<<< HEAD
-+>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
- 
-||||||| 2303c3a6e
-+>useQuery : any
- 
-=======
-+>useQuery : any
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<TData, TError>
 
->>>>>>> main
  const baseUrl = 'https://api.publicapis.org/'
  >baseUrl : "https://api.publicapis.org/"
 @@= skipped -49, +49 lines =@@
@@ -37,67 +29,21 @@
  export const useEntries = () => {
 ->useEntries : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
 ->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
-<<<<<<< HEAD
-+>useEntries : () => UseQueryReturnType<IEntry[], Error>
-+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => UseQueryReturnType<IEntry[], Error>
- 
-||||||| 2303c3a6e
-+>useEntries : () => any
-+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => any
- 
-=======
-+>useEntries : () => any
-+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => any
++>useEntries : () => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<IEntry[], Error>
++>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<IEntry[], Error>
 
->>>>>>> main
    return useQuery({
 ->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<IEntry[], Error>
 ->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: (number | (() => number | undefined)) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").UseQueryReturnType<TData, TError>
-<<<<<<< HEAD
-+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : UseQueryReturnType<IEntry[], Error>
-+>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
++>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<IEntry[], Error>
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").UseQueryReturnType<TData, TError>
  >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
- 
-||||||| 2303c3a6e
-->{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
-+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : any
-+>useQuery : any
-+>{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: any) => any; }
- 
-=======
-->{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
-+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : any
-+>useQuery : any
-+>{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: any) => any; }
 
->>>>>>> main
      queryKey: entryKeys.list(),
-<<<<<<< HEAD
 @@= skipped -26, +26 lines =@@
  >(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
  >data : IEntry[]
  >data.slice(0, 10) : IEntry[]
-||||||| 2303c3a6e
- >queryKey : readonly ["entries", "list"]
-@@= skipped -22, +22 lines =@@
- >getEntries : () => Promise<IEntry[]>
- 
-     select: (data) => data.slice(0, 10)
-->select : (data: IEntry[]) => IEntry[]
-->(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
-->data : IEntry[]
-->data.slice(0, 10) : IEntry[]
-=======
- >queryKey : readonly ["entries", "list"]
-@@= skipped -22, +22 lines =@@
- >getEntries : () => Promise<IEntry[]>
-
-     select: (data) => data.slice(0, 10)
-->select : (data: IEntry[]) => IEntry[]
-->(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
-->data : IEntry[]
-->data.slice(0, 10) : IEntry[]
->>>>>>> main
 ->data.slice : (start?: number, end?: number) => IEntry[]
 +>data.slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
  >data : IEntry[]
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt
new file mode 100644
index 0000000000..0a871f29c9
--- /dev/null
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt
@@ -0,0 +1,239 @@
+src/index.mts(29,14): error TS2742: The inferred type of 'useEntries' cannot be named without a reference to '../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js'. This is likely not portable. A type annotation is necessary.
+
+
+==== node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.d.ts (0 errors) ====
+    type QueryKey = ReadonlyArray<unknown>;
+    
+    interface Register {}
+    
+    type DefaultError = Register extends {
+      defaultError: infer TError;
+    }
+      ? TError
+      : Error;
+    
+    type ShouldRetryFunction<TError = DefaultError> = (
+      failureCount: number,
+      error: TError,
+    ) => boolean;
+    type RetryValue<TError> = boolean | number | ShouldRetryFunction<TError>;
+    
+    type QueryFunctionContext<
+      TQueryKey extends QueryKey = QueryKey,
+      TPageParam = never,
+    > = [TPageParam] extends [never]
+      ? {
+          queryKey: TQueryKey;
+        }
+      : {
+          queryKey: TQueryKey;
+          pageParam: TPageParam;
+        };
+    
+    type QueryFunction<
+      T = unknown,
+      TQueryKey extends QueryKey = QueryKey,
+      TPageParam = never,
+    > = (context: QueryFunctionContext<TQueryKey, TPageParam>) => T | Promise<T>;
+    
+    interface QueryOptions<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+      TPageParam = never,
+    > {
+      retry?: RetryValue<TError>;
+      queryFn?: QueryFunction<TQueryFnData, TQueryKey, TPageParam>;
+      queryKey?: TQueryKey;
+      initialData?: TData;
+      initialDataUpdatedAt?: number | (() => number | undefined);
+    }
+    
+    interface QueryObserverOptions<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+      TPageParam = never,
+    > extends QueryOptions<
+        TQueryFnData,
+        TError,
+        TQueryData,
+        TQueryKey,
+        TPageParam
+      > {
+      enabled?: boolean;
+      refetchInterval?: number;
+      select?: (data: TQueryData) => TData;
+    }
+    
+    type UseQueryOptions<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+    > = {
+      [Property in keyof QueryObserverOptions<
+        TQueryFnData,
+        TError,
+        TData,
+        TQueryData,
+        TQueryKey
+      >]: QueryObserverOptions<
+        TQueryFnData,
+        TError,
+        TData,
+        TQueryData,
+        TQueryKey
+      >[Property];
+    };
+    
+    type UndefinedInitialQueryOptions<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+    > = UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
+      initialData?: undefined;
+    };
+    
+    interface QueryObserverBaseResult<TData = unknown, TError = DefaultError> {
+      data: TData | undefined;
+      dataUpdatedAt: number;
+      error: TError | null;
+      errorUpdatedAt: number;
+      failureCount: number;
+      failureReason: TError | null;
+      errorUpdateCount: number;
+      isError: boolean;
+      isFetched: boolean;
+      isFetchedAfterMount: boolean;
+      isFetching: boolean;
+      isLoading: boolean;
+      isPending: boolean;
+      isLoadingError: boolean;
+      isInitialLoading: boolean;
+      isPaused: boolean;
+      isPlaceholderData: boolean;
+      isRefetchError: boolean;
+      isRefetching: boolean;
+      isStale: boolean;
+      isSuccess: boolean;
+    }
+    
+    interface QueryObserverSuccessResult<TData = unknown, TError = DefaultError>
+      extends QueryObserverBaseResult<TData, TError> {
+      data: TData;
+      error: null;
+      isError: false;
+      isPending: false;
+      isLoadingError: false;
+      isRefetchError: false;
+      isSuccess: true;
+      status: "success";
+    }
+    
+    type DefinedQueryObserverResult<
+      TData = unknown,
+      TError = DefaultError,
+    > = QueryObserverSuccessResult<TData, TError>;
+    type QueryObserverResult<
+      TData = unknown,
+      TError = DefaultError,
+    > = DefinedQueryObserverResult<TData, TError>;
+    
+    type ToRef<T> = {
+      value: T;
+    };
+    
+    type UseBaseQueryReturnType<
+      TData,
+      TError,
+      Result = QueryObserverResult<TData, TError>,
+    > = {
+      [K in keyof Result]: K extends
+        | "fetchNextPage"
+        | "fetchPreviousPage"
+        | "refetch"
+        ? Result[K]
+        : ToRef<Readonly<Result>[K]>;
+    } & {
+      suspense: () => Promise<Result>;
+    };
+    
+    type UseQueryReturnType<TData, TError> = UseBaseQueryReturnType<TData, TError>;
+    
+    declare function useQuery<
+      TQueryFnData = unknown,
+      TError = DefaultError,
+      TData = TQueryFnData,
+      TQueryKey extends QueryKey = QueryKey,
+    >(
+      options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
+    ): UseQueryReturnType<TData, TError>;
+    
+    export { type UseQueryReturnType as b, useQuery as u };
+    
+==== node_modules/@tanstack/vue-query/build/modern/index.d.ts (0 errors) ====
+    export { b as UseQueryReturnType, u as useQuery } from './useQuery-CPqkvEsh.js';
+    
+==== node_modules/@tanstack/vue-query/package.json (0 errors) ====
+    {
+      "name": "@tanstack/vue-query",
+      "type": "module",
+      "exports": {
+        ".": {
+          "import": {
+            "types": "./build/modern/index.d.ts",
+            "default": "./build/modern/index.js"
+          },
+          "require": {
+            "types": "./build/modern/index.d.cts",
+            "default": "./build/modern/index.cjs"
+          }
+        }
+      }
+    }
+    
+==== src/index.mts (1 errors) ====
+    import { useQuery } from '@tanstack/vue-query'
+    
+    const baseUrl = 'https://api.publicapis.org/'
+    
+    interface IEntry {
+      API: string
+      Description: string
+      Auth: string
+      HTTPS: boolean
+      Cors: string
+      Link: string
+      Category: string
+    }
+    
+    const testApi = {
+      getEntries: (): Promise<IEntry[]> => {
+        return fetch(baseUrl + 'entries')
+          .then((res) => res.json())
+          .then((data) => data.entries)
+          .catch((err) => console.log(err))
+      }
+    }
+    
+    const entryKeys = {
+      all: ['entries'] as const,
+      list: () => [...entryKeys.all, 'list'] as const
+    }
+    
+    export const useEntries = () => {
+                 ~~~~~~~~~~
+!!! error TS2742: The inferred type of 'useEntries' cannot be named without a reference to '../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js'. This is likely not portable. A type annotation is necessary.
+      return useQuery({
+        queryKey: entryKeys.list(),
+        queryFn: testApi.getEntries,
+        select: (data) => data.slice(0, 10)
+      })
+    }
+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt.diff
index 67e6924a5d..94a861c17e 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.errors.txt.diff
@@ -2,8 +2,7 @@
 +++ new.declarationEmitUsingAlternativeContainingModules2.errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+src/index.mts(1,26): error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
-+src/index.mts(33,14): error TS7006: Parameter 'data' implicitly has an 'any' type.
++src/index.mts(29,14): error TS2742: The inferred type of 'useEntries' cannot be named without a reference to '../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js'. This is likely not portable. A type annotation is necessary.
 +
 +
 +==== node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.d.ts (0 errors) ====
@@ -203,10 +202,8 @@
 +      }
 +    }
 +    
-+==== src/index.mts (2 errors) ====
++==== src/index.mts (1 errors) ====
 +    import { useQuery } from '@tanstack/vue-query'
-+                             ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2307: Cannot find module '@tanstack/vue-query' or its corresponding type declarations.
 +    
 +    const baseUrl = 'https://api.publicapis.org/'
 +    
@@ -235,12 +232,12 @@
 +    }
 +    
 +    export const useEntries = () => {
++                 ~~~~~~~~~~
++!!! error TS2742: The inferred type of 'useEntries' cannot be named without a reference to '../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js'. This is likely not portable. A type annotation is necessary.
 +      return useQuery({
 +        queryKey: entryKeys.list(),
 +        queryFn: testApi.getEntries,
 +        select: (data) => data.slice(0, 10)
-+                 ~~~~
-+!!! error TS7006: Parameter 'data' implicitly has an 'any' type.
 +      })
 +    }
 +    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.js b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.js
index 0d531edc25..673b6e039b 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.js
@@ -260,4 +260,14 @@ export const useEntries = () => {
 
 
 //// [index.d.mts]
-export declare const useEntries: () => any;
+interface IEntry {
+    API: string;
+    Description: string;
+    Auth: string;
+    HTTPS: boolean;
+    Cors: string;
+    Link: string;
+    Category: string;
+}
+export declare const useEntries: any;
+export {};
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.js.diff
index ed57831a20..ec3ea4a418 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.js.diff
@@ -1,18 +1,9 @@
 --- old.declarationEmitUsingAlternativeContainingModules2.js
 +++ new.declarationEmitUsingAlternativeContainingModules2.js
-@@= skipped -259, +259 lines =@@
-
-
- //// [index.d.mts]
--interface IEntry {
--    API: string;
--    Description: string;
--    Auth: string;
--    HTTPS: boolean;
--    Cors: string;
--    Link: string;
--    Category: string;
--}
+@@= skipped -268, +268 lines =@@
+     Link: string;
+     Category: string;
+ }
 -export declare const useEntries: () => import("@tanstack/vue-query").UseQueryReturnType<IEntry[], Error>;
--export {};
-+export declare const useEntries: () => any;
\ No newline at end of file
++export declare const useEntries: any;
+ export {};
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols.diff
index 5d698c4ab8..8b032e150e 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.symbols.diff
@@ -264,13 +264,7 @@
 +>data.slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
  >data : Symbol(data, Decl(index.mts, 32, 13))
 ->slice : Symbol(Array.slice, Decl(lib.es5.d.ts, --, --))
-<<<<<<< HEAD
 +>slice : Symbol(slice, Decl(lib.es5.d.ts, --, --))
- 
-||||||| 2303c3a6e
- 
-=======
 
->>>>>>> main
    })
  }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
index 8e2878b9b1..b08ed73d6e 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types
@@ -309,7 +309,7 @@ export { b as UseQueryReturnType, u as useQuery } from './useQuery-CPqkvEsh.js';
 
 === src/index.mts ===
 import { useQuery } from '@tanstack/vue-query'
->useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<TData, TError>
 
 const baseUrl = 'https://api.publicapis.org/'
 >baseUrl : "https://api.publicapis.org/"
@@ -411,12 +411,12 @@ const entryKeys = {
 }
 
 export const useEntries = () => {
->useEntries : () => UseQueryReturnType<IEntry[], Error>
->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => UseQueryReturnType<IEntry[], Error>
+>useEntries : () => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<IEntry[], Error>
+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<IEntry[], Error>
 
   return useQuery({
->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : UseQueryReturnType<IEntry[], Error>
->useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<IEntry[], Error>
+>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<TData, TError>
 >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
 
     queryKey: entryKeys.list(),
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
index 6174e18626..59d1970998 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingAlternativeContainingModules2.types.diff
@@ -12,16 +12,8 @@
  === src/index.mts ===
  import { useQuery } from '@tanstack/vue-query'
 ->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: (number | (() => number | undefined)) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
-<<<<<<< HEAD
-+>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
- 
-||||||| 2303c3a6e
-+>useQuery : any
- 
-=======
-+>useQuery : any
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<TData, TError>
 
->>>>>>> main
  const baseUrl = 'https://api.publicapis.org/'
  >baseUrl : "https://api.publicapis.org/"
 @@= skipped -50, +50 lines =@@
@@ -39,67 +31,21 @@
  export const useEntries = () => {
 ->useEntries : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
 ->() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
-<<<<<<< HEAD
-+>useEntries : () => UseQueryReturnType<IEntry[], Error>
-+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => UseQueryReturnType<IEntry[], Error>
- 
-||||||| 2303c3a6e
-+>useEntries : () => any
-+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => any
- 
-=======
-+>useEntries : () => any
-+>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => any
++>useEntries : () => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<IEntry[], Error>
++>() => {  return useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  })} : () => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<IEntry[], Error>
 
->>>>>>> main
    return useQuery({
 ->useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<IEntry[], Error>
 ->useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: (number | (() => number | undefined)) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh").b<TData, TError>
-<<<<<<< HEAD
-+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : UseQueryReturnType<IEntry[], Error>
-+>useQuery : <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>) => UseQueryReturnType<TData, TError>
++>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<IEntry[], Error>
++>useQuery : <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends readonly unknown[] = readonly unknown[]>(options: { retry?: (number | boolean | ((failureCount: number, error: TError) => boolean)) | undefined; queryFn?: ((context: { queryKey: TQueryKey; }) => TQueryFnData | Promise<TQueryFnData>) | undefined; queryKey?: TQueryKey | undefined; initialData?: TQueryFnData | undefined; initialDataUpdatedAt?: number | (() => number | undefined) | undefined; enabled?: boolean | undefined; refetchInterval?: number | undefined; select?: ((data: TQueryFnData) => TData) | undefined; } & { initialData?: undefined; }) => import("../node_modules/@tanstack/vue-query/build/modern/useQuery-CPqkvEsh.js").b<TData, TError>
  >{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
- 
-||||||| 2303c3a6e
-->{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
-+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : any
-+>useQuery : any
-+>{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: any) => any; }
- 
-=======
-->{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: IEntry[]) => IEntry[]; }
-+>useQuery({    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  }) : any
-+>useQuery : any
-+>{    queryKey: entryKeys.list(),    queryFn: testApi.getEntries,    select: (data) => data.slice(0, 10)  } : { queryKey: readonly ["entries", "list"]; queryFn: () => Promise<IEntry[]>; select: (data: any) => any; }
 
->>>>>>> main
      queryKey: entryKeys.list(),
-<<<<<<< HEAD
 @@= skipped -26, +26 lines =@@
  >(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
  >data : IEntry[]
  >data.slice(0, 10) : IEntry[]
-||||||| 2303c3a6e
- >queryKey : readonly ["entries", "list"]
-@@= skipped -22, +22 lines =@@
- >getEntries : () => Promise<IEntry[]>
- 
-     select: (data) => data.slice(0, 10)
-->select : (data: IEntry[]) => IEntry[]
-->(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
-->data : IEntry[]
-->data.slice(0, 10) : IEntry[]
-=======
- >queryKey : readonly ["entries", "list"]
-@@= skipped -22, +22 lines =@@
- >getEntries : () => Promise<IEntry[]>
-
-     select: (data) => data.slice(0, 10)
-->select : (data: IEntry[]) => IEntry[]
-->(data) => data.slice(0, 10) : (data: IEntry[]) => IEntry[]
-->data : IEntry[]
-->data.slice(0, 10) : IEntry[]
->>>>>>> main
 ->data.slice : (start?: number, end?: number) => IEntry[]
 +>data.slice : (start?: number | undefined, end?: number | undefined) => IEntry[]
  >data : IEntry[]
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.errors.txt
index c6eefed76d..c31e66a237 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.errors.txt
@@ -1,5 +1,5 @@
-src/index.ts(3,14): error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner.js'. This is likely not portable. A type annotation is necessary.
-src/index.ts(7,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner.js'. This is likely not portable. A type annotation is necessary.
+src/index.ts(3,14): error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
+src/index.ts(7,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
 
 
 ==== node_modules/some-dep/dist/inner.d.ts (0 errors) ====
@@ -23,12 +23,12 @@ src/index.ts(7,14): error TS2742: The inferred type of 'bar' cannot be named wit
     
     export const foo = (thing: SomeType) => {
                  ~~~
-!!! error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
       return thing;
     };
     
     export const bar = (thing: SomeType) => {
                  ~~~
-!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
       return thing.arg;
     };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.errors.txt.diff
deleted file mode 100644
index ee681a4ef9..0000000000
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.errors.txt.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- old.declarationEmitUsingTypeAlias1.errors.txt
-+++ new.declarationEmitUsingTypeAlias1.errors.txt
-@@= skipped -0, +0 lines =@@
--src/index.ts(3,14): error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
--src/index.ts(7,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
-+src/index.ts(3,14): error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner.js'. This is likely not portable. A type annotation is necessary.
-+src/index.ts(7,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner.js'. This is likely not portable. A type annotation is necessary.
-
-
- ==== node_modules/some-dep/dist/inner.d.ts (0 errors) ====
-@@= skipped -22, +22 lines =@@
-     
-     export const foo = (thing: SomeType) => {
-                  ~~~
--!!! error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
-+!!! error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner.js'. This is likely not portable. A type annotation is necessary.
-       return thing;
-     };
-     
-     export const bar = (thing: SomeType) => {
-                  ~~~
--!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
-+!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner.js'. This is likely not portable. A type annotation is necessary.
-       return thing.arg;
-     };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types
index fb2a5748e1..2e4d76884a 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types
@@ -11,33 +11,33 @@ export declare type SomeType = { arg: Other };
 
 === node_modules/some-dep/dist/index.d.ts ===
 export type OtherType = import('./inner').Other;
->OtherType : import("./inner.js").Other
+>OtherType : import("./inner").Other
 
 export type SomeType = import('./inner').SomeType;
->SomeType : import("./inner.js").SomeType
+>SomeType : import("./inner").SomeType
 
 === src/index.ts ===
 import { SomeType } from "some-dep";
 >SomeType : any
 
 export const foo = (thing: SomeType) => {
->foo : (thing: import("../node_modules/some-dep/dist/inner.js").SomeType) => import("../node_modules/some-dep/dist/inner.js").SomeType
->(thing: SomeType) => {  return thing;} : (thing: import("../node_modules/some-dep/dist/inner.js").SomeType) => import("../node_modules/some-dep/dist/inner.js").SomeType
->thing : import("../node_modules/some-dep/dist/inner.js").SomeType
+>foo : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").SomeType
+>(thing: SomeType) => {  return thing;} : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").SomeType
+>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
   return thing;
->thing : import("../node_modules/some-dep/dist/inner.js").SomeType
+>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
 };
 
 export const bar = (thing: SomeType) => {
->bar : (thing: import("../node_modules/some-dep/dist/inner.js").SomeType) => import("../node_modules/some-dep/dist/inner.js").Other
->(thing: SomeType) => {  return thing.arg;} : (thing: import("../node_modules/some-dep/dist/inner.js").SomeType) => import("../node_modules/some-dep/dist/inner.js").Other
->thing : import("../node_modules/some-dep/dist/inner.js").SomeType
+>bar : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").Other
+>(thing: SomeType) => {  return thing.arg;} : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").Other
+>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
   return thing.arg;
->thing.arg : import("../node_modules/some-dep/dist/inner.js").Other
->thing : import("../node_modules/some-dep/dist/inner.js").SomeType
->arg : import("../node_modules/some-dep/dist/inner.js").Other
+>thing.arg : import("../node_modules/some-dep/dist/inner").Other
+>thing : import("../node_modules/some-dep/dist/inner").SomeType
+>arg : import("../node_modules/some-dep/dist/inner").Other
 
 };
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types.diff
index dd1d5dfe1a..11e2693ffd 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias1.types.diff
@@ -5,11 +5,11 @@
  === node_modules/some-dep/dist/index.d.ts ===
  export type OtherType = import('./inner').Other;
 ->OtherType : import("node_modules/some-dep/dist/inner").Other
-+>OtherType : import("./inner.js").Other
++>OtherType : import("./inner").Other
 
  export type SomeType = import('./inner').SomeType;
 ->SomeType : import("node_modules/some-dep/dist/inner").SomeType
-+>SomeType : import("./inner.js").SomeType
++>SomeType : import("./inner").SomeType
 
  === src/index.ts ===
  import { SomeType } from "some-dep";
@@ -19,13 +19,13 @@
 ->foo : (thing: SomeType) => import("node_modules/some-dep/dist/inner").SomeType
 ->(thing: SomeType) => {  return thing;} : (thing: SomeType) => import("node_modules/some-dep/dist/inner").SomeType
 ->thing : import("node_modules/some-dep/dist/inner").SomeType
-+>foo : (thing: import("../node_modules/some-dep/dist/inner.js").SomeType) => import("../node_modules/some-dep/dist/inner.js").SomeType
-+>(thing: SomeType) => {  return thing;} : (thing: import("../node_modules/some-dep/dist/inner.js").SomeType) => import("../node_modules/some-dep/dist/inner.js").SomeType
-+>thing : import("../node_modules/some-dep/dist/inner.js").SomeType
++>foo : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").SomeType
++>(thing: SomeType) => {  return thing;} : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").SomeType
++>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
    return thing;
 ->thing : import("node_modules/some-dep/dist/inner").SomeType
-+>thing : import("../node_modules/some-dep/dist/inner.js").SomeType
++>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
  };
 
@@ -33,16 +33,16 @@
 ->bar : (thing: SomeType) => import("node_modules/some-dep/dist/inner").Other
 ->(thing: SomeType) => {  return thing.arg;} : (thing: SomeType) => import("node_modules/some-dep/dist/inner").Other
 ->thing : import("node_modules/some-dep/dist/inner").SomeType
-+>bar : (thing: import("../node_modules/some-dep/dist/inner.js").SomeType) => import("../node_modules/some-dep/dist/inner.js").Other
-+>(thing: SomeType) => {  return thing.arg;} : (thing: import("../node_modules/some-dep/dist/inner.js").SomeType) => import("../node_modules/some-dep/dist/inner.js").Other
-+>thing : import("../node_modules/some-dep/dist/inner.js").SomeType
++>bar : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").Other
++>(thing: SomeType) => {  return thing.arg;} : (thing: import("../node_modules/some-dep/dist/inner").SomeType) => import("../node_modules/some-dep/dist/inner").Other
++>thing : import("../node_modules/some-dep/dist/inner").SomeType
 
    return thing.arg;
 ->thing.arg : import("node_modules/some-dep/dist/inner").Other
 ->thing : import("node_modules/some-dep/dist/inner").SomeType
 ->arg : import("node_modules/some-dep/dist/inner").Other
-+>thing.arg : import("../node_modules/some-dep/dist/inner.js").Other
-+>thing : import("../node_modules/some-dep/dist/inner.js").SomeType
-+>arg : import("../node_modules/some-dep/dist/inner.js").Other
++>thing.arg : import("../node_modules/some-dep/dist/inner").Other
++>thing : import("../node_modules/some-dep/dist/inner").SomeType
++>arg : import("../node_modules/some-dep/dist/inner").Other
 
  };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.errors.txt
index 7f16e9ecda..5a118caf72 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.errors.txt
@@ -1,4 +1,4 @@
-src/index.ts(2,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/other.js'. This is likely not portable. A type annotation is necessary.
+src/index.ts(2,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist'. This is likely not portable. A type annotation is necessary.
 
 
 ==== node_modules/some-dep/dist/inner.d.ts (0 errors) ====
@@ -41,6 +41,6 @@ src/index.ts(2,14): error TS2742: The inferred type of 'bar' cannot be named wit
     import { goodDeclaration, shouldReuseLocalName, shouldBeElided } from "some-dep";
     export const bar = goodDeclaration<{}>;
                  ~~~
-!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/other.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist'. This is likely not portable. A type annotation is necessary.
     
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.errors.txt.diff
index 456506e0dd..90d7603f9d 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.errors.txt.diff
@@ -2,7 +2,7 @@
 +++ new.declarationEmitUsingTypeAlias2.errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+src/index.ts(2,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/other.js'. This is likely not portable. A type annotation is necessary.
++src/index.ts(2,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist'. This is likely not portable. A type annotation is necessary.
 +
 +
 +==== node_modules/some-dep/dist/inner.d.ts (0 errors) ====
@@ -45,6 +45,6 @@
 +    import { goodDeclaration, shouldReuseLocalName, shouldBeElided } from "some-dep";
 +    export const bar = goodDeclaration<{}>;
 +                 ~~~
-+!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/other.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist'. This is likely not portable. A type annotation is necessary.
 +    
 +    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js
index 6f13e5e96a..4ca6f918ea 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js
@@ -43,21 +43,13 @@ export const bar = goodDeclaration<{}>;
 
 
 //// [index.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bar = void 0;
 const some_dep_1 = require("some-dep");
 exports.bar = some_dep_1.goodDeclaration;
-||||||| 2303c3a6e
-import { goodDeclaration } from "some-dep";
-export const bar = goodDeclaration;
-=======
-import { goodDeclaration } from "some-dep";
-export const bar = goodDeclaration;
 
 
 //// [index.d.ts]
 import { shouldReuseLocalName } from "some-dep";
 export declare const bar: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js.diff
index 66d850baa1..787087abd6 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.js.diff
@@ -1,32 +1,11 @@
 --- old.declarationEmitUsingTypeAlias2.js
 +++ new.declarationEmitUsingTypeAlias2.js
-<<<<<<< HEAD
 @@= skipped -46, +46 lines =@@
  Object.defineProperty(exports, "__esModule", { value: true });
  exports.bar = void 0;
  const some_dep_1 = require("some-dep");
-||||||| 2303c3a6e
-@@= skipped -42, +42 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.bar = void 0;
--const some_dep_1 = require("some-dep");
-=======
-@@= skipped -42, +42 lines =@@
-
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.bar = void 0;
--const some_dep_1 = require("some-dep");
->>>>>>> main
 -exports.bar = (some_dep_1.goodDeclaration);
-+import { goodDeclaration } from "some-dep";
-+export const bar = goodDeclaration;
++exports.bar = some_dep_1.goodDeclaration;
 
 
  //// [index.d.ts]
@@ -38,11 +17,4 @@
 -    shouldReuseLocalName: typeof shouldReuseLocalName;
 -    reuseDepName: typeof import("some-dep").reuseDepName;
 -};
-<<<<<<< HEAD
-+exports.bar = some_dep_1.goodDeclaration;
-||||||| 2303c3a6e
-+import { goodDeclaration } from "some-dep";
-+export const bar = goodDeclaration;
-=======
-+export declare const bar: any;
->>>>>>> main
++export declare const bar: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types
index c763fce78a..8084d722c0 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types
@@ -70,13 +70,13 @@ export { shouldLookupName, shouldReuseLocalName, reuseDepName, shouldBeElided };
 
 === src/index.ts ===
 import { goodDeclaration, shouldReuseLocalName, shouldBeElided } from "some-dep";
->goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner.js").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner.js").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
+>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 >shouldReuseLocalName : unique symbol
 >shouldBeElided : unique symbol
 
 export const bar = goodDeclaration<{}>;
 >bar : () => () => { shouldPrintResult: "N"; shouldPrintResult2: "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 >goodDeclaration<{}> : () => () => { shouldPrintResult: "N"; shouldPrintResult2: "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
->goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner.js").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner.js").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
+>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 
 
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types.diff
index 977f8680b6..1f08da8d11 100644
--- a/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/declarationEmitUsingTypeAlias2.types.diff
@@ -23,7 +23,7 @@
  === src/index.ts ===
  import { goodDeclaration, shouldReuseLocalName, shouldBeElided } from "some-dep";
 ->goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends typeof shouldBeElided ? import("node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: typeof import("node_modules/some-dep/dist/other").shouldLookupName; shouldReuseLocalName: typeof shouldReuseLocalName; reuseDepName: typeof import("node_modules/some-dep/dist/other").reuseDepName; }
-+>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner.js").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner.js").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
++>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
  >shouldReuseLocalName : unique symbol
  >shouldBeElided : unique symbol
 
@@ -33,5 +33,5 @@
 ->goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends typeof shouldBeElided ? import("node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: typeof import("node_modules/some-dep/dist/other").shouldLookupName; shouldReuseLocalName: typeof shouldReuseLocalName; reuseDepName: typeof import("node_modules/some-dep/dist/other").reuseDepName; }
 +>bar : () => () => { shouldPrintResult: "N"; shouldPrintResult2: "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 +>goodDeclaration<{}> : () => () => { shouldPrintResult: "N"; shouldPrintResult2: "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
-+>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner.js").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner.js").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
++>goodDeclaration : <T>() => () => { shouldPrintResult: T extends import("../node_modules/some-dep/dist/inner").Other ? "O" : "N"; shouldPrintResult2: T extends unique symbol ? import("../node_modules/some-dep/dist/inner").Other : "N"; shouldLookupName: unique symbol; shouldReuseLocalName: unique symbol; reuseDepName: unique symbol; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types
index bc11f5cf0f..8574e5f1d2 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types
@@ -9,9 +9,9 @@ import * as a from "a";
 
 const o: Foo = a.o;
 >o : Foo
->a.o : import("a/node_modules/foo/Foo.js").default
+>a.o : import("a/node_modules/foo/Foo").default
 >a : typeof a
->o : import("a/node_modules/foo/Foo.js").default
+>o : import("a/node_modules/foo/Foo").default
 
 === /node_modules/a/index.d.ts ===
 import Foo from "foo/Foo";
diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types.diff b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types.diff
index 6082c388b6..e84a0b8231 100644
--- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.types.diff
@@ -5,10 +5,10 @@
  const o: Foo = a.o;
  >o : Foo
 ->a.o : Foo
-+>a.o : import("a/node_modules/foo/Foo.js").default
++>a.o : import("a/node_modules/foo/Foo").default
  >a : typeof a
 ->o : Foo
-+>o : import("a/node_modules/foo/Foo.js").default
++>o : import("a/node_modules/foo/Foo").default
 
  === /node_modules/a/index.d.ts ===
  import Foo from "foo/Foo";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt
index 10b74b3b60..e6add639aa 100644
--- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt
@@ -1,9 +1,9 @@
-es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(3,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(5,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(7,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(7,30): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(9,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(11,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(3,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(5,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(7,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(7,30): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(9,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(11,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
 
 
 ==== es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.ts (0 errors) ====
@@ -15,24 +15,24 @@ es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(11,27): error TS2614:
     var x: number = defaultBinding1;
     import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
-!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
     var x: number = defaultBinding2;
     import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
-!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
     var x: number = defaultBinding3;
     import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
-!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
                                  ~
-!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
     var x: number = defaultBinding4;
     import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
-!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
     var x: number = defaultBinding5;
     import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
-!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
+!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
     var x: number = defaultBinding6;
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt.diff
deleted file mode 100644
index 9ce8f8b0ef..0000000000
--- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- old.es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt
-+++ new.es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt
-@@= skipped -0, +0 lines =@@
--es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(3,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
--es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(5,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
--es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(7,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
--es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(7,30): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
--es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(9,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
--es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(11,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(3,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(5,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(7,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(7,30): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(9,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(11,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-
-
- ==== es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.ts (0 errors) ====
-@@= skipped -14, +14 lines =@@
-     var x: number = defaultBinding1;
-     import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
-                               ~
--!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-     var x: number = defaultBinding2;
-     import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
-                               ~
--!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-     var x: number = defaultBinding3;
-     import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
-                               ~
--!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-                                  ~
--!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-     var x: number = defaultBinding4;
-     import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
-                               ~
--!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-     var x: number = defaultBinding5;
-     import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
-                               ~
--!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' instead?
-     var x: number = defaultBinding6;
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt
index dcb9f3436c..2a3a695905 100644
--- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt
@@ -1,20 +1,20 @@
 client.ts(1,1): error TS1191: An import declaration cannot have modifiers.
 client.ts(2,12): error TS2323: Cannot redeclare exported variable 'x1'.
 client.ts(3,1): error TS1191: An import declaration cannot have modifiers.
-client.ts(3,34): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+client.ts(3,34): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
 client.ts(4,12): error TS2323: Cannot redeclare exported variable 'x1'.
 client.ts(5,1): error TS1191: An import declaration cannot have modifiers.
-client.ts(5,34): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+client.ts(5,34): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
 client.ts(6,12): error TS2323: Cannot redeclare exported variable 'x1'.
 client.ts(7,1): error TS1191: An import declaration cannot have modifiers.
-client.ts(7,34): error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-client.ts(7,37): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+client.ts(7,34): error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
+client.ts(7,37): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
 client.ts(8,12): error TS2323: Cannot redeclare exported variable 'x1'.
 client.ts(9,1): error TS1191: An import declaration cannot have modifiers.
-client.ts(9,34): error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
+client.ts(9,34): error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
 client.ts(10,12): error TS2323: Cannot redeclare exported variable 'x1'.
 client.ts(11,1): error TS1191: An import declaration cannot have modifiers.
-client.ts(11,34): error TS2614: Module '"server"' has no exported member 'm'. Did you mean to use 'import m from "server"' instead?
+client.ts(11,34): error TS2614: Module '"./server"' has no exported member 'm'. Did you mean to use 'import m from "./server"' instead?
 client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
 
 
@@ -33,7 +33,7 @@ client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
-!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
     export var x1: number = defaultBinding2;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
@@ -41,7 +41,7 @@ client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
-!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
     export var x1: number = defaultBinding3;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
@@ -49,9 +49,9 @@ client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
-!!! error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
                                         ~
-!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
     export var x1: number = defaultBinding4;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
@@ -59,7 +59,7 @@ client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
-!!! error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
     export var x1: number = defaultBinding5;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
@@ -67,7 +67,7 @@ client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
-!!! error TS2614: Module '"server"' has no exported member 'm'. Did you mean to use 'import m from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'm'. Did you mean to use 'import m from "./server"' instead?
     export var x1: number = defaultBinding6;
                ~~
 !!! error TS2323: Cannot redeclare exported variable 'x1'.
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt.diff
deleted file mode 100644
index 1fcaad9a59..0000000000
--- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- old.es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt
-+++ new.es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt
-@@= skipped -0, +0 lines =@@
- client.ts(1,1): error TS1191: An import declaration cannot have modifiers.
- client.ts(2,12): error TS2323: Cannot redeclare exported variable 'x1'.
- client.ts(3,1): error TS1191: An import declaration cannot have modifiers.
--client.ts(3,34): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+client.ts(3,34): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
- client.ts(4,12): error TS2323: Cannot redeclare exported variable 'x1'.
- client.ts(5,1): error TS1191: An import declaration cannot have modifiers.
--client.ts(5,34): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+client.ts(5,34): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
- client.ts(6,12): error TS2323: Cannot redeclare exported variable 'x1'.
- client.ts(7,1): error TS1191: An import declaration cannot have modifiers.
--client.ts(7,34): error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
--client.ts(7,37): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+client.ts(7,34): error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-+client.ts(7,37): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
- client.ts(8,12): error TS2323: Cannot redeclare exported variable 'x1'.
- client.ts(9,1): error TS1191: An import declaration cannot have modifiers.
--client.ts(9,34): error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
-+client.ts(9,34): error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
- client.ts(10,12): error TS2323: Cannot redeclare exported variable 'x1'.
- client.ts(11,1): error TS1191: An import declaration cannot have modifiers.
--client.ts(11,34): error TS2614: Module '"./server"' has no exported member 'm'. Did you mean to use 'import m from "./server"' instead?
-+client.ts(11,34): error TS2614: Module '"server"' has no exported member 'm'. Did you mean to use 'import m from "server"' instead?
- client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'.
-
-
-@@= skipped -32, +32 lines =@@
-     ~~~~~~
- !!! error TS1191: An import declaration cannot have modifiers.
-                                      ~
--!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-     export var x1: number = defaultBinding2;
-                ~~
- !!! error TS2323: Cannot redeclare exported variable 'x1'.
-@@= skipped -8, +8 lines =@@
-     ~~~~~~
- !!! error TS1191: An import declaration cannot have modifiers.
-                                      ~
--!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-     export var x1: number = defaultBinding3;
-                ~~
- !!! error TS2323: Cannot redeclare exported variable 'x1'.
-@@= skipped -8, +8 lines =@@
-     ~~~~~~
- !!! error TS1191: An import declaration cannot have modifiers.
-                                      ~
--!!! error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-                                         ~
--!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-     export var x1: number = defaultBinding4;
-                ~~
- !!! error TS2323: Cannot redeclare exported variable 'x1'.
-@@= skipped -10, +10 lines =@@
-     ~~~~~~
- !!! error TS1191: An import declaration cannot have modifiers.
-                                      ~
--!!! error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-     export var x1: number = defaultBinding5;
-                ~~
- !!! error TS2323: Cannot redeclare exported variable 'x1'.
-@@= skipped -8, +8 lines =@@
-     ~~~~~~
- !!! error TS1191: An import declaration cannot have modifiers.
-                                      ~
--!!! error TS2614: Module '"./server"' has no exported member 'm'. Did you mean to use 'import m from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'm'. Did you mean to use 'import m from "server"' instead?
-     export var x1: number = defaultBinding6;
-                ~~
- !!! error TS2323: Cannot redeclare exported variable 'x1'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt
index 03578fea2d..e3ab9d8099 100644
--- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt
@@ -1,9 +1,9 @@
-client.ts(3,27): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-client.ts(5,27): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-client.ts(7,27): error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-client.ts(7,30): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-client.ts(9,27): error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-client.ts(11,27): error TS2614: Module '"server"' has no exported member 'm'. Did you mean to use 'import m from "server"' instead?
+client.ts(3,27): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
+client.ts(5,27): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
+client.ts(7,27): error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
+client.ts(7,30): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
+client.ts(9,27): error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
+client.ts(11,27): error TS2614: Module '"./server"' has no exported member 'm'. Did you mean to use 'import m from "./server"' instead?
 
 
 ==== server.ts (0 errors) ====
@@ -15,23 +15,23 @@ client.ts(11,27): error TS2614: Module '"server"' has no exported member 'm'. Di
     export var x1 = new defaultBinding1();
     import defaultBinding2, { a } from "./server";
                               ~
-!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
     export var x2 = new defaultBinding2();
     import defaultBinding3, { a as b } from "./server";
                               ~
-!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
     export var x3 = new defaultBinding3();
     import defaultBinding4, { x, a as y } from "./server";
                               ~
-!!! error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
                                  ~
-!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
     export var x4 = new defaultBinding4();
     import defaultBinding5, { x as z,  } from "./server";
                               ~
-!!! error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
     export var x5 = new defaultBinding5();
     import defaultBinding6, { m,  } from "./server";
                               ~
-!!! error TS2614: Module '"server"' has no exported member 'm'. Did you mean to use 'import m from "server"' instead?
+!!! error TS2614: Module '"./server"' has no exported member 'm'. Did you mean to use 'import m from "./server"' instead?
     export var x6 = new defaultBinding6();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt.diff
deleted file mode 100644
index f042b26929..0000000000
--- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- old.es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt
-+++ new.es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt
-@@= skipped -0, +0 lines =@@
--client.ts(3,27): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
--client.ts(5,27): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
--client.ts(7,27): error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
--client.ts(7,30): error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
--client.ts(9,27): error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
--client.ts(11,27): error TS2614: Module '"./server"' has no exported member 'm'. Did you mean to use 'import m from "./server"' instead?
-+client.ts(3,27): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-+client.ts(5,27): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-+client.ts(7,27): error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-+client.ts(7,30): error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-+client.ts(9,27): error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-+client.ts(11,27): error TS2614: Module '"server"' has no exported member 'm'. Did you mean to use 'import m from "server"' instead?
-
-
- ==== server.ts (0 errors) ====
-@@= skipped -14, +14 lines =@@
-     export var x1 = new defaultBinding1();
-     import defaultBinding2, { a } from "./server";
-                               ~
--!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-     export var x2 = new defaultBinding2();
-     import defaultBinding3, { a as b } from "./server";
-                               ~
--!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-     export var x3 = new defaultBinding3();
-     import defaultBinding4, { x, a as y } from "./server";
-                               ~
--!!! error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-                                  ~
--!!! error TS2614: Module '"./server"' has no exported member 'a'. Did you mean to use 'import a from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'a'. Did you mean to use 'import a from "server"' instead?
-     export var x4 = new defaultBinding4();
-     import defaultBinding5, { x as z,  } from "./server";
-                               ~
--!!! error TS2614: Module '"./server"' has no exported member 'x'. Did you mean to use 'import x from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'x'. Did you mean to use 'import x from "server"' instead?
-     export var x5 = new defaultBinding5();
-     import defaultBinding6, { m,  } from "./server";
-                               ~
--!!! error TS2614: Module '"./server"' has no exported member 'm'. Did you mean to use 'import m from "./server"' instead?
-+!!! error TS2614: Module '"server"' has no exported member 'm'. Did you mean to use 'import m from "server"' instead?
-     export var x6 = new defaultBinding6();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoExportMember.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoExportMember.errors.txt
index 20e8dbf9c0..c889d79721 100644
--- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoExportMember.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoExportMember.errors.txt
@@ -1,5 +1,5 @@
-es6ImportNamedImport_1.ts(1,10): error TS2305: Module '"es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
-es6ImportNamedImport_1.ts(2,10): error TS2305: Module '"es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
+es6ImportNamedImport_1.ts(1,10): error TS2305: Module '"./es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
+es6ImportNamedImport_1.ts(2,10): error TS2305: Module '"./es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
 
 
 ==== es6ImportNamedImportNoExportMember_0.ts (0 errors) ====
@@ -9,7 +9,7 @@ es6ImportNamedImport_1.ts(2,10): error TS2305: Module '"es6ImportNamedImportNoEx
 ==== es6ImportNamedImport_1.ts (2 errors) ====
     import { a1 } from "./es6ImportNamedImportNoExportMember_0";
              ~~
-!!! error TS2305: Module '"es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
+!!! error TS2305: Module '"./es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
     import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
              ~~
-!!! error TS2305: Module '"es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
\ No newline at end of file
+!!! error TS2305: Module '"./es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoExportMember.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoExportMember.errors.txt.diff
deleted file mode 100644
index 1886d03a78..0000000000
--- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoExportMember.errors.txt.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.es6ImportNamedImportNoExportMember.errors.txt
-+++ new.es6ImportNamedImportNoExportMember.errors.txt
-@@= skipped -0, +0 lines =@@
--es6ImportNamedImport_1.ts(1,10): error TS2305: Module '"./es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
--es6ImportNamedImport_1.ts(2,10): error TS2305: Module '"./es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
-+es6ImportNamedImport_1.ts(1,10): error TS2305: Module '"es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
-+es6ImportNamedImport_1.ts(2,10): error TS2305: Module '"es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
-
-
- ==== es6ImportNamedImportNoExportMember_0.ts (0 errors) ====
-@@= skipped -8, +8 lines =@@
- ==== es6ImportNamedImport_1.ts (2 errors) ====
-     import { a1 } from "./es6ImportNamedImportNoExportMember_0";
-              ~~
--!!! error TS2305: Module '"./es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
-+!!! error TS2305: Module '"es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
-     import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
-              ~~
--!!! error TS2305: Module '"./es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
-+!!! error TS2305: Module '"es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt
index 752d6bc167..480948746c 100644
--- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt
@@ -1,5 +1,5 @@
-es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2617: 'a' can only be imported by using 'import a = require("es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
-es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imported by using 'import a = require("es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
+es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
+es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
 
 
 ==== es6ImportNamedImportNoNamedExports_0.ts (0 errors) ====
@@ -9,7 +9,7 @@ es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imp
 ==== es6ImportNamedImportNoNamedExports_1.ts (2 errors) ====
     import { a } from "./es6ImportNamedImportNoNamedExports_0";
              ~
-!!! error TS2617: 'a' can only be imported by using 'import a = require("es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
+!!! error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
     import { a as x } from "./es6ImportNamedImportNoNamedExports_0";
              ~
-!!! error TS2617: 'a' can only be imported by using 'import a = require("es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
\ No newline at end of file
+!!! error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt.diff
deleted file mode 100644
index 137589a09f..0000000000
--- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.es6ImportNamedImportNoNamedExports.errors.txt
-+++ new.es6ImportNamedImportNoNamedExports.errors.txt
-@@= skipped -0, +0 lines =@@
--es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
--es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
-+es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2617: 'a' can only be imported by using 'import a = require("es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
-+es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imported by using 'import a = require("es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
-
-
- ==== es6ImportNamedImportNoNamedExports_0.ts (0 errors) ====
-@@= skipped -8, +8 lines =@@
- ==== es6ImportNamedImportNoNamedExports_1.ts (2 errors) ====
-     import { a } from "./es6ImportNamedImportNoNamedExports_0";
-              ~
--!!! error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
-+!!! error TS2617: 'a' can only be imported by using 'import a = require("es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
-     import { a as x } from "./es6ImportNamedImportNoNamedExports_0";
-              ~
--!!! error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
-+!!! error TS2617: 'a' can only be imported by using 'import a = require("es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types b/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types
index dc3bd99be7..0b89907938 100644
--- a/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types
+++ b/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types
@@ -2,10 +2,10 @@
 
 === mod.d.ts ===
 export = modObj;
->modObj : import("./mod.js").A & import("./mod.js").B
+>modObj : import("./mod").A & import("./mod").B
 
 declare const modObj: modObj.A & modObj.B;
->modObj : import("./mod.js").A & import("./mod.js").B
+>modObj : import("./mod").A & import("./mod").B
 >modObj : any
 >modObj : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types.diff b/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types.diff
index 5f6a44d99c..d7f8b7f484 100644
--- a/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/esModuleIntersectionCrash.types.diff
@@ -5,11 +5,11 @@
  === mod.d.ts ===
  export = modObj;
 ->modObj : modObj.A & modObj.B
-+>modObj : import("./mod.js").A & import("./mod.js").B
++>modObj : import("./mod").A & import("./mod").B
 
  declare const modObj: modObj.A & modObj.B;
 ->modObj : modObj.A & modObj.B
-+>modObj : import("./mod.js").A & import("./mod.js").B
++>modObj : import("./mod").A & import("./mod").B
  >modObj : any
  >modObj : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types b/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types
index dcc1f9cf3b..8e72fcd718 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types
+++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types
@@ -7,5 +7,5 @@ export var X;
 >X : any
 
 export as namespace N
->N : typeof import("./exportAsNamespace.js")
+>N : typeof import("./exportAsNamespace")
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types.diff b/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types.diff
index b68f2d3ef2..80e43df3cc 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace.d.types.diff
@@ -5,4 +5,4 @@
 
  export as namespace N
 ->N : typeof import("exportAsNamespace")
-+>N : typeof import("./exportAsNamespace.js")
++>N : typeof import("./exportAsNamespace")
diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types
index cf40875ab3..a5f8474989 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types
+++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types
@@ -2,7 +2,7 @@
 
 === /a.d.ts ===
 export as namespace a;
->a : typeof import("./a.js")
+>a : typeof import("./a")
 
 export const x = 0;
 >x : 0
diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types.diff b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types.diff
index d630c67e2b..dd0b031b2f 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.types.diff
@@ -5,7 +5,7 @@
  === /a.d.ts ===
  export as namespace a;
 ->a : typeof import("/a")
-+>a : typeof import("./a.js")
++>a : typeof import("./a")
 
  export const x = 0;
  >x : 0
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.js b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.js
index f22b3ae3e8..2c5579893e 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.js
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.js
@@ -19,4 +19,4 @@ exports.thing = (0, thing_1.f)();
 
 
 //// [index.d.ts]
-export declare const thing: import("./thing.js").Bar;
+export declare const thing: import("./thing").Bar;
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.js.diff b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.js.diff
index f2f902930b..9df2ffa85b 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.js.diff
@@ -8,7 +8,3 @@
 +const thing_1 = require("./thing");
  exports.thing = (0, thing_1.f)();
 
-
- //// [index.d.ts]
--export declare const thing: import("./thing").Bar;
-+export declare const thing: import("./thing.js").Bar;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
index 58bf7cbd2c..5d58d58a47 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types
@@ -13,10 +13,10 @@ export = Foo;
 
 === index.ts ===
 import { f } from "./thing";
->f : () => import("./thing.js").Bar
+>f : () => import("./thing").Bar
 
 export const thing = f();
->thing : import("./thing.js").Bar
->f() : import("./thing.js").Bar
->f : () => import("./thing.js").Bar
+>thing : import("./thing").Bar
+>f() : import("./thing").Bar
+>f : () => import("./thing").Bar
 
diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types.diff b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types.diff
index 7e85afe31e..b0eeab3672 100644
--- a/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/exportAssignedNamespaceIsVisibleInDeclarationEmit.types.diff
@@ -5,12 +5,12 @@
  === index.ts ===
  import { f } from "./thing";
 ->f : () => import("thing").Bar
-+>f : () => import("./thing.js").Bar
++>f : () => import("./thing").Bar
 
  export const thing = f();
 ->thing : import("thing").Bar
 ->f() : import("thing").Bar
 ->f : () => import("thing").Bar
-+>thing : import("./thing.js").Bar
-+>f() : import("./thing.js").Bar
-+>f : () => import("./thing.js").Bar
++>thing : import("./thing").Bar
++>f() : import("./thing").Bar
++>f : () => import("./thing").Bar
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
index 380c52036b..bebfa36125 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("./a")
+>a : typeof import("./a.js")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types.diff
index 613a56088e..409791731e 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types.diff
@@ -5,7 +5,7 @@
  === b.ts ===
  export * as a from "./a";
 ->a : typeof import("a")
-+>a : typeof import("./a")
++>a : typeof import("./a.js")
 
  === tslib.d.ts ===
  declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
index 380c52036b..bebfa36125 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("./a")
+>a : typeof import("./a.js")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types.diff
index 11331710d2..fd6d705b8a 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types.diff
@@ -5,7 +5,7 @@
  === b.ts ===
  export * as a from "./a";
 ->a : typeof import("a")
-+>a : typeof import("./a")
++>a : typeof import("./a.js")
 
  === tslib.d.ts ===
  declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types
index 380c52036b..bebfa36125 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("./a")
+>a : typeof import("./a.js")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types.diff
index b1b7e43897..3e84b73191 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2015).types.diff
@@ -5,7 +5,7 @@
  === b.ts ===
  export * as a from "./a";
 ->a : typeof import("a")
-+>a : typeof import("./a")
++>a : typeof import("./a.js")
 
  === tslib.d.ts ===
  declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types
index 380c52036b..bebfa36125 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types
@@ -6,7 +6,7 @@ export class A { }
 
 === b.ts ===
 export * as a from "./a";
->a : typeof import("./a")
+>a : typeof import("./a.js")
 
 === tslib.d.ts ===
 declare module "tslib" {
diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types.diff
index 00e8f6b8cc..7d55d7148b 100644
--- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types.diff
+++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=true,module=es2020).types.diff
@@ -5,7 +5,7 @@
  === b.ts ===
  export * as a from "./a";
 ->a : typeof import("a")
-+>a : typeof import("./a")
++>a : typeof import("./a.js")
 
  === tslib.d.ts ===
  declare module "tslib" {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember.errors.txt
index 2f4444205d..d7b0678053 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember.errors.txt
@@ -1,4 +1,4 @@
-b.ts(1,15): error TS2460: Module '"a"' declares 'bar' locally, but it is exported as 'baz'.
+b.ts(1,15): error TS2460: Module '"./a"' declares 'bar' locally, but it is exported as 'baz'.
 
 
 ==== a.ts (0 errors) ====
@@ -9,6 +9,6 @@ b.ts(1,15): error TS2460: Module '"a"' declares 'bar' locally, but it is exporte
 ==== b.ts (1 errors) ====
     import { foo, bar } from "./a";
                   ~~~
-!!! error TS2460: Module '"a"' declares 'bar' locally, but it is exported as 'baz'.
+!!! error TS2460: Module '"./a"' declares 'bar' locally, but it is exported as 'baz'.
 !!! related TS2728 a.ts:2:18: 'bar' is declared here.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importNonExportedMember.errors.txt.diff
deleted file mode 100644
index aa81ca1e1c..0000000000
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.importNonExportedMember.errors.txt
-+++ new.importNonExportedMember.errors.txt
-@@= skipped -0, +0 lines =@@
--b.ts(1,15): error TS2460: Module '"./a"' declares 'bar' locally, but it is exported as 'baz'.
-+b.ts(1,15): error TS2460: Module '"a"' declares 'bar' locally, but it is exported as 'baz'.
-
-
- ==== a.ts (0 errors) ====
-@@= skipped -8, +8 lines =@@
- ==== b.ts (1 errors) ====
-     import { foo, bar } from "./a";
-                   ~~~
--!!! error TS2460: Module '"./a"' declares 'bar' locally, but it is exported as 'baz'.
-+!!! error TS2460: Module '"a"' declares 'bar' locally, but it is exported as 'baz'.
- !!! related TS2728 a.ts:2:18: 'bar' is declared here.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember1.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember1.errors.txt
index 0a293db6d3..03036e1c88 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember1.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember1.errors.txt
@@ -1,4 +1,4 @@
-b.ts(1,10): error TS2459: Module '"a"' declares 'bar' locally, but it is not exported.
+b.ts(1,10): error TS2459: Module '"./a"' declares 'bar' locally, but it is not exported.
 
 
 ==== a.ts (0 errors) ====
@@ -9,6 +9,6 @@ b.ts(1,10): error TS2459: Module '"a"' declares 'bar' locally, but it is not exp
 ==== b.ts (1 errors) ====
     import { bar } from "./a";
              ~~~
-!!! error TS2459: Module '"a"' declares 'bar' locally, but it is not exported.
+!!! error TS2459: Module '"./a"' declares 'bar' locally, but it is not exported.
 !!! related TS2728 a.ts:2:18: 'bar' is declared here.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importNonExportedMember1.errors.txt.diff
deleted file mode 100644
index 3c2ee62203..0000000000
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember1.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.importNonExportedMember1.errors.txt
-+++ new.importNonExportedMember1.errors.txt
-@@= skipped -0, +0 lines =@@
--b.ts(1,10): error TS2459: Module '"./a"' declares 'bar' locally, but it is not exported.
-+b.ts(1,10): error TS2459: Module '"a"' declares 'bar' locally, but it is not exported.
-
-
- ==== a.ts (0 errors) ====
-@@= skipped -8, +8 lines =@@
- ==== b.ts (1 errors) ====
-     import { bar } from "./a";
-              ~~~
--!!! error TS2459: Module '"./a"' declares 'bar' locally, but it is not exported.
-+!!! error TS2459: Module '"a"' declares 'bar' locally, but it is not exported.
- !!! related TS2728 a.ts:2:18: 'bar' is declared here.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember2.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember2.errors.txt
index 5c9c070d10..84f9ea405a 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember2.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember2.errors.txt
@@ -1,4 +1,4 @@
-b.ts(1,10): error TS2459: Module '"a"' declares 'Foo' locally, but it is not exported.
+b.ts(1,10): error TS2459: Module '"./a"' declares 'Foo' locally, but it is not exported.
 
 
 ==== a.ts (0 errors) ====
@@ -8,6 +8,6 @@ b.ts(1,10): error TS2459: Module '"a"' declares 'Foo' locally, but it is not exp
 ==== b.ts (1 errors) ====
     import { Foo } from './a';
              ~~~
-!!! error TS2459: Module '"a"' declares 'Foo' locally, but it is not exported.
+!!! error TS2459: Module '"./a"' declares 'Foo' locally, but it is not exported.
 !!! related TS2728 a.ts:2:11: 'Foo' is declared here.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importNonExportedMember2.errors.txt.diff
deleted file mode 100644
index ae1a38859e..0000000000
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember2.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.importNonExportedMember2.errors.txt
-+++ new.importNonExportedMember2.errors.txt
-@@= skipped -0, +0 lines =@@
--b.ts(1,10): error TS2459: Module '"./a"' declares 'Foo' locally, but it is not exported.
-+b.ts(1,10): error TS2459: Module '"a"' declares 'Foo' locally, but it is not exported.
-
-
- ==== a.ts (0 errors) ====
-@@= skipped -7, +7 lines =@@
- ==== b.ts (1 errors) ====
-     import { Foo } from './a';
-              ~~~
--!!! error TS2459: Module '"./a"' declares 'Foo' locally, but it is not exported.
-+!!! error TS2459: Module '"a"' declares 'Foo' locally, but it is not exported.
- !!! related TS2728 a.ts:2:11: 'Foo' is declared here.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember3.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember3.errors.txt
index 5acf760737..2e1a75d6e3 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember3.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember3.errors.txt
@@ -1,4 +1,4 @@
-b.ts(1,10): error TS2459: Module '"a"' declares 'Foo' locally, but it is not exported.
+b.ts(1,10): error TS2459: Module '"./a"' declares 'Foo' locally, but it is not exported.
 
 
 ==== a.ts (0 errors) ====
@@ -10,7 +10,7 @@ b.ts(1,10): error TS2459: Module '"a"' declares 'Foo' locally, but it is not exp
 ==== b.ts (1 errors) ====
     import { Foo } from './a';
              ~~~
-!!! error TS2459: Module '"a"' declares 'Foo' locally, but it is not exported.
+!!! error TS2459: Module '"./a"' declares 'Foo' locally, but it is not exported.
 !!! related TS2728 a.ts:2:11: 'Foo' is declared here.
 !!! related TS6204 a.ts:3:11: and here.
 !!! related TS6204 a.ts:4:11: and here.
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember3.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importNonExportedMember3.errors.txt.diff
deleted file mode 100644
index 78f03c1fb6..0000000000
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember3.errors.txt.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- old.importNonExportedMember3.errors.txt
-+++ new.importNonExportedMember3.errors.txt
-@@= skipped -0, +0 lines =@@
--b.ts(1,10): error TS2459: Module '"./a"' declares 'Foo' locally, but it is not exported.
-+b.ts(1,10): error TS2459: Module '"a"' declares 'Foo' locally, but it is not exported.
-
-
- ==== a.ts (0 errors) ====
-@@= skipped -9, +9 lines =@@
- ==== b.ts (1 errors) ====
-     import { Foo } from './a';
-              ~~~
--!!! error TS2459: Module '"./a"' declares 'Foo' locally, but it is not exported.
-+!!! error TS2459: Module '"a"' declares 'Foo' locally, but it is not exported.
- !!! related TS2728 a.ts:2:11: 'Foo' is declared here.
- !!! related TS6204 a.ts:3:11: and here.
- !!! related TS6204 a.ts:4:11: and here.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt
index 730d41bdd1..d4294bc523 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt
@@ -1,4 +1,4 @@
-b.ts(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("a")' or by turning on the 'esModuleInterop' flag and using a default import.
+b.ts(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
 b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
 
 
@@ -9,6 +9,6 @@ b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imp
 ==== b.ts (2 errors) ====
     import { Foo } from './a';
              ~~~
-!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("a")' or by turning on the 'esModuleInterop' flag and using a default import.
+!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
                         ~~~~~
 !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt.diff
deleted file mode 100644
index 14989a8a0f..0000000000
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.importNonExportedMember4.errors.txt
-+++ new.importNonExportedMember4.errors.txt
-@@= skipped -0, +0 lines =@@
--b.ts(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
-+b.ts(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("a")' or by turning on the 'esModuleInterop' flag and using a default import.
- b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
-
-
-@@= skipped -8, +8 lines =@@
- ==== b.ts (2 errors) ====
-     import { Foo } from './a';
-              ~~~
--!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
-+!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("a")' or by turning on the 'esModuleInterop' flag and using a default import.
-                         ~~~~~
- !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember5.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember5.errors.txt
index cdda6b7bd9..d3b36b1411 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember5.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember5.errors.txt
@@ -1,4 +1,4 @@
-b.ts(1,10): error TS2616: 'Foo' can only be imported by using 'import Foo = require("a")' or a default import.
+b.ts(1,10): error TS2616: 'Foo' can only be imported by using 'import Foo = require("./a")' or a default import.
 b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
 
 
@@ -9,6 +9,6 @@ b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imp
 ==== b.ts (2 errors) ====
     import { Foo } from './a';
              ~~~
-!!! error TS2616: 'Foo' can only be imported by using 'import Foo = require("a")' or a default import.
+!!! error TS2616: 'Foo' can only be imported by using 'import Foo = require("./a")' or a default import.
                         ~~~~~
 !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember5.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importNonExportedMember5.errors.txt.diff
deleted file mode 100644
index 0a9d248392..0000000000
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember5.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.importNonExportedMember5.errors.txt
-+++ new.importNonExportedMember5.errors.txt
-@@= skipped -0, +0 lines =@@
--b.ts(1,10): error TS2616: 'Foo' can only be imported by using 'import Foo = require("./a")' or a default import.
-+b.ts(1,10): error TS2616: 'Foo' can only be imported by using 'import Foo = require("a")' or a default import.
- b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
-
-
-@@= skipped -8, +8 lines =@@
- ==== b.ts (2 errors) ====
-     import { Foo } from './a';
-              ~~~
--!!! error TS2616: 'Foo' can only be imported by using 'import Foo = require("./a")' or a default import.
-+!!! error TS2616: 'Foo' can only be imported by using 'import Foo = require("a")' or a default import.
-                         ~~~~~
- !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.errors.txt
index 423477ace3..5b9b99ac88 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.errors.txt
@@ -1,4 +1,4 @@
-b.js(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("a")' or by turning on the 'esModuleInterop' flag and using a default import.
+b.js(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
 b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
 
 
@@ -9,7 +9,7 @@ b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imp
 ==== b.js (2 errors) ====
     import { Foo } from './a';
              ~~~
-!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("a")' or by turning on the 'esModuleInterop' flag and using a default import.
+!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
                         ~~~~~
 !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember9.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember9.errors.txt
index 1a9f96aef1..d3719bf06e 100644
--- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember9.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/importNonExportedMember9.errors.txt
@@ -1,4 +1,4 @@
-b.js(1,10): error TS2616: 'Foo' can only be imported by using 'import Foo = require("a")' or a default import.
+b.js(1,10): error TS2616: 'Foo' can only be imported by using 'import Foo = require("./a")' or a default import.
 b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
 
 
@@ -9,6 +9,6 @@ b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imp
 ==== b.js (2 errors) ====
     import { Foo } from './a';
              ~~~
-!!! error TS2616: 'Foo' can only be imported by using 'import Foo = require("a")' or a default import.
+!!! error TS2616: 'Foo' can only be imported by using 'import Foo = require("./a")' or a default import.
                         ~~~~~
 !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types b/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types
index 0450db3126..7782f65169 100644
--- a/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types
+++ b/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types
@@ -2,10 +2,10 @@
 
 === errors.d.ts ===
 export = createHttpError;
->createHttpError : import("./errors.js").NamedConstructors
+>createHttpError : import("./errors").NamedConstructors
 
 declare const createHttpError: createHttpError.NamedConstructors;
->createHttpError : import("./errors.js").NamedConstructors
+>createHttpError : import("./errors").NamedConstructors
 >createHttpError : any
 
 declare namespace createHttpError {
diff --git a/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types.diff b/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types.diff
index 7d19ba2db6..29f7b3608a 100644
--- a/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/importPropertyFromMappedType.types.diff
@@ -5,11 +5,11 @@
  === errors.d.ts ===
  export = createHttpError;
 ->createHttpError : createHttpError.NamedConstructors
-+>createHttpError : import("./errors.js").NamedConstructors
++>createHttpError : import("./errors").NamedConstructors
 
  declare const createHttpError: createHttpError.NamedConstructors;
 ->createHttpError : createHttpError.NamedConstructors
-+>createHttpError : import("./errors.js").NamedConstructors
++>createHttpError : import("./errors").NamedConstructors
  >createHttpError : any
 
  declare namespace createHttpError {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types b/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types
index eeba328d8b..af8aee9fc3 100644
--- a/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types
+++ b/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types
@@ -13,7 +13,7 @@ export declare const theme: { a: string }
 
 === test3.ts ===
 export const a: import("./test1").T<typeof import("./test2").theme> = null as any;
->a : import("./test1.js").T<{ a: string; }>
+>a : import("./test1").T<{ a: string; }>
 >theme : any
 >null as any : any
 
diff --git a/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types.diff b/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types.diff
index c4f2859ff4..8eb3d20a37 100644
--- a/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/importUsedInGenericImportResolves.types.diff
@@ -6,6 +6,6 @@
  export const a: import("./test1").T<typeof import("./test2").theme> = null as any;
 ->a : import("test1").T<{ a: string; }>
 ->theme : error
-+>a : import("./test1.js").T<{ a: string; }>
++>a : import("./test1").T<{ a: string; }>
 +>theme : any
  >null as any : any
diff --git a/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types b/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types
index 5b5d60597b..0b4ccc78a3 100644
--- a/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types
+++ b/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types
@@ -63,9 +63,9 @@ declare const User: ObjectTypeComposer<any, any>;
 
 User.addResolver({
 >User.addResolver({  type: User, // `User as any` fix the problem}) : ObjectTypeComposer<any, any>
->User.addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose.js").Thunk<import("./graphql-compose.js").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
+>User.addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose").Thunk<import("./graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
 >User : ObjectTypeComposer<any, any>
->addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose.js").Thunk<import("./graphql-compose.js").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
+>addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose").Thunk<import("./graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
 >{  type: User, // `User as any` fix the problem} : { type: ObjectTypeComposer<any, any>; }
 
   type: User, // `User as any` fix the problem
diff --git a/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types.diff b/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types.diff
index e546c5bca9..20a9b881d9 100644
--- a/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/inferrenceInfiniteLoopWithSubtyping.types.diff
@@ -14,10 +14,10 @@
  User.addResolver({
  >User.addResolver({  type: User, // `User as any` fix the problem}) : ObjectTypeComposer<any, any>
 ->User.addResolver : <TResolverSource>(opts: { type?: import("graphql-compose").Thunk<import("graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
-+>User.addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose.js").Thunk<import("./graphql-compose.js").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
++>User.addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose").Thunk<import("./graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
  >User : ObjectTypeComposer<any, any>
 ->addResolver : <TResolverSource>(opts: { type?: import("graphql-compose").Thunk<import("graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
-+>addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose.js").Thunk<import("./graphql-compose.js").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
++>addResolver : <TResolverSource>(opts: { type?: import("./graphql-compose").Thunk<import("./graphql-compose").ComposeOutputTypeDefinition>; }) => ObjectTypeComposer<any, any>
  >{  type: User, // `User as any` fix the problem} : { type: ObjectTypeComposer<any, any>; }
 
    type: User, // `User as any` fix the problem
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types b/testdata/baselines/reference/submodule/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types
index a59861c2cd..1f3e6cf117 100644
--- a/testdata/baselines/reference/submodule/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types
+++ b/testdata/baselines/reference/submodule/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types
@@ -20,23 +20,23 @@ export declare function createNamespacedHelpers(): NamespacedMappers;
 
 === /index.js ===
 import { createNamespacedHelpers } from './helper'
->createNamespacedHelpers : () => import("./helper.js").NamespacedMappers
+>createNamespacedHelpers : () => import("./helper").NamespacedMappers
 
 const { mapState } = createNamespacedHelpers()
->mapState : import("./helper.js").Mapper<import("./helper.js").Computed>
->createNamespacedHelpers() : import("./helper.js").NamespacedMappers
->createNamespacedHelpers : () => import("./helper.js").NamespacedMappers
+>mapState : import("./helper").Mapper<import("./helper").Computed>
+>createNamespacedHelpers() : import("./helper").NamespacedMappers
+>createNamespacedHelpers : () => import("./helper").NamespacedMappers
 
 export default {
->{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("./helper.js").Computed; }; }
+>{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("./helper").Computed; }; }
 
     computed: {
->computed : { panels: import("./helper.js").Computed; }
->{        ...mapState(['panels'])    } : { panels: import("./helper.js").Computed; }
+>computed : { panels: import("./helper").Computed; }
+>{        ...mapState(['panels'])    } : { panels: import("./helper").Computed; }
 
         ...mapState(['panels'])
->mapState(['panels']) : { panels: import("./helper.js").Computed; }
->mapState : import("./helper.js").Mapper<import("./helper.js").Computed>
+>mapState(['panels']) : { panels: import("./helper").Computed; }
+>mapState : import("./helper").Mapper<import("./helper").Computed>
 >['panels'] : "panels"[]
 >'panels' : "panels"
     }
diff --git a/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.types b/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.types
index ca540fa92d..3dffd7754d 100644
--- a/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.types
+++ b/testdata/baselines/reference/submodule/compiler/jsdocReferenceGlobalTypeInCommonJs.types
@@ -18,7 +18,7 @@ Puppeteer.connect;
 
 === puppet.d.ts ===
 export as namespace Puppeteer;
->Puppeteer : typeof import("./puppet.js")
+>Puppeteer : typeof import("./puppet")
 
 export interface Keyboard {
     key: string
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types
index 2477207551..79ef7db68a 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types
@@ -19,7 +19,7 @@ const y : C = { s: '' }
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : typeof import("./index.js")
+>'.' : typeof import(".")
 
   type Row2 = { a: string }
 >Row2 : Row2
@@ -32,7 +32,7 @@ declare module '.' {
  
 === index.d.ts ===
 export type {Row2} from './common';
->Row2 : import("./common.js").Row2
+>Row2 : import("./common").Row2
  
 === common.d.ts ===
 export interface Row2 { b: string }
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types.diff
index 2a804b7668..e447b6853a 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportInterface.types.diff
@@ -9,7 +9,7 @@
  import '.'
  declare module '.' {
 ->'.' : typeof import("index")
-+>'.' : typeof import("./index.js")
++>'.' : typeof import(".")
 
    type Row2 = { a: string }
  >Row2 : Row2
@@ -21,7 +21,7 @@
 +=== index.d.ts ===
  export type {Row2} from './common';
 ->Row2 : import("common").Row2
-+>Row2 : import("./common.js").Row2
++>Row2 : import("./common").Row2
   
 -=== ./common.d.ts ===
 +=== common.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types
index f56c6dbf83..fd2dcb1525 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types
@@ -21,7 +21,7 @@ const y : C = { s: '' }
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : typeof import("./index.js")
+>'.' : typeof import(".")
 
   type Row2<T> = {}
 >Row2 : Row2<T>
@@ -33,7 +33,7 @@ declare module '.' {
 
 === index.d.ts ===
 export type {Row2} from './common';
->Row2 : import("./common.js").Row2
+>Row2 : import("./common").Row2
 
 === common.d.ts ===
 
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types.diff
index daf649c5c2..51af92f005 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolReexportedTypeAliasInstantiation.types.diff
@@ -9,7 +9,7 @@
  import '.'
  declare module '.' {
 ->'.' : typeof import("index")
-+>'.' : typeof import("./index.js")
++>'.' : typeof import(".")
 
    type Row2<T> = {}
  >Row2 : Row2<T>
@@ -21,7 +21,7 @@
 +=== index.d.ts ===
  export type {Row2} from './common';
 ->Row2 : import("common").Row2
-+>Row2 : import("./common.js").Row2
++>Row2 : import("./common").Row2
 
 -=== ./common.d.ts ===
 +=== common.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types
index 4971c85118..8487731507 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types
@@ -11,7 +11,7 @@ Row();
 === a.d.ts ===
 import '.'
 declare module '.' {
->'.' : typeof import("./index.js")
+>'.' : typeof import(".")
 
   const Row: () => void;
 >Row : () => void
diff --git a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types.diff b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types.diff
index ebf56749cf..c6a20d34d3 100644
--- a/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/mergeSymbolRexportFunction.types.diff
@@ -9,7 +9,7 @@
  import '.'
  declare module '.' {
 ->'.' : typeof import("index")
-+>'.' : typeof import("./index.js")
++>'.' : typeof import(".")
 
    const Row: () => void;
  >Row : () => void
diff --git a/testdata/baselines/reference/submodule/compiler/missingMemberErrorHasShortPath.errors.txt b/testdata/baselines/reference/submodule/compiler/missingMemberErrorHasShortPath.errors.txt
index 3ac0c65b3d..963c5d9c8c 100644
--- a/testdata/baselines/reference/submodule/compiler/missingMemberErrorHasShortPath.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/missingMemberErrorHasShortPath.errors.txt
@@ -1,4 +1,4 @@
-C:/foo/bar/Baz/src/sample.ts(1,10): error TS2724: '"C:/foo/bar/Baz/src/utils"' has no exported member named 'exit'. Did you mean 'exist'?
+C:/foo/bar/Baz/src/sample.ts(1,10): error TS2724: '"./utils.js"' has no exported member named 'exit'. Did you mean 'exist'?
 
 
 ==== C:/foo/bar/Baz/src/utils.ts (0 errors) ====
@@ -6,7 +6,7 @@ C:/foo/bar/Baz/src/sample.ts(1,10): error TS2724: '"C:/foo/bar/Baz/src/utils"' h
 ==== C:/foo/bar/Baz/src/sample.ts (1 errors) ====
     import { exit } from "./utils.js";
              ~~~~
-!!! error TS2724: '"C:/foo/bar/Baz/src/utils"' has no exported member named 'exit'. Did you mean 'exist'?
+!!! error TS2724: '"./utils.js"' has no exported member named 'exit'. Did you mean 'exist'?
 !!! related TS2728 C:/foo/bar/Baz/src/utils.ts:1:17: 'exist' is declared here.
     
     exit()
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/missingMemberErrorHasShortPath.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/missingMemberErrorHasShortPath.errors.txt.diff
deleted file mode 100644
index e5bf555036..0000000000
--- a/testdata/baselines/reference/submodule/compiler/missingMemberErrorHasShortPath.errors.txt.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- old.missingMemberErrorHasShortPath.errors.txt
-+++ new.missingMemberErrorHasShortPath.errors.txt
-@@= skipped -0, +0 lines =@@
--C:/foo/bar/Baz/src/sample.ts(1,10): error TS2724: '"./utils.js"' has no exported member named 'exit'. Did you mean 'exist'?
-+C:/foo/bar/Baz/src/sample.ts(1,10): error TS2724: '"C:/foo/bar/Baz/src/utils"' has no exported member named 'exit'. Did you mean 'exist'?
-
-
- ==== C:/foo/bar/Baz/src/utils.ts (0 errors) ====
-@@= skipped -5, +5 lines =@@
- ==== C:/foo/bar/Baz/src/sample.ts (1 errors) ====
-     import { exit } from "./utils.js";
-              ~~~~
--!!! error TS2724: '"./utils.js"' has no exported member named 'exit'. Did you mean 'exist'?
-+!!! error TS2724: '"C:/foo/bar/Baz/src/utils"' has no exported member named 'exit'. Did you mean 'exist'?
- !!! related TS2728 C:/foo/bar/Baz/src/utils.ts:1:17: 'exist' is declared here.
-     
-     exit()
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationWithNonExistentNamedImport.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleAugmentationWithNonExistentNamedImport.errors.txt
index 9efda8ea8a..9bf24f4876 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationWithNonExistentNamedImport.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationWithNonExistentNamedImport.errors.txt
@@ -1,4 +1,4 @@
-bar.d.ts(1,10): error TS2305: Module '"foo"' has no exported member 'Bar'.
+bar.d.ts(1,10): error TS2305: Module '"./foo"' has no exported member 'Bar'.
 
 
 ==== foo.d.ts (0 errors) ====
@@ -16,6 +16,6 @@ bar.d.ts(1,10): error TS2305: Module '"foo"' has no exported member 'Bar'.
 ==== bar.d.ts (1 errors) ====
     import { Bar } from './foo';
              ~~~
-!!! error TS2305: Module '"foo"' has no exported member 'Bar'.
+!!! error TS2305: Module '"./foo"' has no exported member 'Bar'.
     export = Bar;
     export as namespace Bar;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationWithNonExistentNamedImport.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationWithNonExistentNamedImport.errors.txt.diff
deleted file mode 100644
index d8ff2a1f2e..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationWithNonExistentNamedImport.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.moduleAugmentationWithNonExistentNamedImport.errors.txt
-+++ new.moduleAugmentationWithNonExistentNamedImport.errors.txt
-@@= skipped -0, +0 lines =@@
--bar.d.ts(1,10): error TS2305: Module '"./foo"' has no exported member 'Bar'.
-+bar.d.ts(1,10): error TS2305: Module '"foo"' has no exported member 'Bar'.
-
-
- ==== foo.d.ts (0 errors) ====
-@@= skipped -15, +15 lines =@@
- ==== bar.d.ts (1 errors) ====
-     import { Bar } from './foo';
-              ~~~
--!!! error TS2305: Module '"./foo"' has no exported member 'Bar'.
-+!!! error TS2305: Module '"foo"' has no exported member 'Bar'.
-     export = Bar;
-     export as namespace Bar;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleMemberMissingErrorIsRelative.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleMemberMissingErrorIsRelative.errors.txt
index 484d8c54b6..484878a5ad 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleMemberMissingErrorIsRelative.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/moduleMemberMissingErrorIsRelative.errors.txt
@@ -1,4 +1,4 @@
-folder/bar.ts(1,9): error TS2305: Module '"folder/foo"' has no exported member 'nosuch'.
+folder/bar.ts(1,9): error TS2305: Module '"./foo"' has no exported member 'nosuch'.
 
 
 ==== folder/foo.ts (0 errors) ====
@@ -6,4 +6,4 @@ folder/bar.ts(1,9): error TS2305: Module '"folder/foo"' has no exported member '
 ==== folder/bar.ts (1 errors) ====
     import {nosuch} from './foo';
             ~~~~~~
-!!! error TS2305: Module '"folder/foo"' has no exported member 'nosuch'.
\ No newline at end of file
+!!! error TS2305: Module '"./foo"' has no exported member 'nosuch'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleMemberMissingErrorIsRelative.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleMemberMissingErrorIsRelative.errors.txt.diff
deleted file mode 100644
index da701c439f..0000000000
--- a/testdata/baselines/reference/submodule/compiler/moduleMemberMissingErrorIsRelative.errors.txt.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.moduleMemberMissingErrorIsRelative.errors.txt
-+++ new.moduleMemberMissingErrorIsRelative.errors.txt
-@@= skipped -0, +0 lines =@@
--folder/bar.ts(1,9): error TS2305: Module '"./foo"' has no exported member 'nosuch'.
-+folder/bar.ts(1,9): error TS2305: Module '"folder/foo"' has no exported member 'nosuch'.
-
-
- ==== folder/foo.ts (0 errors) ====
-@@= skipped -5, +5 lines =@@
- ==== folder/bar.ts (1 errors) ====
-     import {nosuch} from './foo';
-             ~~~~~~
--!!! error TS2305: Module '"./foo"' has no exported member 'nosuch'.
-+!!! error TS2305: Module '"folder/foo"' has no exported member 'nosuch'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
index 2dcd718b40..41e538c8b6 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types
@@ -5,7 +5,7 @@ import * as t from "anotherLib"; // Include the lib that recursively includes op
 >t : typeof t
 
 import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder
->makeSharedOption : () => import("@shared/lib/app.js").SharedOption
+>makeSharedOption : () => import("@shared/lib/app").SharedOption
 
 === /shared/node_modules/troublesome-lib/lib/Option.d.ts ===
 export class Option {
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types.diff
index c52ed431c7..3164671693 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types.diff
@@ -5,7 +5,7 @@
 
  import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder
 ->makeSharedOption : () => import("/shared/lib/app").SharedOption
-+>makeSharedOption : () => import("@shared/lib/app.js").SharedOption
++>makeSharedOption : () => import("@shared/lib/app").SharedOption
 
  === /shared/node_modules/troublesome-lib/lib/Option.d.ts ===
  export class Option {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt
index b50816d804..91b22417d6 100644
--- a/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt
@@ -1,10 +1,10 @@
-/src/index.ts(1,10): error TS2305: Module '"/node_modules/foo/index"' has no exported member 'y'.
+/src/index.ts(1,10): error TS2305: Module '"foo"' has no exported member 'y'.
 
 
 ==== /src/index.ts (1 errors) ====
     import { y } from "../node_modules/foo";
              ~
-!!! error TS2305: Module '"/node_modules/foo/index"' has no exported member 'y'.
+!!! error TS2305: Module '"foo"' has no exported member 'y'.
     
 ==== /node_modules/foo/index.js (0 errors) ====
     exports.x = 0;
diff --git a/testdata/baselines/reference/submodule/compiler/namedImportNonExistentName.errors.txt b/testdata/baselines/reference/submodule/compiler/namedImportNonExistentName.errors.txt
index df2b81ef34..76e60a085e 100644
--- a/testdata/baselines/reference/submodule/compiler/namedImportNonExistentName.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/namedImportNonExistentName.errors.txt
@@ -1,9 +1,9 @@
-bar.ts(1,10): error TS2305: Module '"foo"' has no exported member 'Bar'.
-bar.ts(1,15): error TS2305: Module '"foo"' has no exported member 'toString'.
-bar.ts(3,10): error TS2305: Module '"foo2"' has no exported member 'a'.
-bar.ts(3,13): error TS2305: Module '"foo2"' has no exported member 'b'.
-bar.ts(3,19): error TS2305: Module '"foo2"' has no exported member 'd'.
-bar.ts(3,22): error TS2305: Module '"foo2"' has no exported member 'toString'.
+bar.ts(1,10): error TS2305: Module '"./foo"' has no exported member 'Bar'.
+bar.ts(1,15): error TS2305: Module '"./foo"' has no exported member 'toString'.
+bar.ts(3,10): error TS2305: Module '"./foo2"' has no exported member 'a'.
+bar.ts(3,13): error TS2305: Module '"./foo2"' has no exported member 'b'.
+bar.ts(3,19): error TS2305: Module '"./foo2"' has no exported member 'd'.
+bar.ts(3,22): error TS2305: Module '"./foo2"' has no exported member 'toString'.
 
 
 ==== foo.d.ts (0 errors) ====
@@ -21,17 +21,17 @@ bar.ts(3,22): error TS2305: Module '"foo2"' has no exported member 'toString'.
 ==== bar.ts (6 errors) ====
     import { Bar, toString, foo } from './foo';
              ~~~
-!!! error TS2305: Module '"foo"' has no exported member 'Bar'.
+!!! error TS2305: Module '"./foo"' has no exported member 'Bar'.
                   ~~~~~~~~
-!!! error TS2305: Module '"foo"' has no exported member 'toString'.
+!!! error TS2305: Module '"./foo"' has no exported member 'toString'.
     foo();
     import { a, b, c, d, toString as foo2String } from './foo2';
              ~
-!!! error TS2305: Module '"foo2"' has no exported member 'a'.
+!!! error TS2305: Module '"./foo2"' has no exported member 'a'.
                 ~
-!!! error TS2305: Module '"foo2"' has no exported member 'b'.
+!!! error TS2305: Module '"./foo2"' has no exported member 'b'.
                       ~
-!!! error TS2305: Module '"foo2"' has no exported member 'd'.
+!!! error TS2305: Module '"./foo2"' has no exported member 'd'.
                          ~~~~~~~~
-!!! error TS2305: Module '"foo2"' has no exported member 'toString'.
+!!! error TS2305: Module '"./foo2"' has no exported member 'toString'.
     c;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/namedImportNonExistentName.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/namedImportNonExistentName.errors.txt.diff
deleted file mode 100644
index 63ba6d36fc..0000000000
--- a/testdata/baselines/reference/submodule/compiler/namedImportNonExistentName.errors.txt.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- old.namedImportNonExistentName.errors.txt
-+++ new.namedImportNonExistentName.errors.txt
-@@= skipped -0, +0 lines =@@
--bar.ts(1,10): error TS2305: Module '"./foo"' has no exported member 'Bar'.
--bar.ts(1,15): error TS2305: Module '"./foo"' has no exported member 'toString'.
--bar.ts(3,10): error TS2305: Module '"./foo2"' has no exported member 'a'.
--bar.ts(3,13): error TS2305: Module '"./foo2"' has no exported member 'b'.
--bar.ts(3,19): error TS2305: Module '"./foo2"' has no exported member 'd'.
--bar.ts(3,22): error TS2305: Module '"./foo2"' has no exported member 'toString'.
-+bar.ts(1,10): error TS2305: Module '"foo"' has no exported member 'Bar'.
-+bar.ts(1,15): error TS2305: Module '"foo"' has no exported member 'toString'.
-+bar.ts(3,10): error TS2305: Module '"foo2"' has no exported member 'a'.
-+bar.ts(3,13): error TS2305: Module '"foo2"' has no exported member 'b'.
-+bar.ts(3,19): error TS2305: Module '"foo2"' has no exported member 'd'.
-+bar.ts(3,22): error TS2305: Module '"foo2"' has no exported member 'toString'.
-
-
- ==== foo.d.ts (0 errors) ====
-@@= skipped -20, +20 lines =@@
- ==== bar.ts (6 errors) ====
-     import { Bar, toString, foo } from './foo';
-              ~~~
--!!! error TS2305: Module '"./foo"' has no exported member 'Bar'.
-+!!! error TS2305: Module '"foo"' has no exported member 'Bar'.
-                   ~~~~~~~~
--!!! error TS2305: Module '"./foo"' has no exported member 'toString'.
-+!!! error TS2305: Module '"foo"' has no exported member 'toString'.
-     foo();
-     import { a, b, c, d, toString as foo2String } from './foo2';
-              ~
--!!! error TS2305: Module '"./foo2"' has no exported member 'a'.
-+!!! error TS2305: Module '"foo2"' has no exported member 'a'.
-                 ~
--!!! error TS2305: Module '"./foo2"' has no exported member 'b'.
-+!!! error TS2305: Module '"foo2"' has no exported member 'b'.
-                       ~
--!!! error TS2305: Module '"./foo2"' has no exported member 'd'.
-+!!! error TS2305: Module '"foo2"' has no exported member 'd'.
-                          ~~~~~~~~
--!!! error TS2305: Module '"./foo2"' has no exported member 'toString'.
-+!!! error TS2305: Module '"foo2"' has no exported member 'toString'.
-     c;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types b/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types
index 201adac4f1..535abea1c8 100644
--- a/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types
+++ b/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types
@@ -18,16 +18,16 @@ declare namespace Foo {
 }
 
 declare function Foo(opts?: Foo.Whatever): void;
->Foo : { (opts?: import("./file.js").Whatever): void; (cb: Function, opts?: import("./file.js").Whatever): void; }
->opts : import("./file.js").Whatever
+>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
+>opts : import("./file").Whatever
 >Foo : any
 
 declare function Foo(cb: Function, opts?: Foo.Whatever): void;
->Foo : { (opts?: import("./file.js").Whatever): void; (cb: Function, opts?: import("./file.js").Whatever): void; }
+>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
 >cb : Function
->opts : import("./file.js").Whatever
+>opts : import("./file").Whatever
 >Foo : any
 
 export = Foo;
->Foo : { (opts?: import("./file.js").Whatever): void; (cb: Function, opts?: import("./file.js").Whatever): void; }
+>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
 
diff --git a/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types.diff b/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types.diff
index 7e6177df30..60884aaa44 100644
--- a/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/namespaceMergedWithFunctionWithOverloadsUsage.types.diff
@@ -6,18 +6,18 @@
  declare function Foo(opts?: Foo.Whatever): void;
 ->Foo : { (opts?: Foo.Whatever): void; (cb: Function, opts?: Foo.Whatever): void; }
 ->opts : Foo.Whatever
-+>Foo : { (opts?: import("./file.js").Whatever): void; (cb: Function, opts?: import("./file.js").Whatever): void; }
-+>opts : import("./file.js").Whatever
++>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
++>opts : import("./file").Whatever
  >Foo : any
 
  declare function Foo(cb: Function, opts?: Foo.Whatever): void;
 ->Foo : { (opts?: Foo.Whatever): void; (cb: Function, opts?: Foo.Whatever): void; }
-+>Foo : { (opts?: import("./file.js").Whatever): void; (cb: Function, opts?: import("./file.js").Whatever): void; }
++>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
  >cb : Function
 ->opts : Foo.Whatever
-+>opts : import("./file.js").Whatever
++>opts : import("./file").Whatever
  >Foo : any
 
  export = Foo;
 ->Foo : { (opts?: Foo.Whatever): void; (cb: Function, opts?: Foo.Whatever): void; }
-+>Foo : { (opts?: import("./file.js").Whatever): void; (cb: Function, opts?: import("./file.js").Whatever): void; }
++>Foo : { (opts?: import("./file").Whatever): void; (cb: Function, opts?: import("./file").Whatever): void; }
diff --git a/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types b/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types
index b7fa87c6bb..9427b0b615 100644
--- a/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types
+++ b/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types
@@ -2,7 +2,7 @@
 
 === /other.d.ts ===
 export as namespace SomeInterface;
->SomeInterface : typeof import("./other.js")
+>SomeInterface : typeof import("./other")
 
 export type Action = "PUSH" | "POP" | "REPLACE";
 >Action : Action
@@ -13,5 +13,5 @@ interface SomeInterface {
 >length : number
 }
 declare const value: SomeInterface;
->value : import("./other.js")
+>value : import("./other")
 
diff --git a/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types.diff b/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types.diff
index 97aee27627..86e4da1609 100644
--- a/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/noCrashUMDMergedWithGlobalValue.types.diff
@@ -5,7 +5,7 @@
  === /other.d.ts ===
  export as namespace SomeInterface;
 ->SomeInterface : typeof import("/other")
-+>SomeInterface : typeof import("./other.js")
++>SomeInterface : typeof import("./other")
 
  export type Action = "PUSH" | "POP" | "REPLACE";
  >Action : Action
@@ -14,4 +14,4 @@
  }
  declare const value: SomeInterface;
 ->value : import("/other")
-+>value : import("./other.js")
++>value : import("./other")
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
index 2b50fc21a1..95aadfc21a 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types
@@ -14,7 +14,7 @@ export type LocalInterface =
 
     & import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface;
 >import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface : any
->import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import.js"); }>
+>import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{ assert: {1234, "resolution-mode": "import"} } : { assert: { 1234: any; "resolution-mode": string; }; }
 >assert : { 1234: any; "resolution-mode": string; }
diff --git a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
index c4eb232132..efaaa05a3c 100644
--- a/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/parseAssertEntriesError.types.diff
@@ -5,7 +5,7 @@
      & import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface;
  >import("pkg", { assert: {1234, "resolution-mode": "import"} }).ImportInterface : any
 ->import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import.js"); }>
++>import("pkg", { assert: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >{ assert: {1234, "resolution-mode": "import"} } : { assert: { 1234: any; "resolution-mode": string; }; }
  >assert : { 1234: any; "resolution-mode": string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
index 52d766efc9..6922d4224c 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types
@@ -14,7 +14,7 @@ export type LocalInterface =
 
     & import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface;
 >import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface : any
->import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import.js"); }>
+>import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{ with: {1234, "resolution-mode": "import"} } : { with: { 1234: any; "resolution-mode": string; }; }
 >with : { 1234: any; "resolution-mode": string; }
diff --git a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
index ca71438d95..05611d7b67 100644
--- a/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/parseImportAttributesError.types.diff
@@ -5,7 +5,7 @@
      & import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface;
  >import("pkg", { with: {1234, "resolution-mode": "import"} }).ImportInterface : any
 ->import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import.js"); }>
++>import("pkg", { with: {1234, "resolution-mode": "import"} }) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >{ with: {1234, "resolution-mode": "import"} } : { with: { 1234: any; "resolution-mode": string; }; }
  >with : { 1234: any; "resolution-mode": string; }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reactImportDropped.types b/testdata/baselines/reference/submodule/compiler/reactImportDropped.types
index 2ab74ded6d..13f16f7676 100644
--- a/testdata/baselines/reference/submodule/compiler/reactImportDropped.types
+++ b/testdata/baselines/reference/submodule/compiler/reactImportDropped.types
@@ -31,10 +31,10 @@ declare global {
 
 === src/components/TabBar.js ===
 export default React.createClass({
->React.createClass({  render() {    return (      null    );  }}) : import("../../react.js").ClassicComponentClass
->React.createClass : (spec: any) => import("../../react.js").ClassicComponentClass
->React : typeof import("../../react.js")
->createClass : (spec: any) => import("../../react.js").ClassicComponentClass
+>React.createClass({  render() {    return (      null    );  }}) : import("../../react").ClassicComponentClass
+>React.createClass : (spec: any) => import("../../react").ClassicComponentClass
+>React : typeof import("../../react")
+>createClass : (spec: any) => import("../../react").ClassicComponentClass
 >{  render() {    return (      null    );  }} : { render(): any; }
 
   render() {
@@ -58,7 +58,7 @@ import {layout} from '../../utils/theme'; // <- DO NOT DROP this import
 const x = <TabBar height={layout.footerHeight} />;
 >x : any
 ><TabBar height={layout.footerHeight} /> : any
->TabBar : import("../../../react.js").ClassicComponentClass
+>TabBar : import("../../../react").ClassicComponentClass
 >height : any
 >layout.footerHeight : any
 >layout : any
diff --git a/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types b/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types
index ac0e6f3a2f..e8c31c60d6 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types
+++ b/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types
@@ -6,7 +6,7 @@ export default class Schema {}
 
 === reexporter.d.ts ===
 export { default } from "./schema";
->default : typeof import("./schema.js").default
+>default : typeof import("./schema").default
 
 === usage.ts ===
 import Base from "./reexporter";
diff --git a/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types.diff b/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types.diff
index 5eb8bc6186..df42627adf 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/reexportDefaultIsCallable.types.diff
@@ -5,7 +5,7 @@
  === reexporter.d.ts ===
  export { default } from "./schema";
 ->default : typeof import("schema").default
-+>default : typeof import("./schema.js").default
++>default : typeof import("./schema").default
 
  === usage.ts ===
  import Base from "./reexporter";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.errors.txt b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.errors.txt
index e7c9b50a9b..91637fa1f7 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.errors.txt
@@ -1,4 +1,4 @@
-a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
+a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
 ==== b.ts (0 errors) ====
@@ -8,4 +8,4 @@ a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
     export { b } from "./b";
     export { default } from "./b";
              ~~~~~~~
-!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
+!!! error TS2305: Module '"./b"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.errors.txt.diff
deleted file mode 100644
index d2a28cb84c..0000000000
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.errors.txt.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.reexportMissingDefault.errors.txt
-+++ new.reexportMissingDefault.errors.txt
-@@= skipped -0, +0 lines =@@
--a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
-+a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
-
-
- ==== b.ts (0 errors) ====
-@@= skipped -7, +7 lines =@@
-     export { b } from "./b";
-     export { default } from "./b";
-              ~~~~~~~
--!!! error TS2305: Module '"./b"' has no exported member 'default'.
-+!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault1.errors.txt b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault1.errors.txt
index f9a9b4b4ac..dfee891aa4 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault1.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault1.errors.txt
@@ -1,4 +1,4 @@
-a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
+a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
 ==== b.ts (0 errors) ====
@@ -8,5 +8,5 @@ a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
     export { b } from "./b";
     export { default } from "./b";
              ~~~~~~~
-!!! error TS2305: Module '"b"' has no exported member 'default'.
+!!! error TS2305: Module '"./b"' has no exported member 'default'.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault1.errors.txt.diff
deleted file mode 100644
index a026b76f0c..0000000000
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault1.errors.txt.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.reexportMissingDefault1.errors.txt
-+++ new.reexportMissingDefault1.errors.txt
-@@= skipped -0, +0 lines =@@
--a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
-+a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
-
-
- ==== b.ts (0 errors) ====
-@@= skipped -7, +7 lines =@@
-     export { b } from "./b";
-     export { default } from "./b";
-              ~~~~~~~
--!!! error TS2305: Module '"./b"' has no exported member 'default'.
-+!!! error TS2305: Module '"b"' has no exported member 'default'.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.errors.txt b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.errors.txt
index e7c9b50a9b..91637fa1f7 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.errors.txt
@@ -1,4 +1,4 @@
-a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
+a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
 ==== b.ts (0 errors) ====
@@ -8,4 +8,4 @@ a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
     export { b } from "./b";
     export { default } from "./b";
              ~~~~~~~
-!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
+!!! error TS2305: Module '"./b"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.errors.txt.diff
deleted file mode 100644
index 005cd66a79..0000000000
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.errors.txt.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.reexportMissingDefault2.errors.txt
-+++ new.reexportMissingDefault2.errors.txt
-@@= skipped -0, +0 lines =@@
--a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
-+a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
-
-
- ==== b.ts (0 errors) ====
-@@= skipped -7, +7 lines =@@
-     export { b } from "./b";
-     export { default } from "./b";
-              ~~~~~~~
--!!! error TS2305: Module '"./b"' has no exported member 'default'.
-+!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.errors.txt b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.errors.txt
index 0c97a443a7..b7965fa1eb 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.errors.txt
@@ -1,4 +1,4 @@
-a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
+a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
 ==== b.ts (0 errors) ====
@@ -8,4 +8,4 @@ a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
     export { b } from "./b";
     export { default as a } from "./b";
              ~~~~~~~
-!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
+!!! error TS2305: Module '"./b"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.errors.txt.diff
deleted file mode 100644
index dd7210b791..0000000000
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.errors.txt.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.reexportMissingDefault3.errors.txt
-+++ new.reexportMissingDefault3.errors.txt
-@@= skipped -0, +0 lines =@@
--a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
-+a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
-
-
- ==== b.ts (0 errors) ====
-@@= skipped -7, +7 lines =@@
-     export { b } from "./b";
-     export { default as a } from "./b";
-              ~~~~~~~
--!!! error TS2305: Module '"./b"' has no exported member 'default'.
-+!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types
index 67745b9abe..9912858142 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types
@@ -12,5 +12,5 @@ export { b } from "./b";
 >b : number
 
 export { default } from "./b";
->default : typeof import("./b.js")
+>default : typeof import("./b")
 
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types.diff
index 7f1ed25a38..3bb807cc7b 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.types.diff
@@ -5,4 +5,4 @@
 
  export { default } from "./b";
 ->default : any
-+>default : typeof import("./b.js")
++>default : typeof import("./b")
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault5.types b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault5.types
index 7444f1c4f4..d7404bc6a6 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault5.types
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault5.types
@@ -12,6 +12,6 @@ export { b } from "./b";
 >b : number
 
 export { default as Foo } from "./b";
->default : typeof import("./b.js")
->Foo : typeof import("./b.js")
+>default : typeof import("./b")
+>Foo : typeof import("./b")
 
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault5.types.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault5.types.diff
index ae86a6cff1..b505a00413 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault5.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault5.types.diff
@@ -6,5 +6,5 @@
  export { default as Foo } from "./b";
 ->default : typeof import("b")
 ->Foo : typeof import("b")
-+>default : typeof import("./b.js")
-+>Foo : typeof import("./b.js")
++>default : typeof import("./b")
++>Foo : typeof import("./b")
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.errors.txt b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.errors.txt
index e7c9b50a9b..91637fa1f7 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.errors.txt
@@ -1,4 +1,4 @@
-a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
+a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
 ==== b.ts (0 errors) ====
@@ -8,4 +8,4 @@ a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
     export { b } from "./b";
     export { default } from "./b";
              ~~~~~~~
-!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
+!!! error TS2305: Module '"./b"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.errors.txt.diff
deleted file mode 100644
index e84d5d2876..0000000000
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.errors.txt.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- old.reexportMissingDefault6.errors.txt
-+++ new.reexportMissingDefault6.errors.txt
-@@= skipped -0, +0 lines =@@
--a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
-+a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
-
-
- ==== b.ts (0 errors) ====
-@@= skipped -7, +7 lines =@@
-     export { b } from "./b";
-     export { default } from "./b";
-              ~~~~~~~
--!!! error TS2305: Module '"./b"' has no exported member 'default'.
-+!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault7.errors.txt b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault7.errors.txt
index e7c9b50a9b..cbce13f5eb 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault7.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault7.errors.txt
@@ -1,4 +1,4 @@
-a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
+a.ts(2,10): error TS2305: Module '"./b.js"' has no exported member 'default'.
 
 
 ==== b.ts (0 errors) ====
@@ -8,4 +8,4 @@ a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
     export { b } from "./b";
     export { default } from "./b";
              ~~~~~~~
-!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
+!!! error TS2305: Module '"./b.js"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault7.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault7.errors.txt.diff
index db76fbfe41..e2d095b0b2 100644
--- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault7.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault7.errors.txt.diff
@@ -2,7 +2,7 @@
 +++ new.reexportMissingDefault7.errors.txt
 @@= skipped -0, +0 lines =@@
 -a.ts(2,10): error TS2305: Module '"./b"' has no exported member 'default'.
-+a.ts(2,10): error TS2305: Module '"b"' has no exported member 'default'.
++a.ts(2,10): error TS2305: Module '"./b.js"' has no exported member 'default'.
 
 
  ==== b.ts (0 errors) ====
@@ -11,4 +11,4 @@
      export { default } from "./b";
               ~~~~~~~
 -!!! error TS2305: Module '"./b"' has no exported member 'default'.
-+!!! error TS2305: Module '"b"' has no exported member 'default'.
\ No newline at end of file
++!!! error TS2305: Module '"./b.js"' has no exported member 'default'.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.errors.txt b/testdata/baselines/reference/submodule/compiler/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.errors.txt
index 510813aadc..0af10fbba6 100644
--- a/testdata/baselines/reference/submodule/compiler/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.errors.txt
@@ -1,5 +1,5 @@
 /contractHelper.d.ts(3,67): error TS2694: Namespace '"/types"' has no exported member 'ParamStateRecord'.
-/exported.d.ts(2,10): error TS2305: Module '"/types"' has no exported member 'ParamStateRecord'.
+/exported.d.ts(2,10): error TS2305: Module '"./types.js"' has no exported member 'ParamStateRecord'.
 
 
 ==== /contractHelper.d.ts (1 errors) ====
@@ -15,7 +15,7 @@
     type _ERef<T> = T | Promise<T>;
     import { ParamStateRecord as _ParamStateRecord } from './types.js';
              ~~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/types"' has no exported member 'ParamStateRecord'.
+!!! error TS2305: Module '"./types.js"' has no exported member 'ParamStateRecord'.
     declare global {
       // @ts-ignore TS2666
       export {
diff --git a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
index f15f65a56d..1baf44e028 100644
--- a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
+++ b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
@@ -17,9 +17,9 @@ import { BindingKey } from '@loopback/context';
 export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any); // line in question
 >CONTROLLER_CLASS : BindingKey<ControllerClass>
 >BindingKey.create<ControllerClass>(null as any) : BindingKey<ControllerClass>
->BindingKey.create : <T extends import("../../context/index.js").Constructor<any>>(ctor: T) => BindingKey<T>
+>BindingKey.create : <T extends import("../../context").Constructor<any>>(ctor: T) => BindingKey<T>
 >BindingKey : typeof BindingKey
->create : <T extends import("../../context/index.js").Constructor<any>>(ctor: T) => BindingKey<T>
+>create : <T extends import("../../context").Constructor<any>>(ctor: T) => BindingKey<T>
 >null as any : any
 
 === /monorepo/context/src/value-promise.d.ts ===
diff --git a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types.diff b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types.diff
index a5cbf9a2de..4ff9e5e88c 100644
--- a/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types.diff
@@ -5,10 +5,10 @@
  >CONTROLLER_CLASS : BindingKey<ControllerClass>
  >BindingKey.create<ControllerClass>(null as any) : BindingKey<ControllerClass>
 ->BindingKey.create : <T extends import("/monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
-+>BindingKey.create : <T extends import("../../context/index.js").Constructor<any>>(ctor: T) => BindingKey<T>
++>BindingKey.create : <T extends import("../../context").Constructor<any>>(ctor: T) => BindingKey<T>
  >BindingKey : typeof BindingKey
 ->create : <T extends import("/monorepo/context/index").Constructor<any>>(ctor: T) => BindingKey<T>
-+>create : <T extends import("../../context/index.js").Constructor<any>>(ctor: T) => BindingKey<T>
++>create : <T extends import("../../context").Constructor<any>>(ctor: T) => BindingKey<T>
  >null as any : any
 
  === /monorepo/context/src/value-promise.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
index 8e04823117..2aadbe915d 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
@@ -40,7 +40,6 @@ import * as pkg from "package-b";
 export const a = pkg.invoke();
 
 //// [index.js]
-<<<<<<< HEAD
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -69,14 +68,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
 const pkg = __importStar(require("package-b"));
 exports.a = pkg.invoke();
-||||||| 2303c3a6e
-import * as pkg from "package-b";
-export const a = pkg.invoke();
-=======
-import * as pkg from "package-b";
-export const a = pkg.invoke();
 
 
 //// [index.d.ts]
-export declare const a: import("../packageA/foo.js").Foo;
->>>>>>> main
+export declare const a: import("../packageA/foo").Foo;
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js.diff
index 419ad92960..8a81c9bff9 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js.diff
@@ -1,91 +1,8 @@
 --- old.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
 +++ new.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.js
-<<<<<<< HEAD
-@@= skipped -67, +67 lines =@@
- exports.a = void 0;
- const pkg = __importStar(require("package-b"));
- exports.a = pkg.invoke();
--
--
--//// [index.d.ts]
--export declare const a: import("package-a/cls").Foo;
-||||||| 2303c3a6e
-@@= skipped -39, +39 lines =@@
- export const a = pkg.invoke();
- 
- //// [index.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.a = void 0;
--const pkg = __importStar(require("package-b"));
--exports.a = pkg.invoke();
--
--
--//// [index.d.ts]
--export declare const a: import("package-a/cls").Foo;
-+import * as pkg from "package-b";
-+export const a = pkg.invoke();
-=======
-@@= skipped -39, +39 lines =@@
- export const a = pkg.invoke();
-
- //// [index.js]
--"use strict";
--var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    var desc = Object.getOwnPropertyDescriptor(m, k);
--    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
--      desc = { enumerable: true, get: function() { return m[k]; } };
--    }
--    Object.defineProperty(o, k2, desc);
--}) : (function(o, m, k, k2) {
--    if (k2 === undefined) k2 = k;
--    o[k2] = m[k];
--}));
--var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
--    Object.defineProperty(o, "default", { enumerable: true, value: v });
--}) : function(o, v) {
--    o["default"] = v;
--});
--var __importStar = (this && this.__importStar) || function (mod) {
--    if (mod && mod.__esModule) return mod;
--    var result = {};
--    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
--    __setModuleDefault(result, mod);
--    return result;
--};
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.a = void 0;
--const pkg = __importStar(require("package-b"));
--exports.a = pkg.invoke();
-+import * as pkg from "package-b";
-+export const a = pkg.invoke();
+@@= skipped -70, +70 lines =@@
 
 
  //// [index.d.ts]
 -export declare const a: import("package-a/cls").Foo;
-+export declare const a: import("../packageA/foo.js").Foo;
->>>>>>> main
++export declare const a: import("../packageA/foo").Foo;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types
index bdf49a85ad..bbfae6a192 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types
@@ -16,20 +16,20 @@ export function create(): Foo;
 
 === workspace/packageB/index.d.ts ===
 import { create } from "package-a";
->create : () => import("../packageA/foo.js").Foo
+>create : () => import("../packageA/foo").Foo
 
 export declare function invoke(): ReturnType<typeof create>;
->invoke : () => import("../packageA/foo.js").Foo
->create : () => import("../packageA/foo.js").Foo
+>invoke : () => import("../packageA/foo").Foo
+>create : () => import("../packageA/foo").Foo
 
 === workspace/packageC/index.ts ===
 import * as pkg from "package-b";
 >pkg : typeof pkg
 
 export const a = pkg.invoke();
->a : import("../packageA/foo.js").Foo
->pkg.invoke() : import("../packageA/foo.js").Foo
->pkg.invoke : () => import("../packageA/foo.js").Foo
+>a : import("../packageA/foo").Foo
+>pkg.invoke() : import("../packageA/foo").Foo
+>pkg.invoke : () => import("../packageA/foo").Foo
 >pkg : typeof pkg
->invoke : () => import("../packageA/foo.js").Foo
+>invoke : () => import("../packageA/foo").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types.diff
index c239cf3d54..daf072ef1e 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesDeepNonrelativeName.types.diff
@@ -5,13 +5,13 @@
  === workspace/packageB/index.d.ts ===
  import { create } from "package-a";
 ->create : () => import("workspace/packageA/foo").Foo
-+>create : () => import("../packageA/foo.js").Foo
++>create : () => import("../packageA/foo").Foo
 
  export declare function invoke(): ReturnType<typeof create>;
 ->invoke : () => ReturnType<typeof create>
 ->create : () => import("workspace/packageA/foo").Foo
-+>invoke : () => import("../packageA/foo.js").Foo
-+>create : () => import("../packageA/foo.js").Foo
++>invoke : () => import("../packageA/foo").Foo
++>create : () => import("../packageA/foo").Foo
 
  === workspace/packageC/index.ts ===
  import * as pkg from "package-b";
@@ -21,9 +21,9 @@
 ->a : import("workspace/packageA/foo").Foo
 ->pkg.invoke() : import("workspace/packageA/foo").Foo
 ->pkg.invoke : () => ReturnType<typeof import("workspace/packageA/index").create>
-+>a : import("../packageA/foo.js").Foo
-+>pkg.invoke() : import("../packageA/foo.js").Foo
-+>pkg.invoke : () => import("../packageA/foo.js").Foo
++>a : import("../packageA/foo").Foo
++>pkg.invoke() : import("../packageA/foo").Foo
++>pkg.invoke : () => import("../packageA/foo").Foo
  >pkg : typeof pkg
 ->invoke : () => ReturnType<typeof import("workspace/packageA/index").create>
-+>invoke : () => import("../packageA/foo.js").Foo
++>invoke : () => import("../packageA/foo").Foo
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
index 3543443b22..59acfb4178 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
@@ -36,4 +36,4 @@ exports.a = pkg.invoke();
 
 
 //// [index.d.ts]
-export declare const a: import("../packageA/index.js").Foo;
+export declare const a: import("../packageA").Foo;
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js.diff
index 515fea54aa..ef5b9496f8 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js.diff
@@ -11,4 +11,4 @@
 
  //// [index.d.ts]
 -export declare const a: import("package-a").Foo;
-+export declare const a: import("../packageA/index.js").Foo;
\ No newline at end of file
++export declare const a: import("../packageA").Foo;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types
index a4e8f94d12..279b442259 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types
@@ -19,9 +19,9 @@ import * as pkg from "package-b";
 >pkg : typeof pkg
 
 export const a = pkg.invoke();
->a : import("../packageA/index.js").Foo
->pkg.invoke() : import("../packageA/index.js").Foo
->pkg.invoke : () => import("../packageA/index.js").Foo
+>a : import("../packageA").Foo
+>pkg.invoke() : import("../packageA").Foo
+>pkg.invoke : () => import("../packageA").Foo
 >pkg : typeof pkg
->invoke : () => import("../packageA/index.js").Foo
+>invoke : () => import("../packageA").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types.diff
index 8099611aff..523893c69a 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.types.diff
@@ -7,9 +7,9 @@
 ->a : import("workspace/packageA/index").Foo
 ->pkg.invoke() : import("workspace/packageA/index").Foo
 ->pkg.invoke : () => import("workspace/packageA/index").Foo
-+>a : import("../packageA/index.js").Foo
-+>pkg.invoke() : import("../packageA/index.js").Foo
-+>pkg.invoke : () => import("../packageA/index.js").Foo
++>a : import("../packageA").Foo
++>pkg.invoke() : import("../packageA").Foo
++>pkg.invoke : () => import("../packageA").Foo
  >pkg : typeof pkg
 ->invoke : () => import("workspace/packageA/index").Foo
-+>invoke : () => import("../packageA/index.js").Foo
++>invoke : () => import("../packageA").Foo
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
index 00c0a8b62e..fe24bc8f2a 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
@@ -38,4 +38,4 @@ exports.a = pkg.invoke();
 
 
 //// [index.d.ts]
-export declare const a: import("../packageA/index.js").Foo;
+export declare const a: import("../packageA").Foo;
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js.diff
index 93cd8db1a7..32ff6fc95c 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js.diff
@@ -11,4 +11,4 @@
 
  //// [index.d.ts]
 -export declare const a: import("package-a").Foo;
-+export declare const a: import("../packageA/index.js").Foo;
\ No newline at end of file
++export declare const a: import("../packageA").Foo;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types
index 3d588b141b..d008f3c8bd 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types
@@ -19,9 +19,9 @@ import * as pkg from "package-b";
 >pkg : typeof pkg
 
 export const a = pkg.invoke();
->a : import("../packageA/index.js").Foo
->pkg.invoke() : import("../packageA/index.js").Foo
->pkg.invoke : () => import("../packageA/index.js").Foo
+>a : import("../packageA").Foo
+>pkg.invoke() : import("../packageA").Foo
+>pkg.invoke : () => import("../packageA").Foo
 >pkg : typeof pkg
->invoke : () => import("../packageA/index.js").Foo
+>invoke : () => import("../packageA").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types.diff
index 1c6b5cfa3d..2c0536c701 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.types.diff
@@ -7,9 +7,9 @@
 ->a : import("workspace/packageA/index").Foo
 ->pkg.invoke() : import("workspace/packageA/index").Foo
 ->pkg.invoke : () => import("workspace/packageA/index").Foo
-+>a : import("../packageA/index.js").Foo
-+>pkg.invoke() : import("../packageA/index.js").Foo
-+>pkg.invoke : () => import("../packageA/index.js").Foo
++>a : import("../packageA").Foo
++>pkg.invoke() : import("../packageA").Foo
++>pkg.invoke : () => import("../packageA").Foo
  >pkg : typeof pkg
 ->invoke : () => import("workspace/packageA/index").Foo
-+>invoke : () => import("../packageA/index.js").Foo
++>invoke : () => import("../packageA").Foo
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
index d2ba69c80e..f1715cc27c 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
@@ -38,4 +38,4 @@ exports.a = pkg.invoke();
 
 
 //// [index.d.ts]
-export declare const a: import("../packageA/index.js").Foo;
+export declare const a: import("../packageA").Foo;
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js.diff
index 62549dfcbe..be48d6757d 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js.diff
@@ -11,4 +11,4 @@
 
  //// [index.d.ts]
 -export declare const a: import("package-a").Foo;
-+export declare const a: import("../packageA/index.js").Foo;
\ No newline at end of file
++export declare const a: import("../packageA").Foo;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types
index bd713916bb..bb573df5d3 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types
@@ -19,9 +19,9 @@ import * as pkg from "package-b";
 >pkg : typeof pkg
 
 export const a = pkg.invoke();
->a : import("../packageA/index.js").Foo
->pkg.invoke() : import("../packageA/index.js").Foo
->pkg.invoke : () => import("../packageA/index.js").Foo
+>a : import("../packageA").Foo
+>pkg.invoke() : import("../packageA").Foo
+>pkg.invoke : () => import("../packageA").Foo
 >pkg : typeof pkg
->invoke : () => import("../packageA/index.js").Foo
+>invoke : () => import("../packageA").Foo
 
diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types.diff
index e32d1508fd..8dfd33e4c0 100644
--- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.types.diff
@@ -7,9 +7,9 @@
 ->a : import("workspace/packageA/index").Foo
 ->pkg.invoke() : import("workspace/packageA/index").Foo
 ->pkg.invoke : () => import("workspace/packageA/index").Foo
-+>a : import("../packageA/index.js").Foo
-+>pkg.invoke() : import("../packageA/index.js").Foo
-+>pkg.invoke : () => import("../packageA/index.js").Foo
++>a : import("../packageA").Foo
++>pkg.invoke() : import("../packageA").Foo
++>pkg.invoke : () => import("../packageA").Foo
  >pkg : typeof pkg
 ->invoke : () => import("workspace/packageA/index").Foo
-+>invoke : () => import("../packageA/index.js").Foo
++>invoke : () => import("../packageA").Foo
diff --git a/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types b/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types
index 4d29ad7178..a6ab4cbabc 100644
--- a/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types
+++ b/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types
@@ -5,13 +5,13 @@ declare global {
 >global : typeof global
 
     const React: typeof import("./module");
->React : typeof import("./module.js")
+>React : typeof import("./module")
 }
 export {};
 
 === module.d.ts ===
 export as namespace React;
->React : typeof import("./module.js")
+>React : typeof import("./module")
 
 export function foo(): string;
 >foo : () => string
@@ -20,7 +20,7 @@ export function foo(): string;
 export {}
 React.foo;
 >React.foo : () => string
->React : typeof import("./module.js")
+>React : typeof import("./module")
 >foo : () => string
 
 === emits.ts ===
@@ -33,6 +33,6 @@ console.log("hello");
 
 React.foo;
 >React.foo : () => string
->React : typeof import("./module.js")
+>React : typeof import("./module")
 >foo : () => string
 
diff --git a/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types.diff b/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types.diff
index 565b1e09a9..0c497ed972 100644
--- a/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/umdGlobalAugmentationNoCrash.types.diff
@@ -5,14 +5,14 @@
 
      const React: typeof import("./module");
 ->React : typeof import("module")
-+>React : typeof import("./module.js")
++>React : typeof import("./module")
  }
  export {};
 
  === module.d.ts ===
  export as namespace React;
 ->React : typeof import("module")
-+>React : typeof import("./module.js")
++>React : typeof import("./module")
 
  export function foo(): string;
  >foo : () => string
@@ -21,7 +21,7 @@
  React.foo;
  >React.foo : () => string
 ->React : typeof import("module")
-+>React : typeof import("./module.js")
++>React : typeof import("./module")
  >foo : () => string
 
  === emits.ts ===
@@ -30,5 +30,5 @@
  React.foo;
  >React.foo : () => string
 ->React : typeof import("module")
-+>React : typeof import("./module.js")
++>React : typeof import("./module")
  >foo : () => string
diff --git a/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types b/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types
index d686f9e9f2..39d9f9c2ae 100644
--- a/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types
+++ b/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types
@@ -2,14 +2,14 @@
 
 === v1/index.d.ts ===
 export as namespace Alpha;
->Alpha : typeof import("./index.js")
+>Alpha : typeof import(".")
 
 export var x: string;
 >x : string
 
 === v2/index.d.ts ===
 export as namespace Alpha;
->Alpha : typeof import("./index.js")
+>Alpha : typeof import(".")
 
 export var y: number;
 >y : number
diff --git a/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types.diff b/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types.diff
index 042a5a37d5..3f38450890 100644
--- a/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/umdGlobalConflict.types.diff
@@ -5,7 +5,7 @@
  === v1/index.d.ts ===
  export as namespace Alpha;
 ->Alpha : typeof import("v1/index")
-+>Alpha : typeof import("./index.js")
++>Alpha : typeof import(".")
 
  export var x: string;
  >x : string
@@ -13,7 +13,7 @@
  === v2/index.d.ts ===
  export as namespace Alpha;
 ->Alpha : typeof import("v2/index")
-+>Alpha : typeof import("./index.js")
++>Alpha : typeof import(".")
 
  export var y: number;
  >y : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types b/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
index 80b7cfe09b..98ea9abb52 100644
--- a/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
+++ b/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types
@@ -5,7 +5,7 @@ declare global {
 >global : typeof global
 
     const React: typeof import("./module");
->React : typeof import("./module.js")
+>React : typeof import("./module")
 }
 
 export { };
@@ -28,7 +28,7 @@ declare namespace React {
 export { };
 React.createRef;
 >React.createRef : () => any
->React : typeof import("./module.js")
+>React : typeof import("./module")
 >createRef : () => any
 
 === emits.ts ===
@@ -41,6 +41,6 @@ console.log("hello");
 
 React.createRef;
 >React.createRef : () => any
->React : typeof import("./module.js")
+>React : typeof import("./module")
 >createRef : () => any
 
diff --git a/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types.diff b/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types.diff
index c1c203f01d..cde3dca175 100644
--- a/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types.diff
+++ b/testdata/baselines/reference/submodule/compiler/umdNamespaceMergedWithGlobalAugmentationIsNotCircular.types.diff
@@ -5,7 +5,7 @@
 
      const React: typeof import("./module");
 ->React : typeof import("module")
-+>React : typeof import("./module.js")
++>React : typeof import("./module")
  }
 
  export { };
@@ -14,7 +14,7 @@
  React.createRef;
  >React.createRef : () => any
 ->React : typeof import("module")
-+>React : typeof import("./module.js")
++>React : typeof import("./module")
  >createRef : () => any
 
  === emits.ts ===
@@ -23,5 +23,5 @@
  React.createRef;
  >React.createRef : () => any
 ->React : typeof import("module")
-+>React : typeof import("./module.js")
++>React : typeof import("./module")
  >createRef : () => any
diff --git a/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es2015).errors.txt b/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es2015).errors.txt
index 652dc51bfe..9a74eabd76 100644
--- a/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es2015).errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es2015).errors.txt
@@ -1,7 +1,7 @@
 astralAsSurrogatePair.ts(1,16): error TS1127: Invalid character.
-astralAsSurrogatePair.ts(1,17): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uD800'.
+astralAsSurrogatePair.ts(1,17): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
 astralAsSurrogatePair.ts(1,22): error TS1127: Invalid character.
-astralAsSurrogatePair.ts(1,23): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uDEA7'.
+astralAsSurrogatePair.ts(1,23): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
 
 
 ==== extendedEscapesForAstralsInVarsAndClasses.ts (0 errors) ====
@@ -35,9 +35,9 @@ astralAsSurrogatePair.ts(1,23): error TS2305: Module '"extendedEscapesForAstrals
                    ~
 !!! error TS1127: Invalid character.
                     ~~~~~
-!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uD800'.
+!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
                          ~
 !!! error TS1127: Invalid character.
                           ~~~~~
-!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uDEA7'.
+!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es2015).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es2015).errors.txt.diff
index 90d4c0595e..90e97ba287 100644
--- a/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es2015).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es2015).errors.txt.diff
@@ -6,9 +6,9 @@
 -astralAsSurrogatePair.ts(1,23): error TS1127: Invalid character.
 -astralAsSurrogatePair.ts(1,24): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
 +astralAsSurrogatePair.ts(1,16): error TS1127: Invalid character.
-+astralAsSurrogatePair.ts(1,17): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uD800'.
++astralAsSurrogatePair.ts(1,17): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
 +astralAsSurrogatePair.ts(1,22): error TS1127: Invalid character.
-+astralAsSurrogatePair.ts(1,23): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uDEA7'.
++astralAsSurrogatePair.ts(1,23): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
 
 
  ==== extendedEscapesForAstralsInVarsAndClasses.ts (0 errors) ====
@@ -17,19 +17,15 @@
  ==== astralAsSurrogatePair.ts (4 errors) ====
      import { _𐊧 as \uD800\uDEA7 } from "./extendedEscapesForAstralsInVarsAndClasses.js";
 -                    
--!!! error TS1127: Invalid character.
--                     ~~~~~
--!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
--                          
--!!! error TS1127: Invalid character.
--                           ~~~~~
--!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
 +                   ~
-+!!! error TS1127: Invalid character.
+ !!! error TS1127: Invalid character.
+-                     ~~~~~
 +                    ~~~~~
-+!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uD800'.
+ !!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
+-                          
 +                         ~
-+!!! error TS1127: Invalid character.
+ !!! error TS1127: Invalid character.
+-                           ~~~~~
 +                          ~~~~~
-+!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uDEA7'.
+ !!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es5).errors.txt b/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es5).errors.txt
index 568ca696fc..9c6d434461 100644
--- a/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es5).errors.txt
+++ b/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es5).errors.txt
@@ -1,9 +1,9 @@
 astralAsSurrogatePair.ts(1,11): error TS1127: Invalid character.
-astralAsSurrogatePair.ts(1,13): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'as'.
+astralAsSurrogatePair.ts(1,13): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'as'.
 astralAsSurrogatePair.ts(1,16): error TS1127: Invalid character.
-astralAsSurrogatePair.ts(1,17): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uD800'.
+astralAsSurrogatePair.ts(1,17): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
 astralAsSurrogatePair.ts(1,22): error TS1127: Invalid character.
-astralAsSurrogatePair.ts(1,23): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uDEA7'.
+astralAsSurrogatePair.ts(1,23): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
 extendedEscapesForAstralsInVarsAndClasses.ts(2,5): error TS1127: Invalid character.
 extendedEscapesForAstralsInVarsAndClasses.ts(2,6): error TS1134: Variable declaration expected.
 extendedEscapesForAstralsInVarsAndClasses.ts(3,5): error TS1127: Invalid character.
@@ -151,13 +151,13 @@ extendedEscapesForAstralsInVarsAndClasses.ts(24,12): error TS1128: Declaration o
               ~
 !!! error TS1127: Invalid character.
                 ~~
-!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'as'.
+!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'as'.
                    ~
 !!! error TS1127: Invalid character.
                     ~~~~~
-!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uD800'.
+!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
                          ~
 !!! error TS1127: Invalid character.
                           ~~~~~
-!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uDEA7'.
+!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es5).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es5).errors.txt.diff
index 4a5ab70be9..988061d8ac 100644
--- a/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es5).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/compiler/unicodeEscapesInNames02(target=es5).errors.txt.diff
@@ -8,11 +8,11 @@
 -astralAsSurrogatePair.ts(1,18): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
 -astralAsSurrogatePair.ts(1,23): error TS1127: Invalid character.
 -astralAsSurrogatePair.ts(1,24): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
-+astralAsSurrogatePair.ts(1,13): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'as'.
++astralAsSurrogatePair.ts(1,13): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'as'.
 +astralAsSurrogatePair.ts(1,16): error TS1127: Invalid character.
-+astralAsSurrogatePair.ts(1,17): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uD800'.
++astralAsSurrogatePair.ts(1,17): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
 +astralAsSurrogatePair.ts(1,22): error TS1127: Invalid character.
-+astralAsSurrogatePair.ts(1,23): error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uDEA7'.
++astralAsSurrogatePair.ts(1,23): error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
  extendedEscapesForAstralsInVarsAndClasses.ts(2,5): error TS1127: Invalid character.
 -extendedEscapesForAstralsInVarsAndClasses.ts(2,7): error TS1134: Variable declaration expected.
 +extendedEscapesForAstralsInVarsAndClasses.ts(2,6): error TS1134: Variable declaration expected.
@@ -147,27 +147,21 @@
  ==== astralAsSurrogatePair.ts (6 errors) ====
      import { _𐊧 as \uD800\uDEA7 } from "./extendedEscapesForAstralsInVarsAndClasses.js";
 -              ~~
--!!! error TS1127: Invalid character.
--                 ~~
--!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'as'.
--                    
--!!! error TS1127: Invalid character.
--                     ~~~~~
--!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
--                          
--!!! error TS1127: Invalid character.
--                           ~~~~~
--!!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
 +              ~
-+!!! error TS1127: Invalid character.
+ !!! error TS1127: Invalid character.
+-                 ~~
 +                ~~
-+!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'as'.
+ !!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'as'.
+-                    
 +                   ~
-+!!! error TS1127: Invalid character.
+ !!! error TS1127: Invalid character.
+-                     ~~~~~
 +                    ~~~~~
-+!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uD800'.
+ !!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uD800'.
+-                          
 +                         ~
-+!!! error TS1127: Invalid character.
+ !!! error TS1127: Invalid character.
+-                           ~~~~~
 +                          ~~~~~
-+!!! error TS2305: Module '"extendedEscapesForAstralsInVarsAndClasses"' has no exported member 'uDEA7'.
+ !!! error TS2305: Module '"./extendedEscapesForAstralsInVarsAndClasses.js"' has no exported member 'uDEA7'.
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_importEmpty.errors.txt b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_importEmpty.errors.txt
index 7040ac8af6..0bcb15e810 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_importEmpty.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_importEmpty.errors.txt
@@ -1,6 +1,6 @@
-arbitraryModuleNamespaceIdentifiers_importEmpty.ts(4,3): error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"missing"'.
-arbitraryModuleNamespaceIdentifiers_importEmpty.ts(5,3): error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"(missing)"'.
-arbitraryModuleNamespaceIdentifiers_importEmpty.ts(6,3): error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '""'.
+arbitraryModuleNamespaceIdentifiers_importEmpty.ts(4,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '"missing"'.
+arbitraryModuleNamespaceIdentifiers_importEmpty.ts(5,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '"(missing)"'.
+arbitraryModuleNamespaceIdentifiers_importEmpty.ts(6,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '""'.
 
 
 ==== arbitraryModuleNamespaceIdentifiers_importEmpty.ts (3 errors) ====
@@ -9,13 +9,13 @@ arbitraryModuleNamespaceIdentifiers_importEmpty.ts(6,3): error TS2305: Module '"
     import {
       "missing" as x,
       ~~~~~~~~~
-!!! error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"missing"'.
+!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '"missing"'.
       "(missing)" as y,
       ~~~~~~~~~~~
-!!! error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"(missing)"'.
+!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '"(missing)"'.
       "" as z,
       ~~
-!!! error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '""'.
+!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '""'.
     } from "./arbitraryModuleNamespaceIdentifiers_importEmpty";
     const xyz = [x, y, z];
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_importEmpty.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_importEmpty.errors.txt.diff
index e581ad1084..0aebf36e15 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_importEmpty.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_importEmpty.errors.txt.diff
@@ -4,9 +4,9 @@
 -arbitraryModuleNamespaceIdentifiers_importEmpty.ts(4,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"missing"'.
 -arbitraryModuleNamespaceIdentifiers_importEmpty.ts(5,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"(missing)"'.
 -arbitraryModuleNamespaceIdentifiers_importEmpty.ts(6,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '""'.
-+arbitraryModuleNamespaceIdentifiers_importEmpty.ts(4,3): error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"missing"'.
-+arbitraryModuleNamespaceIdentifiers_importEmpty.ts(5,3): error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"(missing)"'.
-+arbitraryModuleNamespaceIdentifiers_importEmpty.ts(6,3): error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '""'.
++arbitraryModuleNamespaceIdentifiers_importEmpty.ts(4,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '"missing"'.
++arbitraryModuleNamespaceIdentifiers_importEmpty.ts(5,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '"(missing)"'.
++arbitraryModuleNamespaceIdentifiers_importEmpty.ts(6,3): error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '""'.
 
 
  ==== arbitraryModuleNamespaceIdentifiers_importEmpty.ts (3 errors) ====
@@ -15,15 +15,15 @@
        "missing" as x,
        ~~~~~~~~~
 -!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"missing"'.
-+!!! error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"missing"'.
++!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '"missing"'.
        "(missing)" as y,
        ~~~~~~~~~~~
 -!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"(missing)"'.
-+!!! error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '"(missing)"'.
++!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '"(missing)"'.
        "" as z,
        ~~
 -!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '""'.
-+!!! error TS2305: Module '"arbitraryModuleNamespaceIdentifiers_importEmpty"' has no exported member '""'.
++!!! error TS2305: Module '"./arbitraryModuleNamespaceIdentifiers_importEmpty.js"' has no exported member '""'.
      } from "./arbitraryModuleNamespaceIdentifiers_importEmpty";
      const xyz = [x, y, z];
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.errors.txt b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.errors.txt
index 6c51eaa0e6..d11cd34bc2 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.errors.txt
@@ -1,17 +1,17 @@
 type-clause-bad-export.ts(1,15): error TS1003: Identifier expected.
 type-clause-bad-import.ts(1,22): error TS1003: Identifier expected.
 type-clause-no-as.ts(1,15): error TS1003: Identifier expected.
-type-clause-type-as-as.ts(1,15): error TS2305: Module '"type-clause-valid"' has no exported member 'as'.
+type-clause-type-as-as.ts(1,15): error TS2305: Module '"./type-clause-valid.js"' has no exported member 'as'.
 type-clause-type-as-as.ts(1,21): error TS1003: Identifier expected.
 type-decls-bad-export.ts(1,15): error TS1003: Identifier expected.
 type-decls-bad-import.ts(1,22): error TS1003: Identifier expected.
 type-decls-no-as.ts(1,15): error TS1003: Identifier expected.
-type-decls-type-as.ts(1,15): error TS2305: Module '"type-decls-valid"' has no exported member 'type'.
+type-decls-type-as.ts(1,15): error TS2305: Module '"./type-decls-valid.js"' has no exported member 'type'.
 type-decls-type-as.ts(1,23): error TS1003: Identifier expected.
 values-bad-export.ts(1,10): error TS1003: Identifier expected.
 values-bad-import.ts(1,17): error TS1003: Identifier expected.
 values-no-as.ts(1,10): error TS1003: Identifier expected.
-values-type-as.ts(1,10): error TS2305: Module '"values-valid"' has no exported member 'type'.
+values-type-as.ts(1,10): error TS2305: Module '"./values-valid.js"' has no exported member 'type'.
 values-type-as.ts(1,18): error TS1003: Identifier expected.
 
 
@@ -41,7 +41,7 @@ values-type-as.ts(1,18): error TS1003: Identifier expected.
 ==== values-type-as.ts (2 errors) ====
     import { type as "invalid 4" } from "./values-valid";
              ~~~~
-!!! error TS2305: Module '"values-valid"' has no exported member 'type'.
+!!! error TS2305: Module '"./values-valid.js"' has no exported member 'type'.
                      ~~~~~~~~~~~
 !!! error TS1003: Identifier expected.
     
@@ -72,7 +72,7 @@ values-type-as.ts(1,18): error TS1003: Identifier expected.
 ==== type-decls-type-as.ts (2 errors) ====
     import type { type as "invalid 4" } from "./type-decls-valid";
                   ~~~~
-!!! error TS2305: Module '"type-decls-valid"' has no exported member 'type'.
+!!! error TS2305: Module '"./type-decls-valid.js"' has no exported member 'type'.
                           ~~~~~~~~~~~
 !!! error TS1003: Identifier expected.
     
@@ -101,7 +101,7 @@ values-type-as.ts(1,18): error TS1003: Identifier expected.
 ==== type-clause-type-as-as.ts (2 errors) ====
     import { type as as "invalid 4" } from "./type-clause-valid";
                   ~~
-!!! error TS2305: Module '"type-clause-valid"' has no exported member 'as'.
+!!! error TS2305: Module '"./type-clause-valid.js"' has no exported member 'as'.
                         ~~~~~~~~~~~
 !!! error TS1003: Identifier expected.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.errors.txt.diff
index c6734b3bf0..64f2b0a607 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.errors.txt.diff
@@ -5,19 +5,19 @@
  type-clause-bad-import.ts(1,22): error TS1003: Identifier expected.
  type-clause-no-as.ts(1,15): error TS1003: Identifier expected.
 -type-clause-type-as-as.ts(1,15): error TS2305: Module '"./type-clause-valid"' has no exported member 'as'.
-+type-clause-type-as-as.ts(1,15): error TS2305: Module '"type-clause-valid"' has no exported member 'as'.
++type-clause-type-as-as.ts(1,15): error TS2305: Module '"./type-clause-valid.js"' has no exported member 'as'.
  type-clause-type-as-as.ts(1,21): error TS1003: Identifier expected.
  type-decls-bad-export.ts(1,15): error TS1003: Identifier expected.
  type-decls-bad-import.ts(1,22): error TS1003: Identifier expected.
  type-decls-no-as.ts(1,15): error TS1003: Identifier expected.
 -type-decls-type-as.ts(1,15): error TS2305: Module '"./type-decls-valid"' has no exported member 'type'.
-+type-decls-type-as.ts(1,15): error TS2305: Module '"type-decls-valid"' has no exported member 'type'.
++type-decls-type-as.ts(1,15): error TS2305: Module '"./type-decls-valid.js"' has no exported member 'type'.
  type-decls-type-as.ts(1,23): error TS1003: Identifier expected.
  values-bad-export.ts(1,10): error TS1003: Identifier expected.
  values-bad-import.ts(1,17): error TS1003: Identifier expected.
  values-no-as.ts(1,10): error TS1003: Identifier expected.
 -values-type-as.ts(1,10): error TS2305: Module '"./values-valid"' has no exported member 'type'.
-+values-type-as.ts(1,10): error TS2305: Module '"values-valid"' has no exported member 'type'.
++values-type-as.ts(1,10): error TS2305: Module '"./values-valid.js"' has no exported member 'type'.
  values-type-as.ts(1,18): error TS1003: Identifier expected.
 
 
@@ -26,7 +26,7 @@
      import { type as "invalid 4" } from "./values-valid";
               ~~~~
 -!!! error TS2305: Module '"./values-valid"' has no exported member 'type'.
-+!!! error TS2305: Module '"values-valid"' has no exported member 'type'.
++!!! error TS2305: Module '"./values-valid.js"' has no exported member 'type'.
                       ~~~~~~~~~~~
  !!! error TS1003: Identifier expected.
      
@@ -35,7 +35,7 @@
      import type { type as "invalid 4" } from "./type-decls-valid";
                    ~~~~
 -!!! error TS2305: Module '"./type-decls-valid"' has no exported member 'type'.
-+!!! error TS2305: Module '"type-decls-valid"' has no exported member 'type'.
++!!! error TS2305: Module '"./type-decls-valid.js"' has no exported member 'type'.
                            ~~~~~~~~~~~
  !!! error TS1003: Identifier expected.
      
@@ -44,7 +44,7 @@
      import { type as as "invalid 4" } from "./type-clause-valid";
                    ~~
 -!!! error TS2305: Module '"./type-clause-valid"' has no exported member 'as'.
-+!!! error TS2305: Module '"type-clause-valid"' has no exported member 'as'.
++!!! error TS2305: Module '"./type-clause-valid.js"' has no exported member 'as'.
                          ~~~~~~~~~~~
  !!! error TS1003: Identifier expected.
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types
index 145586e119..82f6bd1012 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types
@@ -20,7 +20,7 @@ export { foo as "valid 3" } from "./values-valid";
 >"valid 3" : 123
 
 export * as "valid 4" from "./values-valid";
->"valid 4" : typeof import("./values-valid")
+>"valid 4" : typeof import("./values-valid.js")
 
 === values-bad-import.ts ===
 import { foo as "invalid 2" } from "./values-valid";
@@ -60,7 +60,7 @@ export type { foo as "valid 3" } from "./type-decls-valid";
 >"valid 3" : any
 
 export type * as "valid 4" from "./type-decls-valid";
->"valid 4" : typeof import("./type-decls-valid")
+>"valid 4" : typeof import("./type-decls-valid.js")
 
 === type-decls-bad-import.ts ===
 import type { foo as "invalid 2" } from "./type-decls-valid";
diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types.diff
index 3bb625b7b0..5b70ee0104 100644
--- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_syntax.types.diff
@@ -5,7 +5,7 @@
 
  export * as "valid 4" from "./values-valid";
 ->"valid 4" : typeof import("values-valid")
-+>"valid 4" : typeof import("./values-valid")
++>"valid 4" : typeof import("./values-valid.js")
 
  === values-bad-import.ts ===
  import { foo as "invalid 2" } from "./values-valid";
@@ -35,7 +35,7 @@
 
  export type * as "valid 4" from "./type-decls-valid";
 ->"valid 4" : typeof import("type-decls-valid")
-+>"valid 4" : typeof import("./type-decls-valid")
++>"valid 4" : typeof import("./type-decls-valid.js")
 
  === type-decls-bad-import.ts ===
  import type { foo as "invalid 2" } from "./type-decls-valid";
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt
index 83c172d377..45c6215ffe 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt
@@ -1,6 +1,6 @@
-/main.cts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-/main.mts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
-/main.ts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
+/main.cts(1,10): error TS2305: Module '"./node_modules/dual/index.d.cts"' has no exported member 'esm'.
+/main.mts(1,15): error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
+/main.ts(1,15): error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
 
 
 ==== /node_modules/dual/package.json (0 errors) ====
@@ -33,15 +33,15 @@
 ==== /main.ts (1 errors) ====
     import { esm, cjs } from "dual";
                   ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
+!!! error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
     
 ==== /main.mts (1 errors) ====
     import { esm, cjs } from "dual";
                   ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
+!!! error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
     
 ==== /main.cts (1 errors) ====
     import { esm, cjs } from "dual";
              ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
+!!! error TS2305: Module '"./node_modules/dual/index.d.cts"' has no exported member 'esm'.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt.diff
index 73c4060b5e..50b984ab39 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).errors.txt.diff
@@ -18,9 +18,9 @@
 -!!! error TS6504: File '/node_modules/dual/index.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -!!! error TS6504:   The file is in the program because:
 -!!! error TS6504:     Root file specified for compilation
-+/main.cts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-+/main.mts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
-+/main.ts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
++/main.cts(1,10): error TS2305: Module '"./node_modules/dual/index.d.cts"' has no exported member 'esm'.
++/main.mts(1,15): error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
++/main.ts(1,15): error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
 +
 +
  ==== /node_modules/dual/package.json (0 errors) ====
@@ -31,17 +31,17 @@
      import { esm, cjs } from "dual";
                    ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
++!!! error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
      
  ==== /main.mts (1 errors) ====
      import { esm, cjs } from "dual";
                    ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
++!!! error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
      
  ==== /main.cts (1 errors) ====
      import { esm, cjs } from "dual";
               ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'esm'.
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
++!!! error TS2305: Module '"./node_modules/dual/index.d.cts"' has no exported member 'esm'.
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt
index 83c172d377..45c6215ffe 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt
@@ -1,6 +1,6 @@
-/main.cts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-/main.mts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
-/main.ts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
+/main.cts(1,10): error TS2305: Module '"./node_modules/dual/index.d.cts"' has no exported member 'esm'.
+/main.mts(1,15): error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
+/main.ts(1,15): error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
 
 
 ==== /node_modules/dual/package.json (0 errors) ====
@@ -33,15 +33,15 @@
 ==== /main.ts (1 errors) ====
     import { esm, cjs } from "dual";
                   ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
+!!! error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
     
 ==== /main.mts (1 errors) ====
     import { esm, cjs } from "dual";
                   ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
+!!! error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
     
 ==== /main.cts (1 errors) ====
     import { esm, cjs } from "dual";
              ~~~
-!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
+!!! error TS2305: Module '"./node_modules/dual/index.d.cts"' has no exported member 'esm'.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt.diff
index 7e238efd02..9c55a0283d 100644
--- a/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).errors.txt.diff
@@ -18,9 +18,9 @@
 -!!! error TS6504: File '/node_modules/dual/index.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -!!! error TS6504:   The file is in the program because:
 -!!! error TS6504:     Root file specified for compilation
-+/main.cts(1,10): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
-+/main.mts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
-+/main.ts(1,15): error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
++/main.cts(1,10): error TS2305: Module '"./node_modules/dual/index.d.cts"' has no exported member 'esm'.
++/main.mts(1,15): error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
++/main.ts(1,15): error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
 +
 +
  ==== /node_modules/dual/package.json (0 errors) ====
@@ -31,17 +31,17 @@
      import { esm, cjs } from "dual";
                    ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
++!!! error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
      
  ==== /main.mts (1 errors) ====
      import { esm, cjs } from "dual";
                    ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'cjs'.
++!!! error TS2305: Module '"./node_modules/dual/index.js"' has no exported member 'cjs'.
      
  ==== /main.cts (1 errors) ====
      import { esm, cjs } from "dual";
               ~~~
 -!!! error TS2305: Module '"dual"' has no exported member 'esm'.
-+!!! error TS2305: Module '"/node_modules/dual/index"' has no exported member 'esm'.
++!!! error TS2305: Module '"./node_modules/dual/index.d.cts"' has no exported member 'esm'.
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.types b/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.types
index f4a67f4e8f..cc12e155aa 100644
--- a/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.types
+++ b/testdata/baselines/reference/submodule/conformance/commonJsImportBindingElementNarrowType.types
@@ -3,7 +3,7 @@
 === /bar.js ===
 const { a } = require("./foo");
 >a : number | null
->require("./foo") : typeof import("./foo.js")
+>require("./foo") : typeof import("./foo")
 >require : any
 >"./foo" : "./foo"
 
diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types b/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types
index 2d3871023b..6d13743759 100644
--- a/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types
+++ b/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types
@@ -24,7 +24,7 @@ export class HTML5Element extends HTMLElement {
 
 === file.d.ts ===
 export * as mod from "./component.html";
->mod : typeof import("./component.html")
+>mod : typeof import("./component.d.html.js")
 
 === main.ts ===
 import { mod } from "./file.js";
diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types.diff b/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types.diff
index 102ed2516f..b998fbb4ef 100644
--- a/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/declarationFileForHtmlFileWithinDeclarationFile.types.diff
@@ -5,7 +5,7 @@
  === file.d.ts ===
  export * as mod from "./component.html";
 ->mod : typeof import("component.d.html")
-+>mod : typeof import("./component.html")
++>mod : typeof import("./component.d.html.js")
 
  === main.ts ===
  import { mod } from "./file.js";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types
index 14f26848aa..e7d2d652ef 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types.diff
index 33fd4b2451..79ab937e83 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=es2015).types.diff
@@ -5,7 +5,7 @@
  === 1.ts ===
  export * as ns from './0';
 ->ns : typeof import("0")
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
 
  ns.a;
  >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types
index 14f26848aa..e7d2d652ef 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types.diff
index 30cad1becf..f28116170b 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=esnext).types.diff
@@ -5,7 +5,7 @@
  === 1.ts ===
  export * as ns from './0';
 ->ns : typeof import("0")
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
 
  ns.a;
  >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types
index aafa9eacca..fcf37f4f85 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types.diff
index 490344fd6f..0f824e147c 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=es2015).types.diff
@@ -5,7 +5,7 @@
  === 1.ts ===
  export * as ns from './0';
 ->ns : typeof import("0")
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
 
  ns.a;
  >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types
index aafa9eacca..fcf37f4f85 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 
 ns.a;
 >ns.a : any
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types.diff
index 5853f35ca6..2a4ece76df 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace2(module=esnext).types.diff
@@ -5,7 +5,7 @@
  === 1.ts ===
  export * as ns from './0';
 ->ns : typeof import("0")
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
 
  ns.a;
  >ns.a : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types
index 125c02e1a9..0cdb12b02c 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 
 ns.a;
 >ns.a : number
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types.diff
index 1d7c5ef9de..2e7529d65d 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=es2015).types.diff
@@ -5,7 +5,7 @@
  === 1.ts ===
  export * as ns from './0';
 ->ns : typeof import("0")
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
 
  ns.a;
  >ns.a : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types
index 125c02e1a9..0cdb12b02c 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as ns from './0';
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 
 ns.a;
 >ns.a : number
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types.diff
index 76284e883b..c1e35cb9c8 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace3(module=esnext).types.diff
@@ -5,7 +5,7 @@
  === 1.ts ===
  export * as ns from './0';
 ->ns : typeof import("0")
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
 
  ns.a;
  >ns.a : number
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types
index 537720d322..647c639237 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as default from './0';
->default : typeof import("./0")
+>default : typeof import("./0.js")
 
 === 11.ts ===
 import * as ns from './0';
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types.diff
index dc622a0f3d..8432d14fb1 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=es2015).types.diff
@@ -5,7 +5,7 @@
  === 1.ts ===
  export * as default from './0';
 ->default : typeof import("0")
-+>default : typeof import("./0")
++>default : typeof import("./0.js")
 
  === 11.ts ===
  import * as ns from './0';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types
index 537720d322..647c639237 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types
@@ -11,7 +11,7 @@ export const b = 2;
 
 === 1.ts ===
 export * as default from './0';
->default : typeof import("./0")
+>default : typeof import("./0.js")
 
 === 11.ts ===
 import * as ns from './0';
diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types.diff
index cd98542e89..f237e1ea05 100644
--- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace4(module=esnext).types.diff
@@ -5,7 +5,7 @@
  === 1.ts ===
  export * as default from './0';
 ->default : typeof import("0")
-+>default : typeof import("./0")
++>default : typeof import("./0.js")
 
  === 11.ts ===
  import * as ns from './0';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportSpellingSuggestion.errors.txt b/testdata/baselines/reference/submodule/conformance/exportSpellingSuggestion.errors.txt
index 77ad38c9d8..457a49a22a 100644
--- a/testdata/baselines/reference/submodule/conformance/exportSpellingSuggestion.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/exportSpellingSuggestion.errors.txt
@@ -1,4 +1,4 @@
-b.ts(1,10): error TS2724: '"a"' has no exported member named 'assertNevar'. Did you mean 'assertNever'?
+b.ts(1,10): error TS2724: '"./a"' has no exported member named 'assertNevar'. Did you mean 'assertNever'?
 
 
 ==== a.ts (0 errors) ====
@@ -9,6 +9,6 @@ b.ts(1,10): error TS2724: '"a"' has no exported member named 'assertNevar'. Did
 ==== b.ts (1 errors) ====
     import { assertNevar } from "./a";
              ~~~~~~~~~~~
-!!! error TS2724: '"a"' has no exported member named 'assertNevar'. Did you mean 'assertNever'?
+!!! error TS2724: '"./a"' has no exported member named 'assertNevar'. Did you mean 'assertNever'?
 !!! related TS2728 a.ts:1:17: 'assertNever' is declared here.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/exportSpellingSuggestion.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/exportSpellingSuggestion.errors.txt.diff
deleted file mode 100644
index 82c0042d16..0000000000
--- a/testdata/baselines/reference/submodule/conformance/exportSpellingSuggestion.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.exportSpellingSuggestion.errors.txt
-+++ new.exportSpellingSuggestion.errors.txt
-@@= skipped -0, +0 lines =@@
--b.ts(1,10): error TS2724: '"./a"' has no exported member named 'assertNevar'. Did you mean 'assertNever'?
-+b.ts(1,10): error TS2724: '"a"' has no exported member named 'assertNevar'. Did you mean 'assertNever'?
-
-
- ==== a.ts (0 errors) ====
-@@= skipped -8, +8 lines =@@
- ==== b.ts (1 errors) ====
-     import { assertNevar } from "./a";
-              ~~~~~~~~~~~
--!!! error TS2724: '"./a"' has no exported member named 'assertNevar'. Did you mean 'assertNever'?
-+!!! error TS2724: '"a"' has no exported member named 'assertNevar'. Did you mean 'assertNever'?
- !!! related TS2728 a.ts:1:17: 'assertNever' is declared here.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types
index 511738644c..44a7029856 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types
@@ -22,7 +22,7 @@ export * from './0' assert { type: "json" }
 >type : any
 
 export * as ns from './0' assert { type: "json" }
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types.diff
index 9d1c5da071..c2e25560a4 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=es2015).types.diff
@@ -5,7 +5,7 @@
 
  export * as ns from './0' assert { type: "json" }
 ->ns : typeof import("0")
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
  >type : any
 
  === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types
index 511738644c..44a7029856 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types
@@ -22,7 +22,7 @@ export * from './0' assert { type: "json" }
 >type : any
 
 export * as ns from './0' assert { type: "json" }
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types.diff
index 7d4d6fbf4e..86e364809a 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=esnext).types.diff
@@ -20,7 +20,7 @@
  export * as ns from './0' assert { type: "json" }
 ->ns : typeof import("0")
 ->type : error
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
 +>type : any
 
  === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).errors.txt b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).errors.txt
index 2b97b1037d..dfd1648810 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).errors.txt
@@ -1,38 +1,26 @@
 1.ts(1,27): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-1.ts(1,27): error TS2822: Import assertions cannot be used with type-only imports or exports.
 1.ts(2,30): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-1.ts(2,30): error TS2822: Import assertions cannot be used with type-only imports or exports.
 2.ts(1,31): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-2.ts(1,31): error TS2822: Import assertions cannot be used with type-only imports or exports.
 2.ts(2,33): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-2.ts(2,33): error TS2822: Import assertions cannot be used with type-only imports or exports.
 
 
 ==== 0.ts (0 errors) ====
     export interface I { }
     
-==== 1.ts (4 errors) ====
+==== 1.ts (2 errors) ====
     export type {} from './0' assert { type: "json" }
                               ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                              ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
     export type { I } from './0' assert { type: "json" }
                                  ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                 ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
     
-==== 2.ts (4 errors) ====
+==== 2.ts (2 errors) ====
     import type { I } from './0'  assert { type: "json" }
                                   ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                  ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
     import type * as foo from './0' assert { type: "json" }
                                     ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                    ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
     
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).errors.txt.diff
deleted file mode 100644
index 4c8aef5657..0000000000
--- a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).errors.txt.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- old.importAssertion3(module=es2015).errors.txt
-+++ new.importAssertion3(module=es2015).errors.txt
-@@= skipped -0, +0 lines =@@
- 1.ts(1,27): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+1.ts(1,27): error TS2822: Import assertions cannot be used with type-only imports or exports.
- 1.ts(2,30): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+1.ts(2,30): error TS2822: Import assertions cannot be used with type-only imports or exports.
- 2.ts(1,31): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+2.ts(1,31): error TS2822: Import assertions cannot be used with type-only imports or exports.
- 2.ts(2,33): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+2.ts(2,33): error TS2822: Import assertions cannot be used with type-only imports or exports.
-
-
- ==== 0.ts (0 errors) ====
-     export interface I { }
-     
--==== 1.ts (2 errors) ====
-+==== 1.ts (4 errors) ====
-     export type {} from './0' assert { type: "json" }
-                               ~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                              ~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
-     export type { I } from './0' assert { type: "json" }
-                                  ~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                 ~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
-     
--==== 2.ts (2 errors) ====
-+==== 2.ts (4 errors) ====
-     import type { I } from './0'  assert { type: "json" }
-                                   ~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                  ~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
-     import type * as foo from './0' assert { type: "json" }
-                                     ~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                    ~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
-     
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types
index 764bc09625..a8f0ef2967 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types
@@ -9,7 +9,7 @@ export type {} from './0' assert { type: "json" }
 >type : any
 
 export type { I } from './0' assert { type: "json" }
->I : import("./0").I
+>I : import("./0.js").I
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types.diff
index 35d3ca6c0a..3b2b8ad2df 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=es2015).types.diff
@@ -5,7 +5,7 @@
 
  export type { I } from './0' assert { type: "json" }
 ->I : import("0").I
-+>I : import("./0").I
++>I : import("./0.js").I
  >type : any
 
  === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types
index 764bc09625..a8f0ef2967 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types
@@ -9,7 +9,7 @@ export type {} from './0' assert { type: "json" }
 >type : any
 
 export type { I } from './0' assert { type: "json" }
->I : import("./0").I
+>I : import("./0.js").I
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types.diff
index 676d20ddd5..a097ab6f44 100644
--- a/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAssertion3(module=esnext).types.diff
@@ -5,7 +5,7 @@
 
  export type { I } from './0' assert { type: "json" }
 ->I : import("0").I
-+>I : import("./0").I
++>I : import("./0.js").I
  >type : any
 
  === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types
index 6008d0b89b..9a8017cfeb 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types
@@ -22,7 +22,7 @@ export * from './0' with { type: "json" }
 >type : any
 
 export * as ns from './0' with { type: "json" }
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types.diff
index 7d3bbc04a8..cdad2785c6 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=es2015).types.diff
@@ -5,7 +5,7 @@
 
  export * as ns from './0' with { type: "json" }
 ->ns : typeof import("0")
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
  >type : any
 
  === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types
index 6008d0b89b..9a8017cfeb 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types
@@ -22,7 +22,7 @@ export * from './0' with { type: "json" }
 >type : any
 
 export * as ns from './0' with { type: "json" }
->ns : typeof import("./0")
+>ns : typeof import("./0.js")
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types.diff
index 501f9e1204..0fc0c049c2 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=esnext).types.diff
@@ -20,7 +20,7 @@
  export * as ns from './0' with { type: "json" }
 ->ns : typeof import("0")
 ->type : error
-+>ns : typeof import("./0")
++>ns : typeof import("./0.js")
 +>type : any
 
  === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).errors.txt b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).errors.txt
index e8d25a6617..23d166416e 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).errors.txt
@@ -1,37 +1,25 @@
 1.ts(1,27): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-1.ts(1,27): error TS2857: Import attributes cannot be used with type-only imports or exports.
 1.ts(2,30): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-1.ts(2,30): error TS2857: Import attributes cannot be used with type-only imports or exports.
 2.ts(1,31): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-2.ts(1,31): error TS2857: Import attributes cannot be used with type-only imports or exports.
 2.ts(2,33): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-2.ts(2,33): error TS2857: Import attributes cannot be used with type-only imports or exports.
 
 
 ==== 0.ts (0 errors) ====
     export interface I { }
     
-==== 1.ts (4 errors) ====
+==== 1.ts (2 errors) ====
     export type {} from './0' with { type: "json" }
                               ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                              ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
     export type { I } from './0' with { type: "json" }
                                  ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                 ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
     
-==== 2.ts (4 errors) ====
+==== 2.ts (2 errors) ====
     import type { I } from './0'  with { type: "json" }
                                   ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                  ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
     import type * as foo from './0' with { type: "json" }
                                     ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                    ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).errors.txt.diff
deleted file mode 100644
index bc3b3ce3d7..0000000000
--- a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).errors.txt.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- old.importAttributes3(module=es2015).errors.txt
-+++ new.importAttributes3(module=es2015).errors.txt
-@@= skipped -0, +0 lines =@@
- 1.ts(1,27): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+1.ts(1,27): error TS2857: Import attributes cannot be used with type-only imports or exports.
- 1.ts(2,30): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+1.ts(2,30): error TS2857: Import attributes cannot be used with type-only imports or exports.
- 2.ts(1,31): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+2.ts(1,31): error TS2857: Import attributes cannot be used with type-only imports or exports.
- 2.ts(2,33): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+2.ts(2,33): error TS2857: Import attributes cannot be used with type-only imports or exports.
-
-
- ==== 0.ts (0 errors) ====
-     export interface I { }
-     
--==== 1.ts (2 errors) ====
-+==== 1.ts (4 errors) ====
-     export type {} from './0' with { type: "json" }
-                               ~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                              ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-     export type { I } from './0' with { type: "json" }
-                                  ~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                 ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-     
--==== 2.ts (2 errors) ====
-+==== 2.ts (4 errors) ====
-     import type { I } from './0'  with { type: "json" }
-                                   ~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                  ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-     import type * as foo from './0' with { type: "json" }
-                                     ~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                    ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types
index 7b71ed23de..48a1588806 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types
@@ -9,7 +9,7 @@ export type {} from './0' with { type: "json" }
 >type : any
 
 export type { I } from './0' with { type: "json" }
->I : import("./0").I
+>I : import("./0.js").I
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types.diff
index c7454f0752..01ccbfea38 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=es2015).types.diff
@@ -5,7 +5,7 @@
 
  export type { I } from './0' with { type: "json" }
 ->I : import("0").I
-+>I : import("./0").I
++>I : import("./0.js").I
  >type : any
 
  === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types
index 7b71ed23de..48a1588806 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types
@@ -9,7 +9,7 @@ export type {} from './0' with { type: "json" }
 >type : any
 
 export type { I } from './0' with { type: "json" }
->I : import("./0").I
+>I : import("./0.js").I
 >type : any
 
 === 2.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types.diff b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types.diff
index af2a947fe3..2b9a3a8282 100644
--- a/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/importAttributes3(module=esnext).types.diff
@@ -5,7 +5,7 @@
 
  export type { I } from './0' with { type: "json" }
 ->I : import("0").I
-+>I : import("./0").I
++>I : import("./0.js").I
  >type : any
 
  === 2.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importFromDot.errors.txt b/testdata/baselines/reference/submodule/conformance/importFromDot.errors.txt
index b36fc51fcf..541a41c694 100644
--- a/testdata/baselines/reference/submodule/conformance/importFromDot.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/importFromDot.errors.txt
@@ -1,4 +1,4 @@
-a/b.ts(1,20): error TS2305: Module '"a/index"' has no exported member 'rootA'.
+a/b.ts(1,20): error TS2305: Module '"."' has no exported member 'rootA'.
 
 
 ==== a.ts (0 errors) ====
@@ -10,5 +10,5 @@ a/b.ts(1,20): error TS2305: Module '"a/index"' has no exported member 'rootA'.
 ==== a/b.ts (1 errors) ====
     import { indexInA, rootA } from ".";
                        ~~~~~
-!!! error TS2305: Module '"a/index"' has no exported member 'rootA'.
+!!! error TS2305: Module '"."' has no exported member 'rootA'.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importFromDot.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/importFromDot.errors.txt.diff
deleted file mode 100644
index be34f67173..0000000000
--- a/testdata/baselines/reference/submodule/conformance/importFromDot.errors.txt.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- old.importFromDot.errors.txt
-+++ new.importFromDot.errors.txt
-@@= skipped -0, +0 lines =@@
--a/b.ts(1,20): error TS2305: Module '"."' has no exported member 'rootA'.
-+a/b.ts(1,20): error TS2305: Module '"a/index"' has no exported member 'rootA'.
-
-
- ==== a.ts (0 errors) ====
-@@= skipped -9, +9 lines =@@
- ==== a/b.ts (1 errors) ====
-     import { indexInA, rootA } from ".";
-                        ~~~~~
--!!! error TS2305: Module '"."' has no exported member 'rootA'.
-+!!! error TS2305: Module '"a/index"' has no exported member 'rootA'.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importSpecifiers1.errors.txt b/testdata/baselines/reference/submodule/conformance/importSpecifiers1.errors.txt
index 8e39f48a21..db97058353 100644
--- a/testdata/baselines/reference/submodule/conformance/importSpecifiers1.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/importSpecifiers1.errors.txt
@@ -7,7 +7,7 @@
 /d.ts(1,24): error TS2300: Duplicate identifier 'as'.
 /e.ts(4,1): error TS1361: 'as' cannot be used as a value because it was imported using 'import type'.
 /f.ts(1,15): error TS1003: Identifier expected.
-/f.ts(1,15): error TS2305: Module '"/mod"' has no exported member 'import'.
+/f.ts(1,15): error TS2305: Module '"./mod.js"' has no exported member 'import'.
 /f.ts(2,18): error TS1003: Identifier expected.
 /f.ts(2,18): error TS2300: Duplicate identifier 'export'.
 /f.ts(3,21): error TS1003: Identifier expected.
@@ -73,7 +73,7 @@
                   ~~~~~~
 !!! error TS1003: Identifier expected.
                   ~~~~~~
-!!! error TS2305: Module '"/mod"' has no exported member 'import'.
+!!! error TS2305: Module '"./mod.js"' has no exported member 'import'.
     import { type as export } from "./mod.js"; // Error
                      ~~~~~~
 !!! error TS1003: Identifier expected.
diff --git a/testdata/baselines/reference/submodule/conformance/importSpecifiers1.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/importSpecifiers1.errors.txt.diff
deleted file mode 100644
index 50040265b8..0000000000
--- a/testdata/baselines/reference/submodule/conformance/importSpecifiers1.errors.txt.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.importSpecifiers1.errors.txt
-+++ new.importSpecifiers1.errors.txt
-@@= skipped -6, +6 lines =@@
- /d.ts(1,24): error TS2300: Duplicate identifier 'as'.
- /e.ts(4,1): error TS1361: 'as' cannot be used as a value because it was imported using 'import type'.
- /f.ts(1,15): error TS1003: Identifier expected.
--/f.ts(1,15): error TS2305: Module '"./mod.js"' has no exported member 'import'.
-+/f.ts(1,15): error TS2305: Module '"/mod"' has no exported member 'import'.
- /f.ts(2,18): error TS1003: Identifier expected.
- /f.ts(2,18): error TS2300: Duplicate identifier 'export'.
- /f.ts(3,21): error TS1003: Identifier expected.
-@@= skipped -66, +66 lines =@@
-                   ~~~~~~
- !!! error TS1003: Identifier expected.
-                   ~~~~~~
--!!! error TS2305: Module '"./mod.js"' has no exported member 'import'.
-+!!! error TS2305: Module '"/mod"' has no exported member 'import'.
-     import { type as export } from "./mod.js"; // Error
-                      ~~~~~~
- !!! error TS1003: Identifier expected.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importTag15(module=es2015).errors.txt b/testdata/baselines/reference/submodule/conformance/importTag15(module=es2015).errors.txt
index dfc06beb53..00d266cd48 100644
--- a/testdata/baselines/reference/submodule/conformance/importTag15(module=es2015).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/importTag15(module=es2015).errors.txt
@@ -1,26 +1,20 @@
 1.js(1,30): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-1.js(1,30): error TS2857: Import attributes cannot be used with type-only imports or exports.
 1.js(2,27): error TS2307: Cannot find module './0' or its corresponding type declarations.
 1.js(2,33): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-1.js(2,33): error TS2857: Import attributes cannot be used with type-only imports or exports.
 
 
 ==== 0.ts (0 errors) ====
     export interface I { }
     
-==== 1.js (5 errors) ====
+==== 1.js (3 errors) ====
     /** @import { I } from './0' with { type: "json" } */
                                  ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                 ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
     /** @import * as foo from './0' with { type: "json" } */
                               ~~~~~
 !!! error TS2307: Cannot find module './0' or its corresponding type declarations.
                                     ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                    ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
     
     /** @param {I} a */
     function f(a) {}
diff --git a/testdata/baselines/reference/submodule/conformance/importTypeInJSDoc.types b/testdata/baselines/reference/submodule/conformance/importTypeInJSDoc.types
index 07250a28a6..f57a8e5ea1 100644
--- a/testdata/baselines/reference/submodule/conformance/importTypeInJSDoc.types
+++ b/testdata/baselines/reference/submodule/conformance/importTypeInJSDoc.types
@@ -20,7 +20,7 @@ declare class MyClass {
 >y : number
 
     constructor(x: MyClass.Bar);
->x : import("./externs.js").Bar
+>x : import("./externs").Bar
 >MyClass : any
 }
 declare global {
@@ -39,28 +39,28 @@ export = MyClass;
  */
 
 let a = /** @type {Foo} */(/** @type {*} */(undefined)); 
->a : import("./externs.js")
->(/** @type {*} */(undefined)) : import("./externs.js")
->(undefined) : import("./externs.js")
+>a : import("./externs")
+>(/** @type {*} */(undefined)) : import("./externs")
+>(undefined) : import("./externs")
 >(undefined) : any
 >undefined : any
 >undefined : undefined
 
 a = new Foo({doer: Foo.Bar});
->a = new Foo({doer: Foo.Bar}) : import("./externs.js")
->a : import("./externs.js")
->new Foo({doer: Foo.Bar}) : import("./externs.js")
->Foo : typeof import("./externs.js")
+>a = new Foo({doer: Foo.Bar}) : import("./externs")
+>a : import("./externs")
+>new Foo({doer: Foo.Bar}) : import("./externs")
+>Foo : typeof import("./externs")
 >{doer: Foo.Bar} : { doer: (x: string, y?: number) => void; }
 >doer : (x: string, y?: number) => void
 >Foo.Bar : (x: string, y?: number) => void
->Foo : typeof import("./externs.js")
+>Foo : typeof import("./externs")
 >Bar : (x: string, y?: number) => void
 
 const q = /** @type {import("./externs").Bar} */({ doer: q => q });
->q : import("./externs.js").Bar
->({ doer: q => q }) : import("./externs.js").Bar
->{ doer: q => q } : import("./externs.js").Bar
+>q : import("./externs").Bar
+>({ doer: q => q }) : import("./externs").Bar
+>{ doer: q => q } : import("./externs").Bar
 >{ doer: q => q } : { doer: (q: string) => string; }
 >doer : (q: string) => string
 >q => q : (q: string) => string
diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types
index 0466f357a6..7f6c1cd816 100644
--- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types
+++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types
@@ -197,18 +197,18 @@ import { dom } from "./renderer"
 >dom : () => dom.JSX.Element
 
 import prerendered, {MySFC, MyClass, tree} from "./component";
->prerendered : import("./renderer2.js").predom.JSX.Element
->MySFC : (props: { x: number; y: number; children?: import("./renderer2.js").predom.JSX.Element[]; }) => import("./renderer2.js").predom.JSX.Element
+>prerendered : import("./renderer2").predom.JSX.Element
+>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
 >MyClass : typeof MyClass
->tree : import("./renderer2.js").predom.JSX.Element
+>tree : import("./renderer2").predom.JSX.Element
 
 let elem = prerendered;
->elem : import("./renderer2.js").predom.JSX.Element
->prerendered : import("./renderer2.js").predom.JSX.Element
+>elem : import("./renderer2").predom.JSX.Element
+>prerendered : import("./renderer2").predom.JSX.Element
 
 elem = <h></h>; // Expect assignability error here
 >elem = <h></h> : dom.JSX.Element
->elem : import("./renderer2.js").predom.JSX.Element
+>elem : import("./renderer2").predom.JSX.Element
 ><h></h> : dom.JSX.Element
 >h : any
 >h : any
@@ -322,7 +322,7 @@ const _tree = <DOMSFC x={1} y={2}><DOMClass x={3} y={4} /><DOMClass x={5} y={6}
 const _brokenTree = <MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={6} /></MySFC>
 >_brokenTree : dom.JSX.Element
 ><MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={6} /></MySFC> : dom.JSX.Element
->MySFC : (props: { x: number; y: number; children?: import("./renderer2.js").predom.JSX.Element[]; }) => import("./renderer2.js").predom.JSX.Element
+>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
 >x : number
 >1 : 1
 >y : number
@@ -339,7 +339,7 @@ const _brokenTree = <MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={
 >5 : 5
 >y : number
 >6 : 6
->MySFC : (props: { x: number; y: number; children?: import("./renderer2.js").predom.JSX.Element[]; }) => import("./renderer2.js").predom.JSX.Element
+>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
 
 // Should fail, nondom isn't allowed as children of dom
 const _brokenTree2 = <DOMSFC x={1} y={2}>{tree}{tree}</DOMSFC>
@@ -350,7 +350,7 @@ const _brokenTree2 = <DOMSFC x={1} y={2}>{tree}{tree}</DOMSFC>
 >1 : 1
 >y : number
 >2 : 2
->tree : import("./renderer2.js").predom.JSX.Element
->tree : import("./renderer2.js").predom.JSX.Element
+>tree : import("./renderer2").predom.JSX.Element
+>tree : import("./renderer2").predom.JSX.Element
 >DOMSFC : (props: { x: number; y: number; children?: dom.JSX.Element[]; }) => dom.JSX.Element
 
diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types.diff b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types.diff
index 01ee13a905..c7aa43e08a 100644
--- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.types.diff
@@ -6,22 +6,22 @@
  import prerendered, {MySFC, MyClass, tree} from "./component";
 ->prerendered : import("renderer2").predom.JSX.Element
 ->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
-+>prerendered : import("./renderer2.js").predom.JSX.Element
-+>MySFC : (props: { x: number; y: number; children?: import("./renderer2.js").predom.JSX.Element[]; }) => import("./renderer2.js").predom.JSX.Element
++>prerendered : import("./renderer2").predom.JSX.Element
++>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
  >MyClass : typeof MyClass
 ->tree : import("renderer2").predom.JSX.Element
-+>tree : import("./renderer2.js").predom.JSX.Element
++>tree : import("./renderer2").predom.JSX.Element
 
  let elem = prerendered;
 ->elem : import("renderer2").predom.JSX.Element
 ->prerendered : import("renderer2").predom.JSX.Element
-+>elem : import("./renderer2.js").predom.JSX.Element
-+>prerendered : import("./renderer2.js").predom.JSX.Element
++>elem : import("./renderer2").predom.JSX.Element
++>prerendered : import("./renderer2").predom.JSX.Element
 
  elem = <h></h>; // Expect assignability error here
  >elem = <h></h> : dom.JSX.Element
 ->elem : import("renderer2").predom.JSX.Element
-+>elem : import("./renderer2.js").predom.JSX.Element
++>elem : import("./renderer2").predom.JSX.Element
  ><h></h> : dom.JSX.Element
  >h : any
  >h : any
@@ -30,7 +30,7 @@
  >_brokenTree : dom.JSX.Element
  ><MySFC x={1} y={2}><MyClass x={3} y={4} /><MyClass x={5} y={6} /></MySFC> : dom.JSX.Element
 ->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
-+>MySFC : (props: { x: number; y: number; children?: import("./renderer2.js").predom.JSX.Element[]; }) => import("./renderer2.js").predom.JSX.Element
++>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
  >x : number
  >1 : 1
  >y : number
@@ -39,7 +39,7 @@
  >y : number
  >6 : 6
 ->MySFC : (props: { x: number; y: number; children?: import("renderer2").predom.JSX.Element[]; }) => import("renderer2").predom.JSX.Element
-+>MySFC : (props: { x: number; y: number; children?: import("./renderer2.js").predom.JSX.Element[]; }) => import("./renderer2.js").predom.JSX.Element
++>MySFC : (props: { x: number; y: number; children?: import("./renderer2").predom.JSX.Element[]; }) => import("./renderer2").predom.JSX.Element
 
  // Should fail, nondom isn't allowed as children of dom
  const _brokenTree2 = <DOMSFC x={1} y={2}>{tree}{tree}</DOMSFC>
@@ -49,6 +49,6 @@
  >2 : 2
 ->tree : import("renderer2").predom.JSX.Element
 ->tree : import("renderer2").predom.JSX.Element
-+>tree : import("./renderer2.js").predom.JSX.Element
-+>tree : import("./renderer2.js").predom.JSX.Element
++>tree : import("./renderer2").predom.JSX.Element
++>tree : import("./renderer2").predom.JSX.Element
  >DOMSFC : (props: { x: number; y: number; children?: dom.JSX.Element[]; }) => dom.JSX.Element
diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types
index 4e19a2301f..4c03c11163 100644
--- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types
+++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types
@@ -75,15 +75,15 @@ import { dom } from "./renderer"
 >dom : () => JSX.Element
 
 import prerendered from "./component";
->prerendered : import("./renderer2.js").predom.JSX.Element
+>prerendered : import("./renderer2").predom.JSX.Element
 
 let elem = prerendered;
->elem : import("./renderer2.js").predom.JSX.Element
->prerendered : import("./renderer2.js").predom.JSX.Element
+>elem : import("./renderer2").predom.JSX.Element
+>prerendered : import("./renderer2").predom.JSX.Element
 
 elem = <h></h>; // Expect assignability error here
 >elem = <h></h> : JSX.Element
->elem : import("./renderer2.js").predom.JSX.Element
+>elem : import("./renderer2").predom.JSX.Element
 ><h></h> : JSX.Element
 >h : any
 >h : any
diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types.diff b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types.diff
index fa55309d5d..3e9004bc8b 100644
--- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.types.diff
@@ -5,18 +5,18 @@
 
  import prerendered from "./component";
 ->prerendered : import("renderer2").predom.JSX.Element
-+>prerendered : import("./renderer2.js").predom.JSX.Element
++>prerendered : import("./renderer2").predom.JSX.Element
 
  let elem = prerendered;
 ->elem : import("renderer2").predom.JSX.Element
 ->prerendered : import("renderer2").predom.JSX.Element
-+>elem : import("./renderer2.js").predom.JSX.Element
-+>prerendered : import("./renderer2.js").predom.JSX.Element
++>elem : import("./renderer2").predom.JSX.Element
++>prerendered : import("./renderer2").predom.JSX.Element
 
  elem = <h></h>; // Expect assignability error here
  >elem = <h></h> : JSX.Element
 ->elem : import("renderer2").predom.JSX.Element
-+>elem : import("./renderer2.js").predom.JSX.Element
++>elem : import("./renderer2").predom.JSX.Element
  ><h></h> : JSX.Element
  >h : any
  >h : any
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types
index 10053fa390..cf7f2b3942 100644
--- a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types
+++ b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types
@@ -228,7 +228,7 @@ declare function mock<M>(_: Promise<M>): {} & M;
 mock(import('./ex'))
 >mock(import('./ex')) : {}
 >mock : <M>(_: Promise<M>) => {} & M
->import('./ex') : Promise<{ default: typeof import("./ex.js"); }>
+>import('./ex') : Promise<{ default: typeof import("./ex"); }>
 >'./ex' : "./ex"
 
 === ex.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types.diff b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types.diff
index fbd6826e92..06f2934445 100644
--- a/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/intersectionsAndEmptyObjects.types.diff
@@ -5,7 +5,7 @@
  >mock(import('./ex')) : {}
  >mock : <M>(_: Promise<M>) => {} & M
 ->import('./ex') : Promise<{ default: typeof import("ex"); }>
-+>import('./ex') : Promise<{ default: typeof import("./ex.js"); }>
++>import('./ex') : Promise<{ default: typeof import("./ex"); }>
  >'./ex' : "./ex"
 
  === ex.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocThisType.types b/testdata/baselines/reference/submodule/conformance/jsdocThisType.types
index 6aa27b79e2..9a335ab3cb 100644
--- a/testdata/baselines/reference/submodule/conformance/jsdocThisType.types
+++ b/testdata/baselines/reference/submodule/conformance/jsdocThisType.types
@@ -13,13 +13,13 @@ export type M = (this: Foo) => void;
 === /a.js ===
 /** @type {import('./types').M} */
 export const f1 = function() {
->f1 : import("./types.js").M
->function() {    this.test();} : (this: import("./types.js").Foo) => void
+>f1 : import("./types").M
+>function() {    this.test();} : (this: import("./types").Foo) => void
 
     this.test();
 >this.test() : any
 >this.test : any
->this : import("./types.js").Foo
+>this : import("./types").Foo
 >test : any
 }
 
@@ -36,13 +36,13 @@ export function f2() {
 
 /** @type {(this: import('./types').Foo) => void} */
 export const f3 = function() {
->f3 : (this: import("./types.js").Foo) => void
->function() {    this.test();} : (this: import("./types.js").Foo) => void
+>f3 : (this: import("./types").Foo) => void
+>function() {    this.test();} : (this: import("./types").Foo) => void
 
     this.test();
 >this.test() : any
 >this.test : any
->this : import("./types.js").Foo
+>this : import("./types").Foo
 >test : any
 }
 
diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt
index 6ff354a77e..6d03f77607 100644
--- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt
@@ -1,10 +1,10 @@
-index.ts(1,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private.js'. This is likely not portable. A type annotation is necessary.
+index.ts(1,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private'. This is likely not portable. A type annotation is necessary.
 
 
 ==== index.ts (1 errors) ====
     export const a = async () => (await import("inner")).x();
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private'. This is likely not portable. A type annotation is necessary.
 ==== node_modules/inner/index.d.ts (0 errors) ====
     export { x } from "./other.js";
 ==== node_modules/inner/other.d.ts (0 errors) ====
diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt.diff
index 2478ea24a7..112ac7c0a9 100644
--- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt.diff
@@ -2,13 +2,13 @@
 +++ new.legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+index.ts(1,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private.js'. This is likely not portable. A type annotation is necessary.
++index.ts(1,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private'. This is likely not portable. A type annotation is necessary.
 +
 +
 +==== index.ts (1 errors) ====
 +    export const a = async () => (await import("inner")).x();
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private'. This is likely not portable. A type annotation is necessary.
 +==== node_modules/inner/index.d.ts (0 errors) ====
 +    export { x } from "./other.js";
 +==== node_modules/inner/other.d.ts (0 errors) ====
diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types
index 9e972d7b50..9058f0ef06 100644
--- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types
+++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types
@@ -2,15 +2,15 @@
 
 === index.ts ===
 export const a = async () => (await import("inner")).x();
->a : () => Promise<import("./node_modules/inner/private.js").Thing>
->async () => (await import("inner")).x() : () => Promise<import("./node_modules/inner/private.js").Thing>
->(await import("inner")).x() : import("./node_modules/inner/private.js").Thing
->(await import("inner")).x : () => import("./node_modules/inner/private.js").Thing
->(await import("inner")) : { x: () => import("./node_modules/inner/private.js").Thing; default: typeof import("./node_modules/inner/index.js"); }
->await import("inner") : { x: () => import("./node_modules/inner/private.js").Thing; default: typeof import("./node_modules/inner/index.js"); }
->import("inner") : Promise<{ x: () => import("./node_modules/inner/private.js").Thing; default: typeof import("./node_modules/inner/index.js"); }>
+>a : () => Promise<import("./node_modules/inner/private").Thing>
+>async () => (await import("inner")).x() : () => Promise<import("./node_modules/inner/private").Thing>
+>(await import("inner")).x() : import("./node_modules/inner/private").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/private").Thing
+>(await import("inner")) : { x: () => import("./node_modules/inner/private").Thing; default: typeof import("./node_modules/inner"); }
+>await import("inner") : { x: () => import("./node_modules/inner/private").Thing; default: typeof import("./node_modules/inner"); }
+>import("inner") : Promise<{ x: () => import("./node_modules/inner/private").Thing; default: typeof import("./node_modules/inner"); }>
 >"inner" : "inner"
->x : () => import("./node_modules/inner/private.js").Thing
+>x : () => import("./node_modules/inner/private").Thing
 
 === node_modules/inner/index.d.ts ===
 export { x } from "./other.js";
diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types.diff b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types.diff
index fa7d9ffd0e..0c5b9a5d89 100644
--- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.types.diff
@@ -11,16 +11,16 @@
 ->(await import("inner")) : typeof import("node_modules/inner/index")
 ->await import("inner") : typeof import("node_modules/inner/index")
 ->import("inner") : Promise<typeof import("node_modules/inner/index")>
-+>a : () => Promise<import("./node_modules/inner/private.js").Thing>
-+>async () => (await import("inner")).x() : () => Promise<import("./node_modules/inner/private.js").Thing>
-+>(await import("inner")).x() : import("./node_modules/inner/private.js").Thing
-+>(await import("inner")).x : () => import("./node_modules/inner/private.js").Thing
-+>(await import("inner")) : { x: () => import("./node_modules/inner/private.js").Thing; default: typeof import("./node_modules/inner/index.js"); }
-+>await import("inner") : { x: () => import("./node_modules/inner/private.js").Thing; default: typeof import("./node_modules/inner/index.js"); }
-+>import("inner") : Promise<{ x: () => import("./node_modules/inner/private.js").Thing; default: typeof import("./node_modules/inner/index.js"); }>
++>a : () => Promise<import("./node_modules/inner/private").Thing>
++>async () => (await import("inner")).x() : () => Promise<import("./node_modules/inner/private").Thing>
++>(await import("inner")).x() : import("./node_modules/inner/private").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/private").Thing
++>(await import("inner")) : { x: () => import("./node_modules/inner/private").Thing; default: typeof import("./node_modules/inner"); }
++>await import("inner") : { x: () => import("./node_modules/inner/private").Thing; default: typeof import("./node_modules/inner"); }
++>import("inner") : Promise<{ x: () => import("./node_modules/inner/private").Thing; default: typeof import("./node_modules/inner"); }>
  >"inner" : "inner"
 ->x : () => import("node_modules/inner/private").Thing
-+>x : () => import("./node_modules/inner/private.js").Thing
++>x : () => import("./node_modules/inner/private").Thing
 
  === node_modules/inner/index.d.ts ===
  export { x } from "./other.js";
diff --git a/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.errors.txt b/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.errors.txt
index 0b9bf17426..7f24128a64 100644
--- a/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.errors.txt
@@ -1,4 +1,4 @@
-/index.ts(1,10): error TS2305: Module '"/node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
+/index.ts(1,10): error TS2305: Module '"./node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
 
 
 ==== /node_modules/pkg/package.json (0 errors) ====
@@ -16,5 +16,5 @@
 ==== /index.ts (1 errors) ====
     import { pkg } from "pkg";
              ~~~
-!!! error TS2305: Module '"/node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
+!!! error TS2305: Module '"./node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.errors.txt b/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.errors.txt
index c33c5d41c5..ad46bb4253 100644
--- a/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.errors.txt
@@ -1,4 +1,4 @@
-/index.ts(1,10): error TS2305: Module '"/node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
+/index.ts(1,10): error TS2305: Module '"./node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
 
 
 ==== /node_modules/pkg/package.json (0 errors) ====
@@ -20,5 +20,5 @@
 ==== /index.ts (1 errors) ====
     import { pkg } from "pkg";
              ~~~
-!!! error TS2305: Module '"/node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
+!!! error TS2305: Module '"./node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt
index 4a2896da5d..1d7240fa28 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt
@@ -1,4 +1,4 @@
-other.cts(5,14): error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner/index.js'. This is likely not portable. A type annotation is necessary.
+other.cts(5,14): error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner'. This is likely not portable. A type annotation is necessary.
 other.mts(5,14): error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner/index.js'. This is likely not portable. A type annotation is necessary.
 other.ts(5,14): error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner/index.js'. This is likely not portable. A type annotation is necessary.
 other2.cts(2,14): error TS2742: The inferred type of 'd' cannot be named without a reference to './node_modules/inner/index.d.cts'. This is likely not portable. A type annotation is necessary.
@@ -56,7 +56,7 @@ other2.ts(3,14): error TS2742: The inferred type of 'e' cannot be named without
     export const c = import("package");
     export const f = import("inner");
                  ~
-!!! error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner/index.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner'. This is likely not portable. A type annotation is necessary.
 ==== other2.cts (1 errors) ====
     // cjs format file, no TLA
     export const d = import("inner/cjs");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt.diff
index 92d84f20ce..cdefb28910 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt.diff
@@ -2,7 +2,7 @@
 +++ new.nodeModulesDeclarationEmitDynamicImportWithPackageExports.errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+other.cts(5,14): error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner/index.js'. This is likely not portable. A type annotation is necessary.
++other.cts(5,14): error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner'. This is likely not portable. A type annotation is necessary.
 +other.mts(5,14): error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner/index.js'. This is likely not portable. A type annotation is necessary.
 +other.ts(5,14): error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner/index.js'. This is likely not portable. A type annotation is necessary.
 +other2.cts(2,14): error TS2742: The inferred type of 'd' cannot be named without a reference to './node_modules/inner/index.d.cts'. This is likely not portable. A type annotation is necessary.
@@ -60,7 +60,7 @@
 +    export const c = import("package");
 +    export const f = import("inner");
 +                 ~
-+!!! error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner/index.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'f' cannot be named without a reference to './node_modules/inner'. This is likely not portable. A type annotation is necessary.
 +==== other2.cts (1 errors) ====
 +    // cjs format file, no TLA
 +    export const d = import("inner/cjs");
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.js b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.js
index 64e0a8042f..459c78b395 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.js
@@ -128,7 +128,7 @@ export {};
 // esm format file
 export declare const a: typeof import("./index.cts");
 export declare const b: typeof import("./index.mts");
-export declare const c: typeof import(".");
+export declare const c: typeof import("./index.js");
 export declare const f: any;
 //// [other2.d.ts]
 // esm format file
@@ -138,7 +138,7 @@ export declare const e: any;
 // esm format file
 export declare const a: typeof import("./index.cts");
 export declare const b: typeof import("./index.mts");
-export declare const c: typeof import(".");
+export declare const c: typeof import("./index.js");
 export declare const f: any;
 //// [other2.d.mts]
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.js.diff
index c2fdb9d3d5..3db8c1ade0 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.js.diff
@@ -25,7 +25,7 @@
 +// esm format file
 +export declare const a: typeof import("./index.cts");
 +export declare const b: typeof import("./index.mts");
-+export declare const c: typeof import(".");
++export declare const c: typeof import("./index.js");
 +export declare const f: any;
  //// [other2.d.ts]
 -export declare const d: {
@@ -49,7 +49,7 @@
 +// esm format file
 +export declare const a: typeof import("./index.cts");
 +export declare const b: typeof import("./index.mts");
-+export declare const c: typeof import(".");
++export declare const c: typeof import("./index.js");
 +export declare const f: any;
  //// [other2.d.mts]
 -export declare const d: {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types
index 8fbc10d298..b9e29ef2a5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types
@@ -27,9 +27,9 @@ export const b = await import("package/mjs");
 >"package/mjs" : "package/mjs"
 
 export const c = await import("package");
->c : typeof import(".")
->await import("package") : typeof import(".")
->import("package") : Promise<typeof import(".")>
+>c : typeof import("./index.js")
+>await import("package") : typeof import("./index.js")
+>import("package") : Promise<typeof import("./index.js")>
 >"package" : "package"
 
 export const f = await import("inner");
@@ -67,9 +67,9 @@ export const b = await import("package/mjs");
 >"package/mjs" : "package/mjs"
 
 export const c = await import("package");
->c : typeof import(".")
->await import("package") : typeof import(".")
->import("package") : Promise<typeof import(".")>
+>c : typeof import("./index.js")
+>await import("package") : typeof import("./index.js")
+>import("package") : Promise<typeof import("./index.js")>
 >"package" : "package"
 
 export const f = await import("inner");
@@ -110,8 +110,8 @@ export const c = import("package");
 >"package" : "package"
 
 export const f = import("inner");
->f : Promise<{ cjsMain: true; default: typeof import("./node_modules/inner/index.js"); }>
->import("inner") : Promise<{ cjsMain: true; default: typeof import("./node_modules/inner/index.js"); }>
+>f : Promise<{ cjsMain: true; default: typeof import("./node_modules/inner"); }>
+>import("inner") : Promise<{ cjsMain: true; default: typeof import("./node_modules/inner"); }>
 >"inner" : "inner"
 
 === other2.cts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types.diff
index 4b14e9fa3a..d92c258311 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports.types.diff
@@ -25,9 +25,9 @@
 ->c : typeof import("index")
 ->await import("package") : typeof import("index")
 ->import("package") : Promise<typeof import("index")>
-+>c : typeof import(".")
-+>await import("package") : typeof import(".")
-+>import("package") : Promise<typeof import(".")>
++>c : typeof import("./index.js")
++>await import("package") : typeof import("./index.js")
++>import("package") : Promise<typeof import("./index.js")>
  >"package" : "package"
 
  export const f = await import("inner");
@@ -83,9 +83,9 @@
 ->c : typeof import("index")
 ->await import("package") : typeof import("index")
 ->import("package") : Promise<typeof import("index")>
-+>c : typeof import(".")
-+>await import("package") : typeof import(".")
-+>import("package") : Promise<typeof import(".")>
++>c : typeof import("./index.js")
++>await import("package") : typeof import("./index.js")
++>import("package") : Promise<typeof import("./index.js")>
  >"package" : "package"
 
  export const f = await import("inner");
@@ -143,8 +143,8 @@
  export const f = import("inner");
 ->f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
 ->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
-+>f : Promise<{ cjsMain: true; default: typeof import("./node_modules/inner/index.js"); }>
-+>import("inner") : Promise<{ cjsMain: true; default: typeof import("./node_modules/inner/index.js"); }>
++>f : Promise<{ cjsMain: true; default: typeof import("./node_modules/inner"); }>
++>import("inner") : Promise<{ cjsMain: true; default: typeof import("./node_modules/inner"); }>
  >"inner" : "inner"
 
  === other2.cts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).errors.txt
index e3222abb5f..358a0e6143 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).errors.txt
@@ -1,5 +1,5 @@
 index.ts(2,23): error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
-index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other'. This is likely not portable. A type annotation is necessary.
+index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 
 
 ==== index.ts (2 errors) ====
@@ -9,7 +9,7 @@ index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a
 !!! error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
     export const a = (await import("inner")).x();
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
     import {a as a2} from "package";
 ==== node_modules/inner/index.ts (0 errors) ====
     // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).errors.txt.diff
deleted file mode 100644
index 9256310240..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).errors.txt.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- old.nodeModulesExportsSourceTs(module=node16).errors.txt
-+++ new.nodeModulesExportsSourceTs(module=node16).errors.txt
-@@= skipped -0, +0 lines =@@
- index.ts(2,23): error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
--index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
-+index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other'. This is likely not portable. A type annotation is necessary.
-
-
- ==== index.ts (2 errors) ====
-@@= skipped -8, +8 lines =@@
- !!! error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
-     export const a = (await import("inner")).x();
-                  ~
--!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other'. This is likely not portable. A type annotation is necessary.
-     import {a as a2} from "package";
- ==== node_modules/inner/index.ts (0 errors) ====
-     // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types
index a290bfc193..930d3c0a1b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types
@@ -6,18 +6,18 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("./node_modules/inner/other").Thing
->(await import("inner")).x() : import("./node_modules/inner/other").Thing
->(await import("inner")).x : () => import("./node_modules/inner/other").Thing
->(await import("inner")) : typeof import("./node_modules/inner")
->await import("inner") : typeof import("./node_modules/inner")
->import("inner") : Promise<typeof import("./node_modules/inner")>
+>a : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
+>(await import("inner")) : typeof import("./node_modules/inner/index.js")
+>await import("inner") : typeof import("./node_modules/inner/index.js")
+>import("inner") : Promise<typeof import("./node_modules/inner/index.js")>
 >"inner" : "inner"
->x : () => import("./node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other.js").Thing
 
 import {a as a2} from "package";
->a : import("./node_modules/inner/other").Thing
->a2 : import("./node_modules/inner/other").Thing
+>a : import("./node_modules/inner/other.js").Thing
+>a2 : import("./node_modules/inner/other.js").Thing
 
 === node_modules/inner/index.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types.diff
index a06c565455..4ae93aab37 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=node16).types.diff
@@ -10,21 +10,21 @@
 ->(await import("inner")) : typeof import("node_modules/inner/index")
 ->await import("inner") : typeof import("node_modules/inner/index")
 ->import("inner") : Promise<typeof import("node_modules/inner/index")>
-+>a : import("./node_modules/inner/other").Thing
-+>(await import("inner")).x() : import("./node_modules/inner/other").Thing
-+>(await import("inner")).x : () => import("./node_modules/inner/other").Thing
-+>(await import("inner")) : typeof import("./node_modules/inner")
-+>await import("inner") : typeof import("./node_modules/inner")
-+>import("inner") : Promise<typeof import("./node_modules/inner")>
++>a : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
++>(await import("inner")) : typeof import("./node_modules/inner/index.js")
++>await import("inner") : typeof import("./node_modules/inner/index.js")
++>import("inner") : Promise<typeof import("./node_modules/inner/index.js")>
  >"inner" : "inner"
 ->x : () => import("node_modules/inner/other").Thing
-+>x : () => import("./node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other.js").Thing
 
  import {a as a2} from "package";
 ->a : import("node_modules/inner/other").Thing
 ->a2 : import("node_modules/inner/other").Thing
-+>a : import("./node_modules/inner/other").Thing
-+>a2 : import("./node_modules/inner/other").Thing
++>a : import("./node_modules/inner/other.js").Thing
++>a2 : import("./node_modules/inner/other.js").Thing
 
  === node_modules/inner/index.ts ===
  // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).errors.txt
index e3222abb5f..358a0e6143 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).errors.txt
@@ -1,5 +1,5 @@
 index.ts(2,23): error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
-index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other'. This is likely not portable. A type annotation is necessary.
+index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 
 
 ==== index.ts (2 errors) ====
@@ -9,7 +9,7 @@ index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a
 !!! error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
     export const a = (await import("inner")).x();
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
     import {a as a2} from "package";
 ==== node_modules/inner/index.ts (0 errors) ====
     // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).errors.txt.diff
deleted file mode 100644
index 2fd79a5d39..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).errors.txt.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- old.nodeModulesExportsSourceTs(module=nodenext).errors.txt
-+++ new.nodeModulesExportsSourceTs(module=nodenext).errors.txt
-@@= skipped -0, +0 lines =@@
- index.ts(2,23): error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
--index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
-+index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other'. This is likely not portable. A type annotation is necessary.
-
-
- ==== index.ts (2 errors) ====
-@@= skipped -8, +8 lines =@@
- !!! error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
-     export const a = (await import("inner")).x();
-                  ~
--!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other'. This is likely not portable. A type annotation is necessary.
-     import {a as a2} from "package";
- ==== node_modules/inner/index.ts (0 errors) ====
-     // esm format file
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types
index a290bfc193..930d3c0a1b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types
@@ -6,18 +6,18 @@ import { Thing } from "inner/other";
 >Thing : any
 
 export const a = (await import("inner")).x();
->a : import("./node_modules/inner/other").Thing
->(await import("inner")).x() : import("./node_modules/inner/other").Thing
->(await import("inner")).x : () => import("./node_modules/inner/other").Thing
->(await import("inner")) : typeof import("./node_modules/inner")
->await import("inner") : typeof import("./node_modules/inner")
->import("inner") : Promise<typeof import("./node_modules/inner")>
+>a : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
+>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
+>(await import("inner")) : typeof import("./node_modules/inner/index.js")
+>await import("inner") : typeof import("./node_modules/inner/index.js")
+>import("inner") : Promise<typeof import("./node_modules/inner/index.js")>
 >"inner" : "inner"
->x : () => import("./node_modules/inner/other").Thing
+>x : () => import("./node_modules/inner/other.js").Thing
 
 import {a as a2} from "package";
->a : import("./node_modules/inner/other").Thing
->a2 : import("./node_modules/inner/other").Thing
+>a : import("./node_modules/inner/other.js").Thing
+>a2 : import("./node_modules/inner/other.js").Thing
 
 === node_modules/inner/index.ts ===
 // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types.diff
index 87a302755b..254d80e066 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesExportsSourceTs(module=nodenext).types.diff
@@ -10,21 +10,21 @@
 ->(await import("inner")) : typeof import("node_modules/inner/index")
 ->await import("inner") : typeof import("node_modules/inner/index")
 ->import("inner") : Promise<typeof import("node_modules/inner/index")>
-+>a : import("./node_modules/inner/other").Thing
-+>(await import("inner")).x() : import("./node_modules/inner/other").Thing
-+>(await import("inner")).x : () => import("./node_modules/inner/other").Thing
-+>(await import("inner")) : typeof import("./node_modules/inner")
-+>await import("inner") : typeof import("./node_modules/inner")
-+>import("inner") : Promise<typeof import("./node_modules/inner")>
++>a : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x() : import("./node_modules/inner/other.js").Thing
++>(await import("inner")).x : () => import("./node_modules/inner/other.js").Thing
++>(await import("inner")) : typeof import("./node_modules/inner/index.js")
++>await import("inner") : typeof import("./node_modules/inner/index.js")
++>import("inner") : Promise<typeof import("./node_modules/inner/index.js")>
  >"inner" : "inner"
 ->x : () => import("node_modules/inner/other").Thing
-+>x : () => import("./node_modules/inner/other").Thing
++>x : () => import("./node_modules/inner/other.js").Thing
 
  import {a as a2} from "package";
 ->a : import("node_modules/inner/other").Thing
 ->a2 : import("node_modules/inner/other").Thing
-+>a : import("./node_modules/inner/other").Thing
-+>a2 : import("./node_modules/inner/other").Thing
++>a : import("./node_modules/inner/other.js").Thing
++>a2 : import("./node_modules/inner/other.js").Thing
 
  === node_modules/inner/index.ts ===
  // esm format file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
index 7f362030f6..4b518f113a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
@@ -1,11 +1,9 @@
-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(7,14): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
-==== /index.ts (5 errors) ====
+==== /index.ts (3 errors) ====
     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
     
@@ -13,14 +11,10 @@
     
     import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     export interface Loc extends Req, Imp {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt.diff
index df751f4498..202f88ea8f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt.diff
@@ -1,32 +1,18 @@
 --- old.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
 +++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 -/index.ts(7,14): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(7,14): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(7,49): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
--==== /index.ts (3 errors) ====
-+==== /index.ts (5 errors) ====
-     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
-     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-     
-@@= skipped -10, +12 lines =@@
-     
-     import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
-                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-+                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+@@= skipped -13, +13 lines =@@
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
                   ~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      export interface Loc extends Req, Imp {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
index 6747c1b291..d346fee98a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
@@ -1,11 +1,9 @@
-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(7,14): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
 
 
-==== /index.ts (5 errors) ====
+==== /index.ts (3 errors) ====
     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
     
@@ -13,14 +11,10 @@
     
     import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
     import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
     export interface Loc extends Req, Imp {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt.diff
index 7eb6614818..7b1e8b9722 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt.diff
@@ -1,32 +1,18 @@
 --- old.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
 +++ new.nodeModulesImportAttributesModeDeclarationEmit1(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
 -/index.ts(7,14): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(7,14): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(7,49): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
 
 
--==== /index.ts (3 errors) ====
-+==== /index.ts (5 errors) ====
-     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
-     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-     
-@@= skipped -10, +12 lines =@@
-     
-     import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
-                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-+                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+@@= skipped -13, +13 lines =@@
  !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
      import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
                   ~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
      export interface Loc extends Req, Imp {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt
index 37f5d4c764..ab58fe274f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt
@@ -1,11 +1,9 @@
-/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(6,14): error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
 /index.ts(6,50): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
-==== /index.ts (5 errors) ====
+==== /index.ts (3 errors) ====
     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
     
@@ -13,15 +11,11 @@
     
     import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
                  ~~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     export interface Loc extends Req, Imp {}
     
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt.diff
index 61ad7fe3cf..7186c3dde7 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt.diff
@@ -2,31 +2,16 @@
 +++ new.nodeModulesImportAttributesModeDeclarationEmit2(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -/index.ts(6,14): error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-+/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(6,14): error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
  /index.ts(6,50): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(7,49): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
-
--==== /index.ts (3 errors) ====
-+==== /index.ts (5 errors) ====
-     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
-     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-     
-@@= skipped -10, +12 lines =@@
+@@= skipped -10, +10 lines =@@
      
      import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
                   ~~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-+                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
-+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     export interface Loc extends Req, Imp {}
\ No newline at end of file
+     import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt
index 8437ec6776..ba0d24b926 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt
@@ -1,11 +1,9 @@
-/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(6,14): error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
 /index.ts(6,50): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
 
 
-==== /index.ts (5 errors) ====
+==== /index.ts (3 errors) ====
     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
     
@@ -13,15 +11,11 @@
     
     import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
                  ~~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
     import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
     export interface Loc extends Req, Imp {}
     
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt.diff
index e9c3607934..547268161a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt.diff
@@ -2,34 +2,26 @@
 +++ new.nodeModulesImportAttributesModeDeclarationEmit2(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -/index.ts(6,14): error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
- /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
+-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
+-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(6,14): error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
 +/index.ts(6,50): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
- /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
--
--
--==== /index.ts (3 errors) ====
 +/index.ts(7,49): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-+
-+
-+==== /index.ts (5 errors) ====
-     import type { RequireInterface } from "pkg" with { "resolution-mode": "require" };
-     import type { ImportInterface } from "pkg" with { "resolution-mode": "import" };
-     
-@@= skipped -10, +12 lines =@@
+
+
+ ==== /index.ts (3 errors) ====
+@@= skipped -10, +10 lines =@@
      
      import {type RequireInterface as Req} from "pkg" with { "resolution-mode": "require" };
                   ~~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
++!!! error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS1454: `resolution-mode` can only be set for type-only imports.
-+                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +!!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
      import {type ImportInterface as Imp} from "pkg" with { "resolution-mode": "import" };
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS1454: `resolution-mode` can only be set for type-only imports.
-+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +!!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
      export interface Loc extends Req, Imp {}
      
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt
index cdcf8ef5f9..3f220a9841 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt
@@ -1,35 +1,26 @@
 /index.ts(2,45): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(2,45): error TS2857: Import attributes cannot be used with type-only imports or exports.
 /index.ts(2,71): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(4,10): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(4,39): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(4,10): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(4,39): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(6,76): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,76): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
-==== /index.ts (8 errors) ====
+==== /index.ts (5 errors) ====
     // incorrect mode
     import type { RequireInterface } from "pkg" with { "resolution-mode": "foobar" };
                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
                                                                           ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     // not type-only
     import { ImportInterface } from "pkg" with { "resolution-mode": "import" };
              ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     // not exclusively type-only
     import {type RequireInterface as Req, RequireInterface as Req2} from "pkg" with { "resolution-mode": "require" };
                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt.diff
index 7c1fc3c7c4..bd404a128a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt.diff
@@ -2,39 +2,18 @@
 +++ new.nodeModulesImportAttributesModeDeclarationEmitErrors(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
  /index.ts(2,45): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(2,45): error TS2857: Import attributes cannot be used with type-only imports or exports.
  /index.ts(2,71): error TS1453: `resolution-mode` should be either `require` or `import`.
 -/index.ts(4,10): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+/index.ts(4,10): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(4,39): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(4,10): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(4,39): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(6,76): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,76): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
-
--==== /index.ts (5 errors) ====
-+==== /index.ts (8 errors) ====
-     // incorrect mode
-     import type { RequireInterface } from "pkg" with { "resolution-mode": "foobar" };
-                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-                                                                           ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
+@@= skipped -14, +14 lines =@@
      // not type-only
      import { ImportInterface } from "pkg" with { "resolution-mode": "import" };
               ~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     // not exclusively type-only
-     import {type RequireInterface as Req, RequireInterface as Req2} from "pkg" with { "resolution-mode": "require" };
-+                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     
\ No newline at end of file
+     // not exclusively type-only
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt
index ffcf4f3a40..6ac04663a5 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt
@@ -1,35 +1,26 @@
 /index.ts(2,45): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(2,45): error TS2857: Import attributes cannot be used with type-only imports or exports.
 /index.ts(2,71): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(4,10): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(4,39): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(4,10): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(4,39): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(6,76): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,76): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
 
 
-==== /index.ts (8 errors) ====
+==== /index.ts (5 errors) ====
     // incorrect mode
     import type { RequireInterface } from "pkg" with { "resolution-mode": "foobar" };
                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
                                                                           ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     // not type-only
     import { ImportInterface } from "pkg" with { "resolution-mode": "import" };
              ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
     // not exclusively type-only
     import {type RequireInterface as Req, RequireInterface as Req2} from "pkg" with { "resolution-mode": "require" };
                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
index 963f79e8be..c1489b3e10 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
@@ -2,39 +2,18 @@
 +++ new.nodeModulesImportAttributesModeDeclarationEmitErrors(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
  /index.ts(2,45): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(2,45): error TS2857: Import attributes cannot be used with type-only imports or exports.
  /index.ts(2,71): error TS1453: `resolution-mode` should be either `require` or `import`.
 -/index.ts(4,10): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+/index.ts(4,10): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(4,39): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(4,10): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(4,39): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(6,76): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,76): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
 
-
--==== /index.ts (5 errors) ====
-+==== /index.ts (8 errors) ====
-     // incorrect mode
-     import type { RequireInterface } from "pkg" with { "resolution-mode": "foobar" };
-                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-+                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-                                                                           ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
+@@= skipped -14, +14 lines =@@
      // not type-only
      import { ImportInterface } from "pkg" with { "resolution-mode": "import" };
               ~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-     // not exclusively type-only
-     import {type RequireInterface as Req, RequireInterface as Req2} from "pkg" with { "resolution-mode": "require" };
-+                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls.
-     
\ No newline at end of file
+     // not exclusively type-only
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
index 1da72c6e35..ef460683d2 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
@@ -1,21 +1,18 @@
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
-/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
+/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 
 
-==== /index.ts (3 errors) ====
+==== /index.ts (2 errors) ====
     export type LocalInterface =
         & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
         & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-                                                                 ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
     export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                            ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+                 ~
+!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt.diff
index bcd9e7c40b..aad868282f 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt.diff
@@ -2,24 +2,21 @@
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
-+/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
++/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 +
 +
-+==== /index.ts (3 errors) ====
++==== /index.ts (2 errors) ====
 +    export type LocalInterface =
 +        & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
 +        & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                 ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +    
 +    export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 +    export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                            ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++                 ~
++!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 +    
 +==== /node_modules/pkg/package.json (0 errors) ====
 +    {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
index 592891f09d..87596d3f45 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
@@ -23,22 +23,14 @@ export const b = (null as any as import("pkg", { with: {"resolution-mode": "impo
 
 
 //// [index.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.b = exports.a = void 0;
 exports.a = null;
 exports.b = null;
-||||||| 2303c3a6e
-export const a = null;
-export const b = null;
-=======
-export const a = null;
-export const b = null;
 
 
 //// [index.d.ts]
 export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 export declare const a: any;
 export declare const b: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js.diff
index 3675737a12..94de20976a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js.diff
@@ -1,52 +1,10 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).js
-<<<<<<< HEAD
-@@= skipped -27, +27 lines =@@
- exports.b = exports.a = void 0;
- exports.a = null;
- exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-||||||| 2303c3a6e
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-+export const a = null;
-+export const b = null;
-=======
-@@= skipped -22, +22 lines =@@
-
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
-
+@@= skipped -31, +31 lines =@@
 
  //// [index.d.ts]
  export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 +export declare const a: any;
-+export declare const b: any;
->>>>>>> main
++export declare const b: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols.diff
deleted file mode 100644
index f33d87c5b7..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols
-+++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).symbols
-@@= skipped -7, +7 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
-
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
-
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
index 9b27c09c78..89e27944a1 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
index eaa4b61be1..3201686f61 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types.diff
@@ -1,62 +1,24 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=node16).types
-<<<<<<< HEAD
 @@= skipped -7, +7 lines =@@
-||||||| 2303c3a6e
-@@= skipped -1, +1 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
-=======
-@@= skipped -1, +1 lines =@@
-
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
-
-     & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
->>>>>>> main
      & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : ImportInterface
-+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
-+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
  >null as any : any
-<<<<<<< HEAD
- 
- === /node_modules/pkg/import.d.ts ===
-||||||| 2303c3a6e
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
-=======
-
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
 
- export interface RequireInterface {}
->>>>>>> main
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
index 1da72c6e35..ef460683d2 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
@@ -1,21 +1,18 @@
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
-/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
+/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 
 
-==== /index.ts (3 errors) ====
+==== /index.ts (2 errors) ====
     export type LocalInterface =
         & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
         & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-                                                                 ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
     export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                            ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+                 ~
+!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt.diff
index cadd07bec3..0bd7200362 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt.diff
@@ -2,24 +2,21 @@
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
-+/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
++/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 +
 +
-+==== /index.ts (3 errors) ====
++==== /index.ts (2 errors) ====
 +    export type LocalInterface =
 +        & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
 +        & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                 ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +    
 +    export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 +    export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                            ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++                 ~
++!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 +    
 +==== /node_modules/pkg/package.json (0 errors) ====
 +    {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
index 592891f09d..87596d3f45 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
@@ -23,22 +23,14 @@ export const b = (null as any as import("pkg", { with: {"resolution-mode": "impo
 
 
 //// [index.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.b = exports.a = void 0;
 exports.a = null;
 exports.b = null;
-||||||| 2303c3a6e
-export const a = null;
-export const b = null;
-=======
-export const a = null;
-export const b = null;
 
 
 //// [index.d.ts]
 export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 export declare const a: any;
 export declare const b: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js.diff
index d3be057029..c5d8cd42c9 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js.diff
@@ -1,52 +1,10 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).js
-<<<<<<< HEAD
-@@= skipped -27, +27 lines =@@
- exports.b = exports.a = void 0;
- exports.a = null;
- exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-||||||| 2303c3a6e
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-+export const a = null;
-+export const b = null;
-=======
-@@= skipped -22, +22 lines =@@
-
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
-
+@@= skipped -31, +31 lines =@@
 
  //// [index.d.ts]
  export type LocalInterface = import("pkg", { with: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 +export declare const a: any;
-+export declare const b: any;
->>>>>>> main
++export declare const b: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols.diff
deleted file mode 100644
index d428ae2a2d..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols
-+++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).symbols
-@@= skipped -7, +7 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
-
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
-
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
index 9b27c09c78..89e27944a1 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
index f20681c47f..bb32c4d644 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types.diff
@@ -1,62 +1,24 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmit(module=nodenext).types
-<<<<<<< HEAD
 @@= skipped -7, +7 lines =@@
-||||||| 2303c3a6e
-@@= skipped -1, +1 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
-=======
-@@= skipped -1, +1 lines =@@
-
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
-
-     & import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface
->>>>>>> main
      & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : ImportInterface
-+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
-+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
  >null as any : any
-<<<<<<< HEAD
- 
- === /node_modules/pkg/import.d.ts ===
-||||||| 2303c3a6e
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
-=======
-
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
 
- export interface RequireInterface {}
->>>>>>> main
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
index 89a88f158d..bf0d41d6ce 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
@@ -1,12 +1,7 @@
 /index.ts(2,49): error TS1453: `resolution-mode` should be either `require` or `import`.
-<<<<<<< HEAD
-||||||| 2303c3a6e
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-=======
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
->>>>>>> main
+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /index.ts(5,76): error TS1453: `resolution-mode` should be either `require` or `import`.
+/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(3,22): error TS1005: 'with' expected.
 /other.ts(3,39): error TS1005: ';' expected.
@@ -37,7 +32,7 @@
 /other2.ts(3,30): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
 /other2.ts(4,30): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
 /other2.ts(4,50): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /other2.ts(6,57): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
 /other2.ts(7,57): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
 /other2.ts(7,77): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -78,7 +73,7 @@
 /other5.ts(2,29): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
 /other5.ts(3,29): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
 /other5.ts(3,35): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /other5.ts(5,56): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
 /other5.ts(6,56): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
 /other5.ts(6,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -99,13 +94,7 @@
 ==== /node_modules/pkg/require.d.ts (0 errors) ====
     export interface RequireInterface {}
     
-<<<<<<< HEAD
-==== /index.ts (2 errors) ====
-||||||| 2303c3a6e
 ==== /index.ts (4 errors) ====
-=======
-==== /index.ts (5 errors) ====
->>>>>>> main
     export type LocalInterface =
         & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
                                                     ~~~~~~~~
@@ -114,10 +103,12 @@
     
     export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                                ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+                 ~
+!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
     
 ==== /other.ts (27 errors) ====
     // missing with:
@@ -199,7 +190,7 @@
     
     export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                             ~~~~~
 !!! error TS1463: 'resolution-mode' is the only valid key for type import attributes.
     export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
@@ -319,7 +310,7 @@
     
     export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                            ~~
 !!! error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
     export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt.diff
index eb34e38a5a..8f864ae4ee 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt.diff
@@ -2,53 +2,25 @@
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
  /index.ts(2,49): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /index.ts(5,76): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
  /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
  /other.ts(3,22): error TS1005: 'with' expected.
  /other.ts(3,39): error TS1005: ';' expected.
-@@= skipped -7, +10 lines =@@
- /other.ts(3,52): error TS1128: Declaration or statement expected.
- /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
- /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
--/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(6,49): error TS1005: 'with' expected.
- /other.ts(6,66): error TS1005: ';' expected.
-@@= skipped -22, +22 lines =@@
+@@= skipped -29, +31 lines =@@
  /other2.ts(3,30): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
  /other2.ts(4,30): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
  /other2.ts(4,50): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /other2.ts(6,57): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
  /other2.ts(7,57): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
  /other2.ts(7,77): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-@@= skipped -10, +11 lines =@@
- /other3.ts(3,56): error TS1128: Declaration or statement expected.
- /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'.
- /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
--/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other3.ts(6,48): error TS1005: '{' expected.
- /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
-@@= skipped -16, +16 lines =@@
- /other4.ts(6,32): error TS1128: Declaration or statement expected.
- /other4.ts(6,33): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
- /other4.ts(7,21): error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
--/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other4.ts(9,48): error TS1005: '{' expected.
- /other4.ts(9,58): error TS1005: ',' expected.
-@@= skipped -14, +14 lines =@@
+@@= skipped -40, +41 lines =@@
  /other5.ts(2,29): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
  /other5.ts(3,29): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
  /other5.ts(3,35): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /other5.ts(5,56): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
  /other5.ts(6,56): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
  /other5.ts(6,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -57,36 +29,25 @@
      export interface RequireInterface {}
      
 -==== /index.ts (2 errors) ====
-+==== /index.ts (5 errors) ====
++==== /index.ts (4 errors) ====
      export type LocalInterface =
          & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
                                                      ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
+@@= skipped -8, +8 lines =@@
          & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                 ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
      export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                                 ~~~~~~~~
  !!! error TS1453: `resolution-mode` should be either `require` or `import`.
      export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                            ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++                 ~
++!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
      
  ==== /other.ts (27 errors) ====
      // missing with:
-@@= skipped -35, +41 lines =@@
-                          ~~~~~~~~~~~~~~~~~
- !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
-                                      ~~~~~~~~~~~~~~~
-@@= skipped -43, +43 lines =@@
+@@= skipped -70, +74 lines =@@
                                                                                                   ~
  !!! error TS1128: Declaration or statement expected.
      
@@ -100,29 +61,11 @@
      
      export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                              ~~~~~
  !!! error TS1463: 'resolution-mode' is the only valid key for type import attributes.
      export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
-@@= skipped -29, +31 lines =@@
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
-                                                            ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -50, +50 lines =@@
- !!! error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
- !!! related TS2728 /other4.ts:10:48: 'Attribute2' is declared here.
-                                     ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", Attribute1).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -27, +27 lines =@@
+@@= skipped -106, +108 lines =@@
                                                                                ~
  !!! error TS1005: ',' expected.
      
@@ -136,7 +79,7 @@
      
      export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                             ~~
  !!! error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
      export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
index 654d2ba2c6..bf9cb6507b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
@@ -118,18 +118,11 @@ exports.RequireInterface
 exports.a = null;
 exports.b = null;
 //// [other5.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.b = exports.a = void 0;
 exports.a = null;
 exports.b = null;
-||||||| 2303c3a6e
-export const a = null;
-export const b = null;
-=======
-export const a = null;
-export const b = null;
 
 
 //// [index.d.ts]
@@ -161,4 +154,3 @@ export declare const b: any, Attribute2: any, ImportInterface: any;
 export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
 export declare const a: any;
 export declare const b: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js.diff
index 0ea538045d..00ad8695b0 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js.diff
@@ -1,211 +1,6 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).js
-<<<<<<< HEAD
-@@= skipped -122, +122 lines =@@
- exports.b = exports.a = void 0;
- exports.a = null;
- exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { with: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--//// [other.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any;
--export declare const b: any;
--//// [other2.d.ts]
--export type LocalInterface = import("pkg", { with: { "bad": "require" } }).RequireInterface & import("pkg", { with: { "bad": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
--//// [other3.d.ts]
--export type LocalInterface = import("pkg", { with: {} })[{
--    "resolution-mode": "require";
--}];
--export declare const a: any;
--export declare const b: any;
--//// [other4.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any, Attribute1: any, RequireInterface: any;
--export declare const b: any, Attribute2: any, ImportInterface: any;
--//// [other5.d.ts]
--export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
-||||||| 2303c3a6e
-@@= skipped -70, +70 lines =@@
- export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Attribute2 = exports.b = exports.RequireInterface = exports.Attribute1 = exports.a = void 0;
--exports.Attribute1;
--exports.RequireInterface
--    & import("pkg", exports.Attribute2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Attribute1;
-+RequireInterface
-+    & import("pkg", Attribute2).ImportInterface;
-+export const a = null, Attribute1, RequireInterface;
-+export const b = null, Attribute2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { with: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--//// [other.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any;
--export declare const b: any;
--//// [other2.d.ts]
--export type LocalInterface = import("pkg", { with: { "bad": "require" } }).RequireInterface & import("pkg", { with: { "bad": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
--//// [other3.d.ts]
--export type LocalInterface = import("pkg", { with: {} })[{
--    "resolution-mode": "require";
--}];
--export declare const a: any;
--export declare const b: any;
--//// [other4.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any, Attribute1: any, RequireInterface: any;
--export declare const b: any, Attribute2: any, ImportInterface: any;
--//// [other5.d.ts]
--export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
-+export const a = null;
-+export const b = null;
-=======
-@@= skipped -70, +70 lines =@@
- export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Attribute2 = exports.b = exports.RequireInterface = exports.Attribute1 = exports.a = void 0;
--exports.Attribute1;
--exports.RequireInterface
--    & import("pkg", exports.Attribute2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Attribute1;
-+RequireInterface
-+    & import("pkg", Attribute2).ImportInterface;
-+export const a = null, Attribute1, RequireInterface;
-+export const b = null, Attribute2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
-
+@@= skipped -126, +126 lines =@@
 
  //// [index.d.ts]
  export type LocalInterface = import("pkg", { with: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
@@ -229,11 +24,10 @@
  export type LocalInterface = import("pkg", { with: {} })[{
      "resolution-mode": "require";
  }];
-@@= skipped -78, +63 lines =@@
+@@= skipped -22, +25 lines =@@
  export declare const b: any, Attribute2: any, ImportInterface: any;
  //// [other5.d.ts]
  export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 +export declare const a: any;
- export declare const b: any;
->>>>>>> main
+ export declare const b: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
index d9a9b5ffea..36cde83671 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols.diff
@@ -1,47 +1,7 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).symbols
-<<<<<<< HEAD
 @@= skipped -32, +32 lines =@@
- 
-||||||| 2303c3a6e
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- === /other.ts ===
- // missing with:
-@@= skipped -9, +8 lines =@@
- 
-=======
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
-
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- === /other.ts ===
- // missing with:
-@@= skipped -9, +8 lines =@@
-
->>>>>>> main
      & import("pkg", {"resolution-mode": "require"}).RequireInterface
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 ->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
index c8610786a4..460aa831da 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
@@ -16,15 +16,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -40,13 +40,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -80,9 +74,9 @@ export type LocalInterface =
     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
@@ -103,13 +97,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -157,13 +145,7 @@ export type LocalInterface =
 
     & import("pkg", Attribute2).ImportInterface;
 >import("pkg", Attribute2).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Attribute2 : any
 >ImportInterface : any
@@ -192,9 +174,9 @@ export type LocalInterface =
     & import("pkg", { with: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { with: {} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { with: {} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { with: {} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { with: {} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
index 244f6d93be..4b858e69bb 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types.diff
@@ -1,113 +1,55 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node16).types
-<<<<<<< HEAD
 @@= skipped -15, +15 lines =@@
-||||||| 2303c3a6e
-@@= skipped -9, +9 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
-=======
-@@= skipped -9, +9 lines =@@
-
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
-
-     & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
->>>>>>> main
      & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : ImportInterface
-+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
-+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
  >null as any : any
 
  === /other.ts ===
-<<<<<<< HEAD
-@@= skipped -58, +58 lines =@@
-||||||| 2303c3a6e
-@@= skipped -30, +30 lines =@@
- 
-     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
- >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
- >"resolution-mode" : string
-@@= skipped -34, +34 lines =@@
-=======
-@@= skipped -30, +30 lines =@@
+@@= skipped -24, +24 lines =@@
 
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
  >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
 ->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
  >"resolution-mode" : string
 @@= skipped -34, +34 lines =@@
->>>>>>> main
      & import("pkg", { with: {"bad": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
-<<<<<<< HEAD
-@@= skipped -100, +100 lines =@@
-||||||| 2303c3a6e
-@@= skipped -23, +23 lines =@@
- 
-     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
- >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
-@@= skipped -48, +48 lines =@@
- 
-     & import("pkg", Attribute2).ImportInterface;
- >import("pkg", Attribute2).ImportInterface : any
-->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >Attribute2 : any
- >ImportInterface : any
-@@= skipped -29, +29 lines =@@
-=======
 @@= skipped -23, +23 lines =@@
 
      & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
  >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
 ->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -116,21 +58,20 @@
      & import("pkg", Attribute2).ImportInterface;
  >import("pkg", Attribute2).ImportInterface : any
 ->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >Attribute2 : any
  >ImportInterface : any
 @@= skipped -29, +29 lines =@@
->>>>>>> main
      & import("pkg", { with: {} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { with: {} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { with: {} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { with: {} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { with: {} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
index 483ea4bb8e..31e3fc5e45 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
@@ -1,12 +1,7 @@
 /index.ts(2,49): error TS1453: `resolution-mode` should be either `require` or `import`.
-<<<<<<< HEAD
-||||||| 2303c3a6e
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-=======
-/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
->>>>>>> main
+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /index.ts(5,76): error TS1453: `resolution-mode` should be either `require` or `import`.
+/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(3,22): error TS1005: 'with' expected.
 /other.ts(3,39): error TS1005: ';' expected.
@@ -37,7 +32,7 @@
 /other2.ts(3,30): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
 /other2.ts(4,30): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
 /other2.ts(4,50): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /other2.ts(6,57): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
 /other2.ts(7,57): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
 /other2.ts(7,77): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -81,7 +76,7 @@
 /other5.ts(2,29): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
 /other5.ts(3,29): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
 /other5.ts(3,35): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /other5.ts(5,56): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
 /other5.ts(6,56): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
 /other5.ts(6,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -102,13 +97,7 @@
 ==== /node_modules/pkg/require.d.ts (0 errors) ====
     export interface RequireInterface {}
     
-<<<<<<< HEAD
-==== /index.ts (2 errors) ====
-||||||| 2303c3a6e
 ==== /index.ts (4 errors) ====
-=======
-==== /index.ts (5 errors) ====
->>>>>>> main
     export type LocalInterface =
         & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
                                                     ~~~~~~~~
@@ -117,10 +106,12 @@
     
     export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                                ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
+                 ~
+!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
     
 ==== /other.ts (27 errors) ====
     // missing with:
@@ -202,7 +193,7 @@
     
     export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                             ~~~~~
 !!! error TS1463: 'resolution-mode' is the only valid key for type import attributes.
     export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
@@ -325,7 +316,7 @@
     
     export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                            ~~
 !!! error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
     export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
index 9bf4ad8ff8..00076f23f8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt.diff
@@ -2,53 +2,25 @@
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
  /index.ts(2,49): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(3,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /index.ts(5,76): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(6,89): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
  /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
  /other.ts(3,22): error TS1005: 'with' expected.
  /other.ts(3,39): error TS1005: ';' expected.
-@@= skipped -7, +10 lines =@@
- /other.ts(3,52): error TS1128: Declaration or statement expected.
- /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
- /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
--/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(6,49): error TS1005: 'with' expected.
- /other.ts(6,66): error TS1005: ';' expected.
-@@= skipped -22, +22 lines =@@
+@@= skipped -29, +31 lines =@@
  /other2.ts(3,30): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
  /other2.ts(4,30): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
  /other2.ts(4,50): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /other2.ts(6,57): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
  /other2.ts(7,57): error TS1463: 'resolution-mode' is the only valid key for type import attributes.
  /other2.ts(7,77): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-@@= skipped -13, +14 lines =@@
-   Types of property 'with' are incompatible.
-     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
-       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
--/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other3.ts(6,48): error TS1005: '{' expected.
- /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
-@@= skipped -16, +16 lines =@@
- /other4.ts(6,32): error TS1128: Declaration or statement expected.
- /other4.ts(6,33): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
- /other4.ts(7,21): error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
--/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other4.ts(9,48): error TS1005: '{' expected.
- /other4.ts(9,58): error TS1005: ',' expected.
-@@= skipped -14, +14 lines =@@
+@@= skipped -43, +44 lines =@@
  /other5.ts(2,29): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
  /other5.ts(3,29): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
  /other5.ts(3,35): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /other5.ts(5,56): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
  /other5.ts(6,56): error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
  /other5.ts(6,62): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -57,36 +29,25 @@
      export interface RequireInterface {}
      
 -==== /index.ts (2 errors) ====
-+==== /index.ts (5 errors) ====
++==== /index.ts (4 errors) ====
      export type LocalInterface =
          & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
                                                      ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
+@@= skipped -8, +8 lines =@@
          & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                 ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
      export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                                 ~~~~~~~~
  !!! error TS1453: `resolution-mode` should be either `require` or `import`.
      export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                            ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++                 ~
++!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
      
  ==== /other.ts (27 errors) ====
      // missing with:
-@@= skipped -35, +41 lines =@@
-                          ~~~~~~~~~~~~~~~~~
- !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
-                                      ~~~~~~~~~~~~~~~
-@@= skipped -43, +43 lines =@@
+@@= skipped -70, +74 lines =@@
                                                                                                   ~
  !!! error TS1128: Declaration or statement expected.
      
@@ -100,29 +61,11 @@
      
      export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                              ~~~~~
  !!! error TS1463: 'resolution-mode' is the only valid key for type import attributes.
      export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
-@@= skipped -32, +34 lines =@@
- !!! error TS2322:     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
- !!! error TS2322:       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
-                                                            ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -50, +50 lines =@@
- !!! error TS2448: Block-scoped variable 'Attribute2' used before its declaration.
- !!! related TS2728 /other4.ts:10:48: 'Attribute2' is declared here.
-                                     ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", Attribute1).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -27, +27 lines =@@
+@@= skipped -109, +111 lines =@@
                                                                                ~
  !!! error TS1005: ',' expected.
      
@@ -136,7 +79,7 @@
      
      export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                             ~~
  !!! error TS1464: Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.
      export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
index 654d2ba2c6..bf9cb6507b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
@@ -118,18 +118,11 @@ exports.RequireInterface
 exports.a = null;
 exports.b = null;
 //// [other5.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.b = exports.a = void 0;
 exports.a = null;
 exports.b = null;
-||||||| 2303c3a6e
-export const a = null;
-export const b = null;
-=======
-export const a = null;
-export const b = null;
 
 
 //// [index.d.ts]
@@ -161,4 +154,3 @@ export declare const b: any, Attribute2: any, ImportInterface: any;
 export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
 export declare const a: any;
 export declare const b: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js.diff
index 2cb0e3f339..570d79970e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js.diff
@@ -1,211 +1,6 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).js
-<<<<<<< HEAD
-@@= skipped -122, +122 lines =@@
- exports.b = exports.a = void 0;
- exports.a = null;
- exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { with: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--//// [other.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any;
--export declare const b: any;
--//// [other2.d.ts]
--export type LocalInterface = import("pkg", { with: { "bad": "require" } }).RequireInterface & import("pkg", { with: { "bad": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
--//// [other3.d.ts]
--export type LocalInterface = import("pkg", { with: {} })[{
--    "resolution-mode": "require";
--}];
--export declare const a: any;
--export declare const b: any;
--//// [other4.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any, Attribute1: any, RequireInterface: any;
--export declare const b: any, Attribute2: any, ImportInterface: any;
--//// [other5.d.ts]
--export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
-||||||| 2303c3a6e
-@@= skipped -70, +70 lines =@@
- export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Attribute2 = exports.b = exports.RequireInterface = exports.Attribute1 = exports.a = void 0;
--exports.Attribute1;
--exports.RequireInterface
--    & import("pkg", exports.Attribute2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Attribute1;
-+RequireInterface
-+    & import("pkg", Attribute2).ImportInterface;
-+export const a = null, Attribute1, RequireInterface;
-+export const b = null, Attribute2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { with: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--//// [other.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any;
--export declare const b: any;
--//// [other2.d.ts]
--export type LocalInterface = import("pkg", { with: { "bad": "require" } }).RequireInterface & import("pkg", { with: { "bad": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
--//// [other3.d.ts]
--export type LocalInterface = import("pkg", { with: {} })[{
--    "resolution-mode": "require";
--}];
--export declare const a: any;
--export declare const b: any;
--//// [other4.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any, Attribute1: any, RequireInterface: any;
--export declare const b: any, Attribute2: any, ImportInterface: any;
--//// [other5.d.ts]
--export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
-+export const a = null;
-+export const b = null;
-=======
-@@= skipped -70, +70 lines =@@
- export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Attribute2 = exports.b = exports.RequireInterface = exports.Attribute1 = exports.a = void 0;
--exports.Attribute1;
--exports.RequireInterface
--    & import("pkg", exports.Attribute2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Attribute1;
-+RequireInterface
-+    & import("pkg", Attribute2).ImportInterface;
-+export const a = null, Attribute1, RequireInterface;
-+export const b = null, Attribute2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
-
+@@= skipped -126, +126 lines =@@
 
  //// [index.d.ts]
  export type LocalInterface = import("pkg", { with: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
@@ -229,11 +24,10 @@
  export type LocalInterface = import("pkg", { with: {} })[{
      "resolution-mode": "require";
  }];
-@@= skipped -78, +63 lines =@@
+@@= skipped -22, +25 lines =@@
  export declare const b: any, Attribute2: any, ImportInterface: any;
  //// [other5.d.ts]
  export type LocalInterface = import("pkg", { with: {} }).RequireInterface & import("pkg", { with: {} }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 +export declare const a: any;
- export declare const b: any;
->>>>>>> main
+ export declare const b: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
index 5af8319a6f..732c0843bc 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols.diff
@@ -1,47 +1,7 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).symbols
-<<<<<<< HEAD
 @@= skipped -32, +32 lines =@@
- 
-||||||| 2303c3a6e
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- === /other.ts ===
- // missing with:
-@@= skipped -9, +8 lines =@@
- 
-=======
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
-     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
-
- export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- === /other.ts ===
- // missing with:
-@@= skipped -9, +8 lines =@@
-
->>>>>>> main
      & import("pkg", {"resolution-mode": "require"}).RequireInterface
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 ->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
index c8610786a4..460aa831da 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
@@ -16,15 +16,15 @@ export type LocalInterface =
     & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
->b : ImportInterface
->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -40,13 +40,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -80,9 +74,9 @@ export type LocalInterface =
     & import("pkg", { with: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
@@ -103,13 +97,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -157,13 +145,7 @@ export type LocalInterface =
 
     & import("pkg", Attribute2).ImportInterface;
 >import("pkg", Attribute2).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Attribute2 : any
 >ImportInterface : any
@@ -192,9 +174,9 @@ export type LocalInterface =
     & import("pkg", { with: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { with: {} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { with: {} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { with: {} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { with: {} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
index b1fb348aef..ca10fa5e46 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types.diff
@@ -1,113 +1,55 @@
 --- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
 +++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=nodenext).types
-<<<<<<< HEAD
 @@= skipped -15, +15 lines =@@
-||||||| 2303c3a6e
-@@= skipped -9, +9 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
-=======
-@@= skipped -9, +9 lines =@@
-
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
-
-     & import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface
->>>>>>> main
      & import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { with: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface);
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : ImportInterface
-+>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
-+>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { with: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
  >null as any : any
 
  === /other.ts ===
-<<<<<<< HEAD
-@@= skipped -58, +58 lines =@@
-||||||| 2303c3a6e
-@@= skipped -30, +30 lines =@@
- 
-     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
- >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
- >"resolution-mode" : string
-@@= skipped -34, +34 lines =@@
-=======
-@@= skipped -30, +30 lines =@@
+@@= skipped -24, +24 lines =@@
 
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
  >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
 ->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
  >"resolution-mode" : string
 @@= skipped -34, +34 lines =@@
->>>>>>> main
      & import("pkg", { with: {"bad": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { with: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { with: {"bad": "import"} }).ImportInterface);
-<<<<<<< HEAD
-@@= skipped -100, +100 lines =@@
-||||||| 2303c3a6e
-@@= skipped -23, +23 lines =@@
- 
-     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
- >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
-@@= skipped -48, +48 lines =@@
- 
-     & import("pkg", Attribute2).ImportInterface;
- >import("pkg", Attribute2).ImportInterface : any
-->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >Attribute2 : any
- >ImportInterface : any
-@@= skipped -29, +29 lines =@@
-=======
 @@= skipped -23, +23 lines =@@
 
      & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
  >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
 ->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -116,21 +58,20 @@
      & import("pkg", Attribute2).ImportInterface;
  >import("pkg", Attribute2).ImportInterface : any
 ->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", Attribute2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >Attribute2 : any
  >ImportInterface : any
 @@= skipped -29, +29 lines =@@
->>>>>>> main
      & import("pkg", { with: {} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { with: {} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { with: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { with: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { with: {} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { with: {} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { with: {} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { with: {} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { with: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
index 696905d303..01ab11630c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
@@ -1,11 +1,9 @@
-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(7,14): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
-==== /index.ts (5 errors) ====
+==== /index.ts (3 errors) ====
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
     
@@ -13,14 +11,10 @@
     
     import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     export interface Loc extends Req, Imp {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt.diff
index 2d717a14f7..f959ff1b49 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt.diff
@@ -1,32 +1,18 @@
 --- old.nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
 +++ new.nodeModulesImportModeDeclarationEmit1(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 -/index.ts(7,14): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(7,14): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(7,49): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
--==== /index.ts (3 errors) ====
-+==== /index.ts (5 errors) ====
-     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
-     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-     
-@@= skipped -10, +12 lines =@@
-     
-     import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
-                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-+                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+@@= skipped -13, +13 lines =@@
  !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
                   ~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
      export interface Loc extends Req, Imp {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
index 90ef0c9bb9..0643bf9338 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
@@ -1,11 +1,9 @@
-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,50): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(7,14): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(7,49): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 
 
-==== /index.ts (5 errors) ====
+==== /index.ts (3 errors) ====
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
     
@@ -13,14 +11,10 @@
     
     import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
     import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
                  ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
     export interface Loc extends Req, Imp {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt.diff
index 297d6a3961..aa03c3677a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt.diff
@@ -1,32 +1,18 @@
 --- old.nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
 +++ new.nodeModulesImportModeDeclarationEmit1(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,50): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 -/index.ts(7,14): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+/index.ts(7,14): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(7,14): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(7,49): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 
 
--==== /index.ts (3 errors) ====
-+==== /index.ts (5 errors) ====
-     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
-     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-     
-@@= skipped -10, +12 lines =@@
-     
-     import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
-                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-+                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+@@= skipped -13, +13 lines =@@
  !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
      import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
                   ~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
      export interface Loc extends Req, Imp {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt
index 5ae57bd7b6..fb5844e42a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt
@@ -1,11 +1,9 @@
-/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(6,14): error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
 /index.ts(6,50): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
-==== /index.ts (5 errors) ====
+==== /index.ts (3 errors) ====
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
     
@@ -13,15 +11,11 @@
     
     import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
                  ~~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     export interface Loc extends Req, Imp {}
     
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt.diff
index b99a0d0a75..6f5dbb3278 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt.diff
@@ -2,31 +2,16 @@
 +++ new.nodeModulesImportModeDeclarationEmit2(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -/index.ts(6,14): error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-+/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(6,14): error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
  /index.ts(6,50): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(7,49): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
-
--==== /index.ts (3 errors) ====
-+==== /index.ts (5 errors) ====
-     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
-     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-     
-@@= skipped -10, +12 lines =@@
+@@= skipped -10, +10 lines =@@
      
      import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
                   ~~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-+                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
-+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     export interface Loc extends Req, Imp {}
\ No newline at end of file
+     import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt
index d7ce0d7f94..de6f97f9ef 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt
@@ -1,11 +1,9 @@
-/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(6,14): error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
 /index.ts(6,50): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(7,49): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 
 
-==== /index.ts (5 errors) ====
+==== /index.ts (3 errors) ====
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
     
@@ -13,15 +11,11 @@
     
     import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
                  ~~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
-                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
     import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
     export interface Loc extends Req, Imp {}
     
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt.diff
index a4f36c4d7e..09b4b86b10 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt.diff
@@ -2,34 +2,26 @@
 +++ new.nodeModulesImportModeDeclarationEmit2(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -/index.ts(6,14): error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+/index.ts(6,14): error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
- /index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
+-/index.ts(6,50): error TS1454: `resolution-mode` can only be set for type-only imports.
+-/index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(6,14): error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
 +/index.ts(6,50): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
- /index.ts(7,49): error TS1454: `resolution-mode` can only be set for type-only imports.
--
--
--==== /index.ts (3 errors) ====
 +/index.ts(7,49): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-+
-+
-+==== /index.ts (5 errors) ====
-     import type { RequireInterface } from "pkg" assert { "resolution-mode": "require" };
-     import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
-     
-@@= skipped -10, +12 lines =@@
+
+
+ ==== /index.ts (3 errors) ====
+@@= skipped -10, +10 lines =@@
      
      import {type RequireInterface as Req} from "pkg" assert { "resolution-mode": "require" };
                   ~~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'RequireInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/import"' has no exported member 'RequireInterface'.
++!!! error TS2305: Module '"./node_modules/pkg/import.js"' has no exported member 'RequireInterface'.
                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS1454: `resolution-mode` can only be set for type-only imports.
-+                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +!!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
      import {type ImportInterface as Imp} from "pkg" assert { "resolution-mode": "import" };
                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS1454: `resolution-mode` can only be set for type-only imports.
-+                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
 +!!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
      export interface Loc extends Req, Imp {}
      
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt
index 01aa2ad23e..93d24de844 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt
@@ -1,35 +1,26 @@
 /index.ts(2,45): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(2,45): error TS2822: Import assertions cannot be used with type-only imports or exports.
 /index.ts(2,73): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(4,10): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(4,39): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(4,10): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(4,39): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-/index.ts(6,76): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,76): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
-==== /index.ts (8 errors) ====
+==== /index.ts (5 errors) ====
     // incorrect mode
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "foobar" };
                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
                                                                             ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     // not type-only
     import { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
              ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     // not exclusively type-only
     import {type RequireInterface as Req, RequireInterface as Req2} from "pkg" assert { "resolution-mode": "require" };
                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt.diff
index 1f78442a55..cf601b33a8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt.diff
@@ -2,39 +2,18 @@
 +++ new.nodeModulesImportModeDeclarationEmitErrors1(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
  /index.ts(2,45): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(2,45): error TS2822: Import assertions cannot be used with type-only imports or exports.
  /index.ts(2,73): error TS1453: `resolution-mode` should be either `require` or `import`.
 -/index.ts(4,10): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+/index.ts(4,10): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(4,39): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(4,10): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(4,39): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+/index.ts(6,76): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,76): error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
-
--==== /index.ts (5 errors) ====
-+==== /index.ts (8 errors) ====
-     // incorrect mode
-     import type { RequireInterface } from "pkg" assert { "resolution-mode": "foobar" };
-                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
-                                                                             ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
+@@= skipped -14, +14 lines =@@
      // not type-only
      import { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
               ~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     // not exclusively type-only
-     import {type RequireInterface as Req, RequireInterface as Req2} from "pkg" assert { "resolution-mode": "require" };
-+                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2821: Import assertions are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     
\ No newline at end of file
+     // not exclusively type-only
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt
index 183bbed98f..430b622f9e 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt
@@ -1,35 +1,26 @@
-/index.ts(2,45): error TS2822: Import assertions cannot be used with type-only imports or exports.
 /index.ts(2,45): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 /index.ts(2,73): error TS1453: `resolution-mode` should be either `require` or `import`.
-/index.ts(4,10): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(4,39): error TS1454: `resolution-mode` can only be set for type-only imports.
+/index.ts(4,10): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
 /index.ts(4,39): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-/index.ts(6,76): error TS1454: `resolution-mode` can only be set for type-only imports.
 /index.ts(6,76): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 
 
-==== /index.ts (8 errors) ====
+==== /index.ts (5 errors) ====
     // incorrect mode
     import type { RequireInterface } from "pkg" assert { "resolution-mode": "foobar" };
                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
-                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
                                                                             ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     // not type-only
     import { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
              ~~~~~~~~~~~~~~~
-!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
+!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
     // not exclusively type-only
     import {type RequireInterface as Req, RequireInterface as Req2} from "pkg" assert { "resolution-mode": "require" };
                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
     
     export interface LocalInterface extends RequireInterface, ImportInterface {}
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
index 36271505b5..9fbc90e5dd 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
@@ -1,40 +1,19 @@
 --- old.nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt
 +++ new.nodeModulesImportModeDeclarationEmitErrors1(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
-+/index.ts(2,45): error TS2822: Import assertions cannot be used with type-only imports or exports.
  /index.ts(2,45): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
  /index.ts(2,73): error TS1453: `resolution-mode` should be either `require` or `import`.
 -/index.ts(4,10): error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+/index.ts(4,10): error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(4,39): error TS1454: `resolution-mode` can only be set for type-only imports.
++/index.ts(4,10): error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
  /index.ts(4,39): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-+/index.ts(6,76): error TS1454: `resolution-mode` can only be set for type-only imports.
  /index.ts(6,76): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
 
-
--==== /index.ts (5 errors) ====
-+==== /index.ts (8 errors) ====
-     // incorrect mode
-     import type { RequireInterface } from "pkg" assert { "resolution-mode": "foobar" };
-                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2822: Import assertions cannot be used with type-only imports or exports.
-+                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-                                                                             ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
+@@= skipped -14, +14 lines =@@
      // not type-only
      import { ImportInterface } from "pkg" assert { "resolution-mode": "import" };
               ~~~~~~~~~~~~~~~
 -!!! error TS2305: Module '"pkg"' has no exported member 'ImportInterface'.
-+!!! error TS2305: Module '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
++!!! error TS2305: Module '"./node_modules/pkg/require"' has no exported member 'ImportInterface'.
                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-     // not exclusively type-only
-     import {type RequireInterface as Req, RequireInterface as Req2} from "pkg" assert { "resolution-mode": "require" };
-+                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS1454: `resolution-mode` can only be set for type-only imports.
-                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls.
-     
\ No newline at end of file
+     // not exclusively type-only
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
index 4b70c08063..a265a80b26 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
@@ -1,21 +1,18 @@
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
-/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
+/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 
 
-==== /index.ts (3 errors) ====
+==== /index.ts (2 errors) ====
     export type LocalInterface =
         & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
         & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-                                                                   ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
     export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                              ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+                 ~
+!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt.diff
index e3894ae7d7..0c3ce0661a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt.diff
@@ -2,24 +2,21 @@
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
-+/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
++/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 +
 +
-+==== /index.ts (3 errors) ====
++==== /index.ts (2 errors) ====
 +    export type LocalInterface =
 +        & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
 +        & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                   ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +    
 +    export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 +    export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                              ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++                 ~
++!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 +    
 +==== /node_modules/pkg/package.json (0 errors) ====
 +    {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
index d66f4aab18..100de5460a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
@@ -23,22 +23,14 @@ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "im
 
 
 //// [index.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.b = exports.a = void 0;
 exports.a = null;
 exports.b = null;
-||||||| 2303c3a6e
-export const a = null;
-export const b = null;
-=======
-export const a = null;
-export const b = null;
 
 
 //// [index.d.ts]
 export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 export declare const a: any;
 export declare const b: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js.diff
index bb7893b846..719fb56387 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).js.diff
@@ -1,52 +1,10 @@
 --- old.nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).js
-<<<<<<< HEAD
-@@= skipped -27, +27 lines =@@
- exports.b = exports.a = void 0;
- exports.a = null;
- exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-||||||| 2303c3a6e
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-+export const a = null;
-+export const b = null;
-=======
-@@= skipped -22, +22 lines =@@
-
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
-
+@@= skipped -31, +31 lines =@@
 
  //// [index.d.ts]
  export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 +export declare const a: any;
-+export declare const b: any;
->>>>>>> main
++export declare const b: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols.diff
deleted file mode 100644
index 2090dd9b4b..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols
-+++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).symbols
-@@= skipped -7, +7 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
-
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
-
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
index a82b61c763..2925d32462 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
index 8900f0c76c..cbb019b25c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=node16).types.diff
@@ -1,62 +1,24 @@
 --- old.nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=node16).types
-<<<<<<< HEAD
 @@= skipped -7, +7 lines =@@
-||||||| 2303c3a6e
-@@= skipped -1, +1 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
-=======
-@@= skipped -1, +1 lines =@@
-
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
-
-     & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
->>>>>>> main
      & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : ImportInterface
-+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
-+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
  >null as any : any
-<<<<<<< HEAD
- 
- === /node_modules/pkg/import.d.ts ===
-||||||| 2303c3a6e
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
-=======
-
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
 
- export interface RequireInterface {}
->>>>>>> main
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
index 4b70c08063..a265a80b26 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
@@ -1,21 +1,18 @@
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
-/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
+/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 
 
-==== /index.ts (3 errors) ====
+==== /index.ts (2 errors) ====
     export type LocalInterface =
         & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
         & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-                                                                   ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
     
     export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
     export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-                                                                                              ~~~~~~~~~~~~~~~
-!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
+                 ~
+!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
     
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt.diff
index e8ebc582fa..1db011617b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt.diff
@@ -2,24 +2,21 @@
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
-+/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
++/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 +
 +
-+==== /index.ts (3 errors) ====
++==== /index.ts (2 errors) ====
 +    export type LocalInterface =
 +        & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
 +        & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                   ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
 +    
 +    export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 +    export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                              ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++                 ~
++!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 +    
 +==== /node_modules/pkg/package.json (0 errors) ====
 +    {
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
index d66f4aab18..100de5460a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
@@ -23,22 +23,14 @@ export const b = (null as any as import("pkg", { assert: {"resolution-mode": "im
 
 
 //// [index.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.b = exports.a = void 0;
 exports.a = null;
 exports.b = null;
-||||||| 2303c3a6e
-export const a = null;
-export const b = null;
-=======
-export const a = null;
-export const b = null;
 
 
 //// [index.d.ts]
 export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 export declare const a: any;
 export declare const b: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js.diff
index 8b06b43983..24e7c5125c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js.diff
@@ -1,52 +1,10 @@
 --- old.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).js
-<<<<<<< HEAD
-@@= skipped -27, +27 lines =@@
- exports.b = exports.a = void 0;
- exports.a = null;
- exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-||||||| 2303c3a6e
-@@= skipped -22, +22 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
-+export const a = null;
-+export const b = null;
-=======
-@@= skipped -22, +22 lines =@@
-
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
-
+@@= skipped -31, +31 lines =@@
 
  //// [index.d.ts]
  export type LocalInterface = import("pkg", { assert: { "resolution-mode": "require" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 -export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
 +export declare const a: any;
-+export declare const b: any;
->>>>>>> main
++export declare const b: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols.diff
deleted file mode 100644
index ba6da4eb62..0000000000
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols
-+++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).symbols
-@@= skipped -7, +7 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
-
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
-
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
--
--=== /node_modules/pkg/import.d.ts ===
--export interface ImportInterface {}
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- === /node_modules/pkg/require.d.ts ===
- export interface RequireInterface {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
index a82b61c763..2925d32462 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
@@ -8,15 +8,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /node_modules/pkg/import.d.ts ===
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
index b47c7f86e4..d243a675c8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types.diff
@@ -1,62 +1,24 @@
 --- old.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
 +++ new.nodeModulesImportTypeModeDeclarationEmit1(module=nodenext).types
-<<<<<<< HEAD
 @@= skipped -7, +7 lines =@@
-||||||| 2303c3a6e
-@@= skipped -1, +1 lines =@@
- 
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
-=======
-@@= skipped -1, +1 lines =@@
-
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
-
-     & import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface
->>>>>>> main
      & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : ImportInterface
-+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
-+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
  >null as any : any
-<<<<<<< HEAD
- 
- === /node_modules/pkg/import.d.ts ===
-||||||| 2303c3a6e
- 
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
- 
- export interface RequireInterface {}
-=======
-
--=== /node_modules/pkg/import.d.ts ===
--
--export interface ImportInterface {}
- === /node_modules/pkg/require.d.ts ===
 
- export interface RequireInterface {}
->>>>>>> main
+ === /node_modules/pkg/import.d.ts ===
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
index d8be46dbe9..6cf43c6f83 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
@@ -1,12 +1,7 @@
 /index.ts(2,51): error TS1453: `resolution-mode` should be either `require` or `import`.
-<<<<<<< HEAD
-||||||| 2303c3a6e
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-=======
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
->>>>>>> main
+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /index.ts(5,78): error TS1453: `resolution-mode` should be either `require` or `import`.
+/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(3,22): error TS1005: 'with' expected.
 /other.ts(3,39): error TS1005: ';' expected.
@@ -37,7 +32,7 @@
 /other2.ts(3,32): error TS1455: `resolution-mode` is the only valid key for type import assertions.
 /other2.ts(4,32): error TS1455: `resolution-mode` is the only valid key for type import assertions.
 /other2.ts(4,52): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /other2.ts(6,59): error TS1455: `resolution-mode` is the only valid key for type import assertions.
 /other2.ts(7,59): error TS1455: `resolution-mode` is the only valid key for type import assertions.
 /other2.ts(7,79): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -78,7 +73,7 @@
 /other5.ts(2,31): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
 /other5.ts(3,31): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
 /other5.ts(3,37): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /other5.ts(5,58): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
 /other5.ts(6,58): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
 /other5.ts(6,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -97,13 +92,7 @@
     export interface ImportInterface {}
 ==== /node_modules/pkg/require.d.ts (0 errors) ====
     export interface RequireInterface {}
-<<<<<<< HEAD
-==== /index.ts (2 errors) ====
-||||||| 2303c3a6e
 ==== /index.ts (4 errors) ====
-=======
-==== /index.ts (5 errors) ====
->>>>>>> main
     export type LocalInterface =
         & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
                                                       ~~~~~~~~
@@ -112,10 +101,12 @@
     
     export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                                  ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+                 ~
+!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 ==== /other.ts (27 errors) ====
     // missing assert:
     export type LocalInterface =
@@ -195,7 +186,7 @@
     
     export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                               ~~~~~
 !!! error TS1455: `resolution-mode` is the only valid key for type import assertions.
     export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
@@ -312,7 +303,7 @@
     
     export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                              ~~
 !!! error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
     export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt.diff
index 9b23c65515..65c82303f8 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt.diff
@@ -2,53 +2,25 @@
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).errors.txt
 @@= skipped -0, +0 lines =@@
  /index.ts(2,51): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /index.ts(5,78): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
  /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
  /other.ts(3,22): error TS1005: 'with' expected.
  /other.ts(3,39): error TS1005: ';' expected.
-@@= skipped -7, +10 lines =@@
- /other.ts(3,52): error TS1128: Declaration or statement expected.
- /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
- /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
--/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(6,49): error TS1005: 'with' expected.
- /other.ts(6,66): error TS1005: ';' expected.
-@@= skipped -22, +22 lines =@@
+@@= skipped -29, +31 lines =@@
  /other2.ts(3,32): error TS1455: `resolution-mode` is the only valid key for type import assertions.
  /other2.ts(4,32): error TS1455: `resolution-mode` is the only valid key for type import assertions.
  /other2.ts(4,52): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /other2.ts(6,59): error TS1455: `resolution-mode` is the only valid key for type import assertions.
  /other2.ts(7,59): error TS1455: `resolution-mode` is the only valid key for type import assertions.
  /other2.ts(7,79): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-@@= skipped -10, +11 lines =@@
- /other3.ts(3,56): error TS1128: Declaration or statement expected.
- /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'.
- /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
--/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other3.ts(6,48): error TS1005: '{' expected.
- /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
-@@= skipped -16, +16 lines =@@
- /other4.ts(6,30): error TS1128: Declaration or statement expected.
- /other4.ts(6,31): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
- /other4.ts(7,21): error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
--/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other4.ts(9,48): error TS1005: '{' expected.
- /other4.ts(9,56): error TS1005: ',' expected.
-@@= skipped -14, +14 lines =@@
+@@= skipped -40, +41 lines =@@
  /other5.ts(2,31): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
  /other5.ts(3,31): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
  /other5.ts(3,37): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /other5.ts(5,58): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
  /other5.ts(6,58): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
  /other5.ts(6,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -57,36 +29,25 @@
  ==== /node_modules/pkg/require.d.ts (0 errors) ====
      export interface RequireInterface {}
 -==== /index.ts (2 errors) ====
-+==== /index.ts (5 errors) ====
++==== /index.ts (4 errors) ====
      export type LocalInterface =
          & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
                                                        ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
+@@= skipped -8, +8 lines =@@
          & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                   ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
      export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                                   ~~~~~~~~
  !!! error TS1453: `resolution-mode` should be either `require` or `import`.
      export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                              ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++                 ~
++!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
  ==== /other.ts (27 errors) ====
      // missing assert:
      export type LocalInterface =
-@@= skipped -34, +40 lines =@@
-                          ~~~~~~~~~~~~~~~~~
- !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
-                                      ~~~~~~~~~~~~~~~
-@@= skipped -42, +42 lines =@@
+@@= skipped -68, +72 lines =@@
  !!! error TS2304: Cannot find name 'ImportInterface'.
                                                                                                   ~
  !!! error TS1128: Declaration or statement expected.
@@ -100,29 +61,11 @@
      
      export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                ~~~~~
  !!! error TS1455: `resolution-mode` is the only valid key for type import assertions.
      export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
-@@= skipped -28, +30 lines =@@
-                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'.
-                                                            ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -49, +49 lines =@@
- !!! error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
- !!! related TS2728 /other4.ts:10:48: 'Asserts2' is declared here.
-                                   ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", Asserts1).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -26, +26 lines =@@
+@@= skipped -103, +105 lines =@@
  !!! error TS1134: Variable declaration expected.
                                                                              ~
  !!! error TS1005: ',' expected.
@@ -136,7 +79,7 @@
      
      export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                               ~~
  !!! error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
      export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
index 429d9167e9..fde502bbf6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
@@ -112,18 +112,11 @@ exports.RequireInterface
 exports.a = null;
 exports.b = null;
 //// [other5.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.b = exports.a = void 0;
 exports.a = null;
 exports.b = null;
-||||||| 2303c3a6e
-export const a = null;
-export const b = null;
-=======
-export const a = null;
-export const b = null;
 
 
 //// [index.d.ts]
@@ -155,4 +148,3 @@ export declare const b: any, Asserts2: any, ImportInterface: any;
 export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
 export declare const a: any;
 export declare const b: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js.diff
index bb808bebe2..8286f026a1 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js.diff
@@ -1,211 +1,6 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).js
-<<<<<<< HEAD
-@@= skipped -116, +116 lines =@@
- exports.b = exports.a = void 0;
- exports.a = null;
- exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--//// [other.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any;
--export declare const b: any;
--//// [other2.d.ts]
--export type LocalInterface = import("pkg", { assert: { "bad": "require" } }).RequireInterface & import("pkg", { assert: { "bad": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
--//// [other3.d.ts]
--export type LocalInterface = import("pkg", { with: {} })[{
--    "resolution-mode": "require";
--}];
--export declare const a: any;
--export declare const b: any;
--//// [other4.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any, Asserts1: any, RequireInterface: any;
--export declare const b: any, Asserts2: any, ImportInterface: any;
--//// [other5.d.ts]
--export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
-||||||| 2303c3a6e
-@@= skipped -64, +64 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Asserts2 = exports.b = exports.RequireInterface = exports.Asserts1 = exports.a = void 0;
--exports.Asserts1;
--exports.RequireInterface
--    & import("pkg", exports.Asserts2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Asserts1;
-+RequireInterface
-+    & import("pkg", Asserts2).ImportInterface;
-+export const a = null, Asserts1, RequireInterface;
-+export const b = null, Asserts2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--//// [other.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any;
--export declare const b: any;
--//// [other2.d.ts]
--export type LocalInterface = import("pkg", { assert: { "bad": "require" } }).RequireInterface & import("pkg", { assert: { "bad": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
--//// [other3.d.ts]
--export type LocalInterface = import("pkg", { with: {} })[{
--    "resolution-mode": "require";
--}];
--export declare const a: any;
--export declare const b: any;
--//// [other4.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any, Asserts1: any, RequireInterface: any;
--export declare const b: any, Asserts2: any, ImportInterface: any;
--//// [other5.d.ts]
--export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
-+export const a = null;
-+export const b = null;
-=======
-@@= skipped -64, +64 lines =@@
-
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Asserts2 = exports.b = exports.RequireInterface = exports.Asserts1 = exports.a = void 0;
--exports.Asserts1;
--exports.RequireInterface
--    & import("pkg", exports.Asserts2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Asserts1;
-+RequireInterface
-+    & import("pkg", Asserts2).ImportInterface;
-+export const a = null, Asserts1, RequireInterface;
-+export const b = null, Asserts2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
-
+@@= skipped -120, +120 lines =@@
 
  //// [index.d.ts]
  export type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
@@ -229,11 +24,10 @@
  export type LocalInterface = import("pkg", { with: {} })[{
      "resolution-mode": "require";
  }];
-@@= skipped -78, +63 lines =@@
+@@= skipped -22, +25 lines =@@
  export declare const b: any, Asserts2: any, ImportInterface: any;
  //// [other5.d.ts]
  export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 +export declare const a: any;
- export declare const b: any;
->>>>>>> main
+ export declare const b: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
index 32a62e5386..9fdd7aabc2 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols.diff
@@ -1,47 +1,7 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).symbols
-<<<<<<< HEAD
 @@= skipped -32, +32 lines =@@
- 
-||||||| 2303c3a6e
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- === /other.ts ===
- // missing assert:
-@@= skipped -9, +8 lines =@@
- 
-=======
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
-
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- === /other.ts ===
- // missing assert:
-@@= skipped -9, +8 lines =@@
-
->>>>>>> main
      & import("pkg", {"resolution-mode": "require"}).RequireInterface
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 ->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
index d369669bfe..299d11138b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
@@ -14,15 +14,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -38,13 +38,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -78,9 +72,9 @@ export type LocalInterface =
     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
@@ -101,13 +95,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -155,13 +143,7 @@ export type LocalInterface =
 
     & import("pkg", Asserts2).ImportInterface;
 >import("pkg", Asserts2).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Asserts2 : any
 >ImportInterface : any
@@ -190,9 +172,9 @@ export type LocalInterface =
     & import("pkg", { assert: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { assert: {} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { assert: {} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
index 3364d42102..35cda76c73 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types.diff
@@ -1,113 +1,55 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node16).types
-<<<<<<< HEAD
 @@= skipped -13, +13 lines =@@
-||||||| 2303c3a6e
-@@= skipped -7, +7 lines =@@
- export interface RequireInterface {}
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
-=======
-@@= skipped -7, +7 lines =@@
- export interface RequireInterface {}
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
-
-     & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
->>>>>>> main
      & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : ImportInterface
-+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
-+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
  >null as any : any
 
  === /other.ts ===
-<<<<<<< HEAD
-@@= skipped -58, +58 lines =@@
-||||||| 2303c3a6e
-@@= skipped -30, +30 lines =@@
- 
-     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
- >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
- >"resolution-mode" : string
-@@= skipped -34, +34 lines =@@
-=======
-@@= skipped -30, +30 lines =@@
+@@= skipped -24, +24 lines =@@
 
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
  >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
 ->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
  >"resolution-mode" : string
 @@= skipped -34, +34 lines =@@
->>>>>>> main
      & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
-<<<<<<< HEAD
-@@= skipped -100, +100 lines =@@
-||||||| 2303c3a6e
-@@= skipped -23, +23 lines =@@
- 
-     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
- >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
-@@= skipped -48, +48 lines =@@
- 
-     & import("pkg", Asserts2).ImportInterface;
- >import("pkg", Asserts2).ImportInterface : any
-->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >Asserts2 : any
- >ImportInterface : any
-@@= skipped -29, +29 lines =@@
-=======
 @@= skipped -23, +23 lines =@@
 
      & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
  >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
 ->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -116,21 +58,20 @@
      & import("pkg", Asserts2).ImportInterface;
  >import("pkg", Asserts2).ImportInterface : any
 ->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >Asserts2 : any
  >ImportInterface : any
 @@= skipped -29, +29 lines =@@
->>>>>>> main
      & import("pkg", { assert: {} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { assert: {} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { assert: {} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
index a6decfd947..174e942416 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
@@ -1,12 +1,7 @@
 /index.ts(2,51): error TS1453: `resolution-mode` should be either `require` or `import`.
-<<<<<<< HEAD
-||||||| 2303c3a6e
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-=======
-/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
->>>>>>> main
+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /index.ts(5,78): error TS1453: `resolution-mode` should be either `require` or `import`.
+/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
 /other.ts(3,22): error TS1005: 'with' expected.
 /other.ts(3,39): error TS1005: ';' expected.
@@ -37,7 +32,7 @@
 /other2.ts(3,32): error TS1455: `resolution-mode` is the only valid key for type import assertions.
 /other2.ts(4,32): error TS1455: `resolution-mode` is the only valid key for type import assertions.
 /other2.ts(4,52): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /other2.ts(6,59): error TS1455: `resolution-mode` is the only valid key for type import assertions.
 /other2.ts(7,59): error TS1455: `resolution-mode` is the only valid key for type import assertions.
 /other2.ts(7,79): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -81,7 +76,7 @@
 /other5.ts(2,31): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
 /other5.ts(3,31): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
 /other5.ts(3,37): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
 /other5.ts(5,58): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
 /other5.ts(6,58): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
 /other5.ts(6,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -100,13 +95,7 @@
     export interface ImportInterface {}
 ==== /node_modules/pkg/require.d.ts (0 errors) ====
     export interface RequireInterface {}
-<<<<<<< HEAD
-==== /index.ts (2 errors) ====
-||||||| 2303c3a6e
 ==== /index.ts (4 errors) ====
-=======
-==== /index.ts (5 errors) ====
->>>>>>> main
     export type LocalInterface =
         & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
                                                       ~~~~~~~~
@@ -115,10 +104,12 @@
     
     export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                                  ~~~~~~~~
 !!! error TS1453: `resolution-mode` should be either `require` or `import`.
     export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
+                 ~
+!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
 ==== /other.ts (27 errors) ====
     // missing assert:
     export type LocalInterface =
@@ -198,7 +189,7 @@
     
     export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                               ~~~~~
 !!! error TS1455: `resolution-mode` is the only valid key for type import assertions.
     export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
@@ -318,7 +309,7 @@
     
     export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                              ~~
 !!! error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
     export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
index ddb99fd0c8..4b9171fe95 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt.diff
@@ -2,53 +2,25 @@
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).errors.txt
 @@= skipped -0, +0 lines =@@
  /index.ts(2,51): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(3,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/index.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /index.ts(5,78): error TS1453: `resolution-mode` should be either `require` or `import`.
-+/index.ts(6,91): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++/index.ts(6,14): error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
  /other.ts(3,7): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
  /other.ts(3,22): error TS1005: 'with' expected.
  /other.ts(3,39): error TS1005: ';' expected.
-@@= skipped -7, +10 lines =@@
- /other.ts(3,52): error TS1128: Declaration or statement expected.
- /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'.
- /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
--/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other.ts(6,49): error TS1005: 'with' expected.
- /other.ts(6,66): error TS1005: ';' expected.
-@@= skipped -22, +22 lines =@@
+@@= skipped -29, +31 lines =@@
  /other2.ts(3,32): error TS1455: `resolution-mode` is the only valid key for type import assertions.
  /other2.ts(4,32): error TS1455: `resolution-mode` is the only valid key for type import assertions.
  /other2.ts(4,52): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/other2.ts(6,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /other2.ts(6,59): error TS1455: `resolution-mode` is the only valid key for type import assertions.
  /other2.ts(7,59): error TS1455: `resolution-mode` is the only valid key for type import assertions.
  /other2.ts(7,79): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-@@= skipped -13, +14 lines =@@
-   Types of property 'with' are incompatible.
-     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
-       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
--/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other3.ts(6,48): error TS1005: '{' expected.
- /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type.
-@@= skipped -16, +16 lines =@@
- /other4.ts(6,30): error TS1128: Declaration or statement expected.
- /other4.ts(6,31): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration.
- /other4.ts(7,21): error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
--/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
- /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'?
- /other4.ts(9,48): error TS1005: '{' expected.
- /other4.ts(9,56): error TS1005: ',' expected.
-@@= skipped -14, +14 lines =@@
+@@= skipped -43, +44 lines =@@
  /other5.ts(2,31): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
  /other5.ts(3,31): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
  /other5.ts(3,37): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
-+/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++/other5.ts(5,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
  /other5.ts(5,58): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
  /other5.ts(6,58): error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
  /other5.ts(6,64): error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
@@ -57,36 +29,25 @@
  ==== /node_modules/pkg/require.d.ts (0 errors) ====
      export interface RequireInterface {}
 -==== /index.ts (2 errors) ====
-+==== /index.ts (5 errors) ====
++==== /index.ts (4 errors) ====
      export type LocalInterface =
          & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
                                                        ~~~~~~~~
- !!! error TS1453: `resolution-mode` should be either `require` or `import`.
+@@= skipped -8, +8 lines =@@
          & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-+                                                                   ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
      
      export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                                   ~~~~~~~~
  !!! error TS1453: `resolution-mode` should be either `require` or `import`.
      export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
-+                                                                                              ~~~~~~~~~~~~~~~
-+!!! error TS2694: Namespace '"/node_modules/pkg/require"' has no exported member 'ImportInterface'.
++                 ~
++!!! error TS2742: The inferred type of 'b' cannot be named without a reference to './node_modules/pkg/import'. This is likely not portable. A type annotation is necessary.
  ==== /other.ts (27 errors) ====
      // missing assert:
      export type LocalInterface =
-@@= skipped -34, +40 lines =@@
-                          ~~~~~~~~~~~~~~~~~
- !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'.
-                                                        ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface);
-                                      ~~~~~~~~~~~~~~~
-@@= skipped -42, +42 lines =@@
+@@= skipped -68, +72 lines =@@
  !!! error TS2304: Cannot find name 'ImportInterface'.
                                                                                                   ~
  !!! error TS1128: Declaration or statement expected.
@@ -100,29 +61,11 @@
      
      export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                                ~~~~~
  !!! error TS1455: `resolution-mode` is the only valid key for type import assertions.
      export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
-@@= skipped -31, +33 lines =@@
- !!! error TS2322:     Type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]' is not assignable to type 'ImportAttributes'.
- !!! error TS2322:       Index signature for type 'string' is missing in type '(index: number, value: { "resolution-mode": string; }) => { "resolution-mode": string; }[]'.
-                                                            ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -49, +49 lines =@@
- !!! error TS2448: Block-scoped variable 'Asserts2' used before its declaration.
- !!! related TS2728 /other4.ts:10:48: 'Asserts2' is declared here.
-                                   ~~~~~~~~~~~~~~~
--!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'.
-+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/require"); }>'.
-     
-     export const a = (null as any as import("pkg", Asserts1).RequireInterface);
-                                      ~~~~~~~~~~~~~
-@@= skipped -26, +26 lines =@@
+@@= skipped -106, +108 lines =@@
  !!! error TS1134: Variable declaration expected.
                                                                              ~
  !!! error TS1005: ',' expected.
@@ -136,7 +79,7 @@
      
      export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
 +                 ~
-+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require.js'. This is likely not portable. A type annotation is necessary.
++!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/pkg/require'. This is likely not portable. A type annotation is necessary.
                                                               ~~
  !!! error TS1456: Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`.
      export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
index 429d9167e9..fde502bbf6 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
@@ -112,18 +112,11 @@ exports.RequireInterface
 exports.a = null;
 exports.b = null;
 //// [other5.js]
-<<<<<<< HEAD
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.b = exports.a = void 0;
 exports.a = null;
 exports.b = null;
-||||||| 2303c3a6e
-export const a = null;
-export const b = null;
-=======
-export const a = null;
-export const b = null;
 
 
 //// [index.d.ts]
@@ -155,4 +148,3 @@ export declare const b: any, Asserts2: any, ImportInterface: any;
 export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
 export declare const a: any;
 export declare const b: any;
->>>>>>> main
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js.diff
index 8610835636..1eaa5201b1 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js.diff
@@ -1,211 +1,6 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).js
-<<<<<<< HEAD
-@@= skipped -116, +116 lines =@@
- exports.b = exports.a = void 0;
- exports.a = null;
- exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--//// [other.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any;
--export declare const b: any;
--//// [other2.d.ts]
--export type LocalInterface = import("pkg", { assert: { "bad": "require" } }).RequireInterface & import("pkg", { assert: { "bad": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
--//// [other3.d.ts]
--export type LocalInterface = import("pkg", { with: {} })[{
--    "resolution-mode": "require";
--}];
--export declare const a: any;
--export declare const b: any;
--//// [other4.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any, Asserts1: any, RequireInterface: any;
--export declare const b: any, Asserts2: any, ImportInterface: any;
--//// [other5.d.ts]
--export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
-||||||| 2303c3a6e
-@@= skipped -64, +64 lines =@@
- 
- 
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Asserts2 = exports.b = exports.RequireInterface = exports.Asserts1 = exports.a = void 0;
--exports.Asserts1;
--exports.RequireInterface
--    & import("pkg", exports.Asserts2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Asserts1;
-+RequireInterface
-+    & import("pkg", Asserts2).ImportInterface;
-+export const a = null, Asserts1, RequireInterface;
-+export const b = null, Asserts2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
--
--
--//// [index.d.ts]
--export type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: import("pkg", { with: { "resolution-mode": "import" } }).ImportInterface;
--//// [other.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any;
--export declare const b: any;
--//// [other2.d.ts]
--export type LocalInterface = import("pkg", { assert: { "bad": "require" } }).RequireInterface & import("pkg", { assert: { "bad": "import" } }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
--//// [other3.d.ts]
--export type LocalInterface = import("pkg", { with: {} })[{
--    "resolution-mode": "require";
--}];
--export declare const a: any;
--export declare const b: any;
--//// [other4.d.ts]
--export type LocalInterface = import("pkg", { with: {} });
--export declare const a: any, Asserts1: any, RequireInterface: any;
--export declare const b: any, Asserts2: any, ImportInterface: any;
--//// [other5.d.ts]
--export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
--export declare const a: import("pkg").RequireInterface;
--export declare const b: any;
-+export const a = null;
-+export const b = null;
-=======
-@@= skipped -64, +64 lines =@@
-
-
- //// [index.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- "resolution-mode";
- "require";
- RequireInterface
-     & import("pkg", { "resolution-mode": "import" }).ImportInterface;
--exports.a = null;
-+export const a = null;
- "resolution-mode";
- "require";
- RequireInterface;
- ;
--exports.b = null;
-+export const b = null;
- "resolution-mode";
- "import";
- ImportInterface;
- ;
- //// [other2.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
- //// [other3.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
- RequireInterface
-     & import("pkg", [{ "resolution-mode": "import" }]).ImportInterface;
--exports.a = null.RequireInterface;
--exports.b = null.ImportInterface;
-+export const a = null.RequireInterface;
-+export const b = null.ImportInterface;
- //// [other4.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.ImportInterface = exports.Asserts2 = exports.b = exports.RequireInterface = exports.Asserts1 = exports.a = void 0;
--exports.Asserts1;
--exports.RequireInterface
--    & import("pkg", exports.Asserts2).ImportInterface;
--exports.a = null;
--exports.b = null;
-+Asserts1;
-+RequireInterface
-+    & import("pkg", Asserts2).ImportInterface;
-+export const a = null, Asserts1, RequireInterface;
-+export const b = null, Asserts2, ImportInterface;
- //// [other5.js]
--"use strict";
--Object.defineProperty(exports, "__esModule", { value: true });
--exports.b = exports.a = void 0;
--exports.a = null;
--exports.b = null;
-+export const a = null;
-+export const b = null;
-
+@@= skipped -120, +120 lines =@@
 
  //// [index.d.ts]
  export type LocalInterface = import("pkg", { assert: { "resolution-mode": "foobar" } }).RequireInterface & import("pkg", { assert: { "resolution-mode": "import" } }).ImportInterface;
@@ -229,11 +24,10 @@
  export type LocalInterface = import("pkg", { with: {} })[{
      "resolution-mode": "require";
  }];
-@@= skipped -78, +63 lines =@@
+@@= skipped -22, +25 lines =@@
  export declare const b: any, Asserts2: any, ImportInterface: any;
  //// [other5.d.ts]
  export type LocalInterface = import("pkg", { assert: {} }).RequireInterface & import("pkg", { assert: {} }).ImportInterface;
 -export declare const a: import("pkg").RequireInterface;
 +export declare const a: any;
- export declare const b: any;
->>>>>>> main
+ export declare const b: any;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
index 2733a89efc..bcff2f2a6c 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols.diff
@@ -1,47 +1,7 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).symbols
-<<<<<<< HEAD
 @@= skipped -32, +32 lines =@@
- 
-||||||| 2303c3a6e
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
- 
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
- 
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
- 
- === /other.ts ===
- // missing assert:
-@@= skipped -9, +8 lines =@@
- 
-=======
-@@= skipped -15, +15 lines =@@
- >RequireInterface : Symbol(RequireInterface, Decl(require.d.ts, 0, 0))
 
-     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
- >a : Symbol(a, Decl(index.ts, 4, 12))
-@@= skipped -8, +7 lines =@@
-
- export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
- >b : Symbol(b, Decl(index.ts, 5, 12))
-->ImportInterface : Symbol(ImportInterface, Decl(import.d.ts, 0, 0))
-
- === /other.ts ===
- // missing assert:
-@@= skipped -9, +8 lines =@@
-
->>>>>>> main
      & import("pkg", {"resolution-mode": "require"}).RequireInterface
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 ->"pkg" : Symbol("/node_modules/pkg/import", Decl(import.d.ts, 0, 0))
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
index d369669bfe..299d11138b 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
@@ -14,15 +14,15 @@ export type LocalInterface =
     & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
->b : ImportInterface
->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
+>b : import("./node_modules/pkg/import").ImportInterface
+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
 >null as any : any
 
 === /other.ts ===
@@ -38,13 +38,7 @@ export type LocalInterface =
 
     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
 >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
 >"resolution-mode" : string
@@ -78,9 +72,9 @@ export type LocalInterface =
     & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
@@ -101,13 +95,7 @@ export type LocalInterface =
 
     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
 >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
 >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -155,13 +143,7 @@ export type LocalInterface =
 
     & import("pkg", Asserts2).ImportInterface;
 >import("pkg", Asserts2).ImportInterface : any
-<<<<<<< HEAD
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-||||||| 2303c3a6e
->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
-=======
->import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
->>>>>>> main
+>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
 >"pkg" : "pkg"
 >Asserts2 : any
 >ImportInterface : any
@@ -190,9 +172,9 @@ export type LocalInterface =
     & import("pkg", { assert: {} }).ImportInterface;
 
 export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
->a : import("./node_modules/pkg/require.js").RequireInterface
->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
->null as any as import("pkg", { assert: {} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
+>a : import("./node_modules/pkg/require").RequireInterface
+>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
+>null as any as import("pkg", { assert: {} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
 >null as any : any
 
 export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
index 5ffdbbe97d..65195fcd1a 100644
--- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types.diff
@@ -1,113 +1,55 @@
 --- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
 +++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=nodenext).types
-<<<<<<< HEAD
 @@= skipped -13, +13 lines =@@
-||||||| 2303c3a6e
-@@= skipped -7, +7 lines =@@
- export interface RequireInterface {}
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
- 
-     & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
-=======
-@@= skipped -7, +7 lines =@@
- export interface RequireInterface {}
- === /index.ts ===
- export type LocalInterface =
-->LocalInterface : LocalInterface
-+>LocalInterface : any
-
-     & import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface
->>>>>>> main
      & import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "foobar"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface);
 ->b : import("/node_modules/pkg/import").ImportInterface
 ->(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("/node_modules/pkg/import").ImportInterface
 ->null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("/node_modules/pkg/import").ImportInterface
-+>b : ImportInterface
-+>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : ImportInterface
-+>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : ImportInterface
++>b : import("./node_modules/pkg/import").ImportInterface
++>(null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface) : import("./node_modules/pkg/import").ImportInterface
++>null as any as import("pkg", { assert: {"resolution-mode": "import"} }).ImportInterface : import("./node_modules/pkg/import").ImportInterface
  >null as any : any
 
  === /other.ts ===
-<<<<<<< HEAD
-@@= skipped -58, +58 lines =@@
-||||||| 2303c3a6e
-@@= skipped -30, +30 lines =@@
- 
-     & import("pkg", {"resolution-mode": "import"}).ImportInterface;
- >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
-->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
- >"resolution-mode" : string
-@@= skipped -34, +34 lines =@@
-=======
-@@= skipped -30, +30 lines =@@
+@@= skipped -24, +24 lines =@@
 
      & import("pkg", {"resolution-mode": "import"}).ImportInterface;
  >import("pkg", {"resolution-mode": "import"}).ImportInterface : any
 ->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
  >"resolution-mode" : string
 @@= skipped -34, +34 lines =@@
->>>>>>> main
      & import("pkg", { assert: {"bad": "import"} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { assert: {"bad": "require"} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { assert: {"bad": "import"} }).ImportInterface);
-<<<<<<< HEAD
-@@= skipped -100, +100 lines =@@
-||||||| 2303c3a6e
-@@= skipped -23, +23 lines =@@
- 
-     & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
- >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
-->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
- >{"resolution-mode": "import"} : { "resolution-mode": string; }
-@@= skipped -48, +48 lines =@@
- 
-     & import("pkg", Asserts2).ImportInterface;
- >import("pkg", Asserts2).ImportInterface : any
-->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/require"); }>
- >"pkg" : "pkg"
- >Asserts2 : any
- >ImportInterface : any
-@@= skipped -29, +29 lines =@@
-=======
 @@= skipped -23, +23 lines =@@
 
      & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface;
  >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any
 ->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[]
  >{"resolution-mode": "import"} : { "resolution-mode": string; }
@@ -116,21 +58,20 @@
      & import("pkg", Asserts2).ImportInterface;
  >import("pkg", Asserts2).ImportInterface : any
 ->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }>
-+>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/require.js"); }>
++>import("pkg", Asserts2) : Promise<{ default: typeof import("./node_modules/pkg/import"); }>
  >"pkg" : "pkg"
  >Asserts2 : any
  >ImportInterface : any
 @@= skipped -29, +29 lines =@@
->>>>>>> main
      & import("pkg", { assert: {} }).ImportInterface;
 
  export const a = (null as any as import("pkg", { assert: {} }).RequireInterface);
 ->a : import("/node_modules/pkg/require").RequireInterface
 ->(null as any as import("pkg", { assert: {} }).RequireInterface) : import("/node_modules/pkg/require").RequireInterface
 ->null as any as import("pkg", { assert: {} }).RequireInterface : import("/node_modules/pkg/require").RequireInterface
-+>a : import("./node_modules/pkg/require.js").RequireInterface
-+>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("./node_modules/pkg/require.js").RequireInterface
-+>null as any as import("pkg", { assert: {} }).RequireInterface : import("./node_modules/pkg/require.js").RequireInterface
++>a : import("./node_modules/pkg/require").RequireInterface
++>(null as any as import("pkg", { assert: {} }).RequireInterface) : import("./node_modules/pkg/require").RequireInterface
++>null as any as import("pkg", { assert: {} }).RequireInterface : import("./node_modules/pkg/require").RequireInterface
  >null as any : any
 
  export const b = (null as any as import("pkg", { assert: {} }).ImportInterface);
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types
index ca0310f630..555e8e9d86 100644
--- a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types
+++ b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types
@@ -49,17 +49,17 @@ export { A as AA } from "./a";
 >AA : any
 
 export { B as BB } from "./b";
->B : typeof import("./b").B
->BB : typeof import("./b").B
+>B : typeof import("./b.js").B
+>BB : typeof import("./b.js").B
 
 === d.fixed.ts ===
 export type { A as AA } from "./a";
 >A : any
->AA : import("./a").A
+>AA : import("./a.js").A
 
 export type { B as BB } from "./b";
->B : typeof import("./b").B
->BB : import("./b").B
+>B : typeof import("./b.js").B
+>BB : import("./b.js").B
 
 === e.ts ===
 import { AA, BB } from "./d";
diff --git a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types.diff b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types.diff
index 81ce28531b..deac7a25e8 100644
--- a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=false).types.diff
@@ -6,20 +6,20 @@
  export { B as BB } from "./b";
 ->B : typeof import("b").B
 ->BB : typeof import("b").B
-+>B : typeof import("./b").B
-+>BB : typeof import("./b").B
++>B : typeof import("./b.js").B
++>BB : typeof import("./b.js").B
 
  === d.fixed.ts ===
  export type { A as AA } from "./a";
  >A : any
 ->AA : import("a").A
-+>AA : import("./a").A
++>AA : import("./a.js").A
 
  export type { B as BB } from "./b";
 ->B : typeof import("b").B
 ->BB : import("b").B
-+>B : typeof import("./b").B
-+>BB : import("./b").B
++>B : typeof import("./b.js").B
++>BB : import("./b.js").B
 
  === e.ts ===
  import { AA, BB } from "./d";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types
index ca0310f630..555e8e9d86 100644
--- a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types
+++ b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types
@@ -49,17 +49,17 @@ export { A as AA } from "./a";
 >AA : any
 
 export { B as BB } from "./b";
->B : typeof import("./b").B
->BB : typeof import("./b").B
+>B : typeof import("./b.js").B
+>BB : typeof import("./b.js").B
 
 === d.fixed.ts ===
 export type { A as AA } from "./a";
 >A : any
->AA : import("./a").A
+>AA : import("./a.js").A
 
 export type { B as BB } from "./b";
->B : typeof import("./b").B
->BB : import("./b").B
+>B : typeof import("./b.js").B
+>BB : import("./b.js").B
 
 === e.ts ===
 import { AA, BB } from "./d";
diff --git a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types.diff b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types.diff
index cc53c3be90..031edc3b51 100644
--- a/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types.diff
+++ b/testdata/baselines/reference/submodule/conformance/preserveValueImports_errors(isolatedmodules=true).types.diff
@@ -6,20 +6,20 @@
  export { B as BB } from "./b";
 ->B : typeof import("b").B
 ->BB : typeof import("b").B
-+>B : typeof import("./b").B
-+>BB : typeof import("./b").B
++>B : typeof import("./b.js").B
++>BB : typeof import("./b.js").B
 
  === d.fixed.ts ===
  export type { A as AA } from "./a";
  >A : any
 ->AA : import("a").A
-+>AA : import("./a").A
++>AA : import("./a.js").A
 
  export type { B as BB } from "./b";
 ->B : typeof import("b").B
 ->BB : import("b").B
-+>B : typeof import("./b").B
-+>BB : import("./b").B
++>B : typeof import("./b.js").B
++>BB : import("./b.js").B
 
  === e.ts ===
  import { AA, BB } from "./d";
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.types b/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.types
index 78d0575cd0..c92cb5495f 100644
--- a/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.types
+++ b/testdata/baselines/reference/submodule/conformance/requireAssertsFromTypescript.types
@@ -3,7 +3,7 @@
 === 38379.js ===
 const { art } = require('./ex')
 >art : (value: any, message?: string | Error) => asserts value
->require('./ex') : typeof import("./ex.js")
+>require('./ex') : typeof import("./ex")
 >require : any
 >'./ex' : "./ex"
 
diff --git a/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types b/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types
index b7cdd9d92b..cdfa39d17a 100644
--- a/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types
+++ b/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types
@@ -3,7 +3,7 @@
 === foo.ts ===
 /// <reference path="types.d.ts" />
 declare function foo(): any;
->foo : typeof import("./types.js")
+>foo : typeof import("./types")
 
 === types.d.ts ===
 declare function foo(props: any): any;
@@ -14,5 +14,5 @@ export default foo;
 >foo : (props: any) => any
 
 export as namespace foo;
->foo : typeof import("./types.js")
+>foo : typeof import("./types")
 
diff --git a/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types.diff b/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types.diff
index fc48df741b..d6d72af687 100644
--- a/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/sourceFileMergeWithFunction.types.diff
@@ -5,7 +5,7 @@
  /// <reference path="types.d.ts" />
  declare function foo(): any;
 ->foo : typeof import("types")
-+>foo : typeof import("./types.js")
++>foo : typeof import("./types")
 
  === types.d.ts ===
  declare function foo(props: any): any;
@@ -14,4 +14,4 @@
 
  export as namespace foo;
 ->foo : typeof import("types")
-+>foo : typeof import("./types.js")
++>foo : typeof import("./types")
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt
index 10c5181650..e62fb62a2c 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt
@@ -1,4 +1,4 @@
-main.ts(1,10): error TS2305: Module '"node_modules/ext/ts3.1/index"' has no exported member 'fa'.
+main.ts(1,10): error TS2305: Module '"ext"' has no exported member 'fa'.
 
 
 ==== tsconfig.json (0 errors) ====
@@ -6,7 +6,7 @@ main.ts(1,10): error TS2305: Module '"node_modules/ext/ts3.1/index"' has no expo
 ==== main.ts (1 errors) ====
     import { fa } from "ext";
              ~~
-!!! error TS2305: Module '"node_modules/ext/ts3.1/index"' has no exported member 'fa'.
+!!! error TS2305: Module '"ext"' has no exported member 'fa'.
     import { fb } from "ext/other";
     
     export const va = fa();
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt.diff
deleted file mode 100644
index 5ed03bb6bc..0000000000
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- old.typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt
-+++ new.typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt
-@@= skipped -0, +0 lines =@@
--main.ts(1,10): error TS2305: Module '"ext"' has no exported member 'fa'.
-+main.ts(1,10): error TS2305: Module '"node_modules/ext/ts3.1/index"' has no exported member 'fa'.
-
-
- ==== tsconfig.json (0 errors) ====
-@@= skipped -5, +5 lines =@@
- ==== main.ts (1 errors) ====
-     import { fa } from "ext";
-              ~~
--!!! error TS2305: Module '"ext"' has no exported member 'fa'.
-+!!! error TS2305: Module '"node_modules/ext/ts3.1/index"' has no exported member 'fa'.
-     import { fb } from "ext/other";
-     
-     export const va = fa();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js
index 2f55abc3d0..d620756395 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js
@@ -44,4 +44,4 @@ exports.vb = (0, other_1.fb)();
 
 //// [main.d.ts]
 export declare const va: any;
-export declare const vb: import("ext/other.js").B;
+export declare const vb: import("ext/other").B;
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js.diff b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js.diff
deleted file mode 100644
index bcd559a805..0000000000
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- old.typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js
-+++ new.typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.js
-@@= skipped -43, +43 lines =@@
-
- //// [main.d.ts]
- export declare const va: any;
--export declare const vb: import("ext/other").B;
-+export declare const vb: import("ext/other.js").B;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types
index e213c50b28..2369c8603b 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types
@@ -5,7 +5,7 @@ import { fa } from "ext";
 >fa : any
 
 import { fb } from "ext/other";
->fb : () => import("ext/other.js").B
+>fb : () => import("ext/other").B
 
 export const va = fa();
 >va : any
@@ -13,9 +13,9 @@ export const va = fa();
 >fa : any
 
 export const vb = fb();
->vb : import("ext/other.js").B
->fb() : import("ext/other.js").B
->fb : () => import("ext/other.js").B
+>vb : import("ext/other").B
+>fb() : import("ext/other").B
+>fb : () => import("ext/other").B
 
 === node_modules/ext/other.d.ts ===
 export interface B {}
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types.diff b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types.diff
index d8b8cdc176..98962dec17 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.types.diff
@@ -5,7 +5,7 @@
 
  import { fb } from "ext/other";
 ->fb : () => import("node_modules/ext/other").B
-+>fb : () => import("ext/other.js").B
++>fb : () => import("ext/other").B
 
  export const va = fa();
  >va : any
@@ -16,9 +16,9 @@
 ->vb : import("node_modules/ext/other").B
 ->fb() : import("node_modules/ext/other").B
 ->fb : () => import("node_modules/ext/other").B
-+>vb : import("ext/other.js").B
-+>fb() : import("ext/other.js").B
-+>fb : () => import("ext/other.js").B
++>vb : import("ext/other").B
++>fb() : import("ext/other").B
++>fb : () => import("ext/other").B
 
  === node_modules/ext/other.d.ts ===
  export interface B {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js
index dcd9e51de1..d3dda8098c 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js
@@ -42,5 +42,5 @@ exports.va2 = (0, other_1.fa)();
 
 
 //// [main.d.ts]
-export declare const va: import("ext/other.js").A2;
-export declare const va2: import("ext/other.js").A2;
+export declare const va: import("ext").A2;
+export declare const va2: import("ext").A2;
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js.diff b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js.diff
deleted file mode 100644
index 8409b0f3ef..0000000000
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- old.typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js
-+++ new.typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.js
-@@= skipped -41, +41 lines =@@
-
-
- //// [main.d.ts]
--export declare const va: import("ext").A2;
--export declare const va2: import("ext").A2;
-+export declare const va: import("ext/other.js").A2;
-+export declare const va2: import("ext/other.js").A2;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types
index a82d6c8424..96cbb71da6 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types
@@ -2,21 +2,21 @@
 
 === main.ts ===
 import { fa } from "ext";
->fa : () => import("ext/other.js").A2
+>fa : () => import("ext").A2
 
 import { fa as fa2 } from "ext/other";
->fa : () => import("ext/other.js").A2
->fa2 : () => import("ext/other.js").A2
+>fa : () => import("ext").A2
+>fa2 : () => import("ext").A2
 
 export const va = fa();
->va : import("ext/other.js").A2
->fa() : import("ext/other.js").A2
->fa : () => import("ext/other.js").A2
+>va : import("ext").A2
+>fa() : import("ext").A2
+>fa : () => import("ext").A2
 
 export const va2 = fa2();
->va2 : import("ext/other.js").A2
->fa2() : import("ext/other.js").A2
->fa2 : () => import("ext/other.js").A2
+>va2 : import("ext").A2
+>fa2() : import("ext").A2
+>fa2 : () => import("ext").A2
 
 === node_modules/ext/other.d.ts ===
 export interface A2 {}
diff --git a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types.diff b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types.diff
index 0c1e1cb769..16ce9c5c52 100644
--- a/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.types.diff
@@ -5,29 +5,29 @@
  === main.ts ===
  import { fa } from "ext";
 ->fa : () => import("node_modules/ext/other").A2
-+>fa : () => import("ext/other.js").A2
++>fa : () => import("ext").A2
 
  import { fa as fa2 } from "ext/other";
 ->fa : () => import("node_modules/ext/other").A2
 ->fa2 : () => import("node_modules/ext/other").A2
-+>fa : () => import("ext/other.js").A2
-+>fa2 : () => import("ext/other.js").A2
++>fa : () => import("ext").A2
++>fa2 : () => import("ext").A2
 
  export const va = fa();
 ->va : import("node_modules/ext/other").A2
 ->fa() : import("node_modules/ext/other").A2
 ->fa : () => import("node_modules/ext/other").A2
-+>va : import("ext/other.js").A2
-+>fa() : import("ext/other.js").A2
-+>fa : () => import("ext/other.js").A2
++>va : import("ext").A2
++>fa() : import("ext").A2
++>fa : () => import("ext").A2
 
  export const va2 = fa2();
 ->va2 : import("node_modules/ext/other").A2
 ->fa2() : import("node_modules/ext/other").A2
 ->fa2 : () => import("node_modules/ext/other").A2
-+>va2 : import("ext/other.js").A2
-+>fa2() : import("ext/other.js").A2
-+>fa2 : () => import("ext/other.js").A2
++>va2 : import("ext").A2
++>fa2() : import("ext").A2
++>fa2 : () => import("ext").A2
 
  === node_modules/ext/other.d.ts ===
  export interface A2 {}
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/umd-errors.types b/testdata/baselines/reference/submodule/conformance/umd-errors.types
index 0eef49d12f..d669b1eccd 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-errors.types
+++ b/testdata/baselines/reference/submodule/conformance/umd-errors.types
@@ -20,16 +20,16 @@ export var p;
 >p : any
 
 static export as namespace oo1;
->oo1 : typeof import("./err3.js")
+>oo1 : typeof import("./err3")
 
 declare export as namespace oo2;
->oo2 : typeof import("./err3.js")
+>oo2 : typeof import("./err3")
 
 public export as namespace oo3;
->oo3 : typeof import("./err3.js")
+>oo3 : typeof import("./err3")
 
 const export as namespace oo4;
->oo4 : typeof import("./err3.js")
+>oo4 : typeof import("./err3")
 
 === err4.d.ts ===
 // Illegal, must be at top-level
diff --git a/testdata/baselines/reference/submodule/conformance/umd-errors.types.diff b/testdata/baselines/reference/submodule/conformance/umd-errors.types.diff
index 82a919a15d..cc1beeef1b 100644
--- a/testdata/baselines/reference/submodule/conformance/umd-errors.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd-errors.types.diff
@@ -5,19 +5,19 @@
 
  static export as namespace oo1;
 ->oo1 : typeof import("err3")
-+>oo1 : typeof import("./err3.js")
++>oo1 : typeof import("./err3")
 
  declare export as namespace oo2;
 ->oo2 : typeof import("err3")
-+>oo2 : typeof import("./err3.js")
++>oo2 : typeof import("./err3")
 
  public export as namespace oo3;
 ->oo3 : typeof import("err3")
-+>oo3 : typeof import("./err3.js")
++>oo3 : typeof import("./err3")
 
  const export as namespace oo4;
 ->oo4 : typeof import("err3")
-+>oo4 : typeof import("./err3.js")
++>oo4 : typeof import("./err3")
 
  === err4.d.ts ===
  // Illegal, must be at top-level
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/umd1.types b/testdata/baselines/reference/submodule/conformance/umd1.types
index 46eda4037e..3b3c0c6580 100644
--- a/testdata/baselines/reference/submodule/conformance/umd1.types
+++ b/testdata/baselines/reference/submodule/conformance/umd1.types
@@ -30,5 +30,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof import("./foo.js")
+>Foo : typeof import("./foo")
 
diff --git a/testdata/baselines/reference/submodule/conformance/umd1.types.diff b/testdata/baselines/reference/submodule/conformance/umd1.types.diff
index 5e9b514d6e..275dce6ae2 100644
--- a/testdata/baselines/reference/submodule/conformance/umd1.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd1.types.diff
@@ -5,4 +5,4 @@
 
  export as namespace Foo;
 ->Foo : typeof import("foo")
-+>Foo : typeof import("./foo.js")
++>Foo : typeof import("./foo")
diff --git a/testdata/baselines/reference/submodule/conformance/umd3.types b/testdata/baselines/reference/submodule/conformance/umd3.types
index 74fdc65f9d..c048b067c6 100644
--- a/testdata/baselines/reference/submodule/conformance/umd3.types
+++ b/testdata/baselines/reference/submodule/conformance/umd3.types
@@ -32,5 +32,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof import("./foo.js")
+>Foo : typeof import("./foo")
 
diff --git a/testdata/baselines/reference/submodule/conformance/umd3.types.diff b/testdata/baselines/reference/submodule/conformance/umd3.types.diff
index 2b37147ed5..33c1c5db1a 100644
--- a/testdata/baselines/reference/submodule/conformance/umd3.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd3.types.diff
@@ -5,4 +5,4 @@
 
  export as namespace Foo;
 ->Foo : typeof import("foo")
-+>Foo : typeof import("./foo.js")
++>Foo : typeof import("./foo")
diff --git a/testdata/baselines/reference/submodule/conformance/umd4.types b/testdata/baselines/reference/submodule/conformance/umd4.types
index 00fecd3884..1c90f0522c 100644
--- a/testdata/baselines/reference/submodule/conformance/umd4.types
+++ b/testdata/baselines/reference/submodule/conformance/umd4.types
@@ -32,5 +32,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof import("./foo.js")
+>Foo : typeof import("./foo")
 
diff --git a/testdata/baselines/reference/submodule/conformance/umd4.types.diff b/testdata/baselines/reference/submodule/conformance/umd4.types.diff
index ef6e98409d..00c87889ca 100644
--- a/testdata/baselines/reference/submodule/conformance/umd4.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd4.types.diff
@@ -5,4 +5,4 @@
 
  export as namespace Foo;
 ->Foo : typeof import("foo")
-+>Foo : typeof import("./foo.js")
++>Foo : typeof import("./foo")
diff --git a/testdata/baselines/reference/submodule/conformance/umd5.types b/testdata/baselines/reference/submodule/conformance/umd5.types
index 8ebe05acd7..76cafab48e 100644
--- a/testdata/baselines/reference/submodule/conformance/umd5.types
+++ b/testdata/baselines/reference/submodule/conformance/umd5.types
@@ -37,5 +37,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof import("./foo.js")
+>Foo : typeof import("./foo")
 
diff --git a/testdata/baselines/reference/submodule/conformance/umd5.types.diff b/testdata/baselines/reference/submodule/conformance/umd5.types.diff
index 88541c644a..d1e70c1e1e 100644
--- a/testdata/baselines/reference/submodule/conformance/umd5.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd5.types.diff
@@ -5,4 +5,4 @@
 
  export as namespace Foo;
 ->Foo : typeof import("foo")
-+>Foo : typeof import("./foo.js")
++>Foo : typeof import("./foo")
diff --git a/testdata/baselines/reference/submodule/conformance/umd9.types b/testdata/baselines/reference/submodule/conformance/umd9.types
index e1dbab07d4..c26f357970 100644
--- a/testdata/baselines/reference/submodule/conformance/umd9.types
+++ b/testdata/baselines/reference/submodule/conformance/umd9.types
@@ -3,8 +3,8 @@
 === a.ts ===
 /// <reference path="foo.d.ts" />
 export const x = Foo; // OK in value position because allowUmdGlobalAccess: true
->x : typeof import("./foo.js")
->Foo : typeof import("./foo.js")
+>x : typeof import("./foo")
+>Foo : typeof import("./foo")
 
 === foo.d.ts ===
 declare class Thing {
diff --git a/testdata/baselines/reference/submodule/conformance/umd9.types.diff b/testdata/baselines/reference/submodule/conformance/umd9.types.diff
index a23fac6409..07e1804379 100644
--- a/testdata/baselines/reference/submodule/conformance/umd9.types.diff
+++ b/testdata/baselines/reference/submodule/conformance/umd9.types.diff
@@ -6,8 +6,8 @@
  export const x = Foo; // OK in value position because allowUmdGlobalAccess: true
 ->x : typeof import("foo")
 ->Foo : typeof import("foo")
-+>x : typeof import("./foo.js")
-+>Foo : typeof import("./foo.js")
++>x : typeof import("./foo")
++>Foo : typeof import("./foo")
 
  === foo.d.ts ===
  declare class Thing {
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/allowSyntheticDefaultImports8.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/allowSyntheticDefaultImports8.errors.txt.diff
deleted file mode 100644
index 56726400fa..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/compiler/allowSyntheticDefaultImports8.errors.txt.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- old.allowSyntheticDefaultImports8.errors.txt
-+++ new.allowSyntheticDefaultImports8.errors.txt
-@@= skipped -0, +0 lines =@@
--a.ts(1,10): error TS2305: Module '"./b"' has no exported member 'default'.
-+a.ts(1,10): error TS2305: Module '"b"' has no exported member 'default'.
-
-
- ==== b.d.ts (0 errors) ====
-@@= skipped -8, +8 lines =@@
- ==== a.ts (1 errors) ====
-     import { default as Foo } from "./b";
-              ~~~~~~~
--!!! error TS2305: Module '"./b"' has no exported member 'default'.
-+!!! error TS2305: Module '"b"' has no exported member 'default'.
-     Foo.bar();
-     Foo.foo();
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember8.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember8.errors.txt.diff
index 6662dc70ad..b3b6668e75 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember8.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember8.errors.txt.diff
@@ -2,7 +2,7 @@
 +++ new.importNonExportedMember8.errors.txt
 @@= skipped -0, +0 lines =@@
 -b.js(1,10): error TS2598: 'Foo' can only be imported by using a 'require' call or by turning on the 'esModuleInterop' flag and using a default import.
-+b.js(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("a")' or by turning on the 'esModuleInterop' flag and using a default import.
++b.js(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
  b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
 
 
@@ -11,7 +11,7 @@
      import { Foo } from './a';
               ~~~
 -!!! error TS2598: 'Foo' can only be imported by using a 'require' call or by turning on the 'esModuleInterop' flag and using a default import.
-+!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("a")' or by turning on the 'esModuleInterop' flag and using a default import.
++!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import.
                          ~~~~~
  !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember9.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember9.errors.txt.diff
index d05ae7cd84..2d2979024a 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember9.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember9.errors.txt.diff
@@ -2,7 +2,7 @@
 +++ new.importNonExportedMember9.errors.txt
 @@= skipped -0, +0 lines =@@
 -b.js(1,10): error TS2597: 'Foo' can only be imported by using a 'require' call or by using a default import.
-+b.js(1,10): error TS2616: 'Foo' can only be imported by using 'import Foo = require("a")' or a default import.
++b.js(1,10): error TS2616: 'Foo' can only be imported by using 'import Foo = require("./a")' or a default import.
  b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
 
 
@@ -11,6 +11,6 @@
      import { Foo } from './a';
               ~~~
 -!!! error TS2597: 'Foo' can only be imported by using a 'require' call or by using a default import.
-+!!! error TS2616: 'Foo' can only be imported by using 'import Foo = require("a")' or a default import.
++!!! error TS2616: 'Foo' can only be imported by using 'import Foo = require("./a")' or a default import.
                          ~~~~~
  !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export.
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types.diff
index 998db07714..a9e5ff0b6b 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsDeclarationsWithDefaultAsNamespaceLikeMerge.types.diff
@@ -5,31 +5,31 @@
  === /index.js ===
  import { createNamespacedHelpers } from './helper'
 ->createNamespacedHelpers : () => import("/helper").NamespacedMappers
-+>createNamespacedHelpers : () => import("./helper.js").NamespacedMappers
++>createNamespacedHelpers : () => import("./helper").NamespacedMappers
 
  const { mapState } = createNamespacedHelpers()
 ->mapState : import("/helper").Mapper<import("/helper").Computed>
 ->createNamespacedHelpers() : import("/helper").NamespacedMappers
 ->createNamespacedHelpers : () => import("/helper").NamespacedMappers
-+>mapState : import("./helper.js").Mapper<import("./helper.js").Computed>
-+>createNamespacedHelpers() : import("./helper.js").NamespacedMappers
-+>createNamespacedHelpers : () => import("./helper.js").NamespacedMappers
++>mapState : import("./helper").Mapper<import("./helper").Computed>
++>createNamespacedHelpers() : import("./helper").NamespacedMappers
++>createNamespacedHelpers : () => import("./helper").NamespacedMappers
 
  export default {
 ->{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("/helper").Computed; }; }
-+>{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("./helper.js").Computed; }; }
++>{    computed: {        ...mapState(['panels'])    }} : { computed: { panels: import("./helper").Computed; }; }
 
      computed: {
 ->computed : { panels: import("/helper").Computed; }
 ->{        ...mapState(['panels'])    } : { panels: import("/helper").Computed; }
-+>computed : { panels: import("./helper.js").Computed; }
-+>{        ...mapState(['panels'])    } : { panels: import("./helper.js").Computed; }
++>computed : { panels: import("./helper").Computed; }
++>{        ...mapState(['panels'])    } : { panels: import("./helper").Computed; }
 
          ...mapState(['panels'])
 ->mapState(['panels']) : { panels: import("/helper").Computed; }
 ->mapState : import("/helper").Mapper<import("/helper").Computed>
-+>mapState(['panels']) : { panels: import("./helper.js").Computed; }
-+>mapState : import("./helper.js").Mapper<import("./helper.js").Computed>
++>mapState(['panels']) : { panels: import("./helper").Computed; }
++>mapState : import("./helper").Mapper<import("./helper").Computed>
  >['panels'] : "panels"[]
  >'panels' : "panels"
      }
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsdocReferenceGlobalTypeInCommonJs.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsdocReferenceGlobalTypeInCommonJs.types.diff
index 87fb9255ab..9d1a67beed 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/jsdocReferenceGlobalTypeInCommonJs.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsdocReferenceGlobalTypeInCommonJs.types.diff
@@ -5,7 +5,7 @@
  === puppet.d.ts ===
  export as namespace Puppeteer;
 ->Puppeteer : typeof import("puppet")
-+>Puppeteer : typeof import("./puppet.js")
++>Puppeteer : typeof import("./puppet")
 
  export interface Keyboard {
      key: string
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt.diff
index 296937edac..ed30b40e0c 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt.diff
@@ -2,13 +2,13 @@
 +++ new.moduleResolution_explicitNodeModulesImport_implicitAny.errors.txt
 @@= skipped -0, +0 lines =@@
 -<no content>
-+/src/index.ts(1,10): error TS2305: Module '"/node_modules/foo/index"' has no exported member 'y'.
++/src/index.ts(1,10): error TS2305: Module '"foo"' has no exported member 'y'.
 +
 +
 +==== /src/index.ts (1 errors) ====
 +    import { y } from "../node_modules/foo";
 +             ~
-+!!! error TS2305: Module '"/node_modules/foo/index"' has no exported member 'y'.
++!!! error TS2305: Module '"foo"' has no exported member 'y'.
 +    
 +==== /node_modules/foo/index.js (0 errors) ====
 +    exports.x = 0;
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/reactImportDropped.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/reactImportDropped.types.diff
index 805a54f18e..a0d91d632b 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/reactImportDropped.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/reactImportDropped.types.diff
@@ -8,10 +8,10 @@
 ->React.createClass : (spec: any) => import("react").ClassicComponentClass
 ->React : typeof import("react")
 ->createClass : (spec: any) => import("react").ClassicComponentClass
-+>React.createClass({  render() {    return (      null    );  }}) : import("../../react.js").ClassicComponentClass
-+>React.createClass : (spec: any) => import("../../react.js").ClassicComponentClass
-+>React : typeof import("../../react.js")
-+>createClass : (spec: any) => import("../../react.js").ClassicComponentClass
++>React.createClass({  render() {    return (      null    );  }}) : import("../../react").ClassicComponentClass
++>React.createClass : (spec: any) => import("../../react").ClassicComponentClass
++>React : typeof import("../../react")
++>createClass : (spec: any) => import("../../react").ClassicComponentClass
  >{  render() {    return (      null    );  }} : { render(): any; }
 
    render() {
@@ -33,7 +33,7 @@
 ->layout.footerHeight : error
 +>x : any
 +><TabBar height={layout.footerHeight} /> : any
-+>TabBar : import("../../../react.js").ClassicComponentClass
++>TabBar : import("../../../react").ClassicComponentClass
 +>height : any
 +>layout.footerHeight : any
  >layout : any
diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.errors.txt.diff
index 838a4a0505..01103a1613 100644
--- a/testdata/baselines/reference/submoduleAccepted/compiler/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/compiler/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.errors.txt.diff
@@ -7,7 +7,7 @@
 -
 -==== /contractHelper.d.ts (0 errors) ====
 +/contractHelper.d.ts(3,67): error TS2694: Namespace '"/types"' has no exported member 'ParamStateRecord'.
-+/exported.d.ts(2,10): error TS2305: Module '"/types"' has no exported member 'ParamStateRecord'.
++/exported.d.ts(2,10): error TS2305: Module '"./types.js"' has no exported member 'ParamStateRecord'.
 +
 +
 +==== /contractHelper.d.ts (1 errors) ====
@@ -24,7 +24,7 @@
      type _ERef<T> = T | Promise<T>;
      import { ParamStateRecord as _ParamStateRecord } from './types.js';
 +             ~~~~~~~~~~~~~~~~
-+!!! error TS2305: Module '"/types"' has no exported member 'ParamStateRecord'.
++!!! error TS2305: Module '"./types.js"' has no exported member 'ParamStateRecord'.
      declare global {
        // @ts-ignore TS2666
        export {
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/commonJsImportBindingElementNarrowType.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/commonJsImportBindingElementNarrowType.types.diff
index a6cbf82608..7f39934c91 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/commonJsImportBindingElementNarrowType.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/commonJsImportBindingElementNarrowType.types.diff
@@ -5,6 +5,6 @@
  const { a } = require("./foo");
  >a : number | null
 ->require("./foo") : typeof import("/foo")
-+>require("./foo") : typeof import("./foo.js")
++>require("./foo") : typeof import("./foo")
  >require : any
  >"./foo" : "./foo"
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=es2015).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=es2015).errors.txt.diff
index e51ab30ac7..68d32de5a0 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=es2015).errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=es2015).errors.txt.diff
@@ -2,29 +2,21 @@
 +++ new.importTag15(module=es2015).errors.txt
 @@= skipped -0, +0 lines =@@
  1.js(1,30): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+1.js(1,30): error TS2857: Import attributes cannot be used with type-only imports or exports.
 +1.js(2,27): error TS2307: Cannot find module './0' or its corresponding type declarations.
  1.js(2,33): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+1.js(2,33): error TS2857: Import attributes cannot be used with type-only imports or exports.
 
 
  ==== 0.ts (0 errors) ====
      export interface I { }
      
 -==== 1.js (2 errors) ====
-+==== 1.js (5 errors) ====
++==== 1.js (3 errors) ====
      /** @import { I } from './0' with { type: "json" } */
                                   ~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                 ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
      /** @import * as foo from './0' with { type: "json" } */
 +                              ~~~~~
 +!!! error TS2307: Cannot find module './0' or its corresponding type declarations.
                                      ~~~~~~~~~~~~~~~~~~~~~
  !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+                                    ~~~~~~~~~~~~~~~~~~~~~
-+!!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-     
-     /** @param {I} a */
-     function f(a) {}
\ No newline at end of file
+     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/importTypeInJSDoc.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/importTypeInJSDoc.types.diff
index 81e89fc45f..3c4417e952 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/importTypeInJSDoc.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/importTypeInJSDoc.types.diff
@@ -5,7 +5,7 @@
 
      constructor(x: MyClass.Bar);
 ->x : MyClass.Bar
-+>x : import("./externs.js").Bar
++>x : import("./externs").Bar
  >MyClass : any
  }
  declare global {
@@ -15,9 +15,9 @@
  let a = /** @type {Foo} */(/** @type {*} */(undefined)); 
 ->a : import("externs")
 ->(/** @type {*} */(undefined)) : import("externs")
-+>a : import("./externs.js")
-+>(/** @type {*} */(undefined)) : import("./externs.js")
-+>(undefined) : import("./externs.js")
++>a : import("./externs")
++>(/** @type {*} */(undefined)) : import("./externs")
++>(undefined) : import("./externs")
  >(undefined) : any
 +>undefined : any
  >undefined : undefined
@@ -27,23 +27,23 @@
 ->a : import("externs")
 ->new Foo({doer: Foo.Bar}) : import("externs")
 ->Foo : typeof import("externs")
-+>a = new Foo({doer: Foo.Bar}) : import("./externs.js")
-+>a : import("./externs.js")
-+>new Foo({doer: Foo.Bar}) : import("./externs.js")
-+>Foo : typeof import("./externs.js")
++>a = new Foo({doer: Foo.Bar}) : import("./externs")
++>a : import("./externs")
++>new Foo({doer: Foo.Bar}) : import("./externs")
++>Foo : typeof import("./externs")
  >{doer: Foo.Bar} : { doer: (x: string, y?: number) => void; }
  >doer : (x: string, y?: number) => void
  >Foo.Bar : (x: string, y?: number) => void
 ->Foo : typeof import("externs")
-+>Foo : typeof import("./externs.js")
++>Foo : typeof import("./externs")
  >Bar : (x: string, y?: number) => void
 
  const q = /** @type {import("./externs").Bar} */({ doer: q => q });
 ->q : import("externs").Bar
 ->({ doer: q => q }) : import("externs").Bar
-+>q : import("./externs.js").Bar
-+>({ doer: q => q }) : import("./externs.js").Bar
-+>{ doer: q => q } : import("./externs.js").Bar
++>q : import("./externs").Bar
++>({ doer: q => q }) : import("./externs").Bar
++>{ doer: q => q } : import("./externs").Bar
  >{ doer: q => q } : { doer: (q: string) => string; }
  >doer : (q: string) => string
  >q => q : (q: string) => string
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff
index 8b725dd7c1..fdb2517e54 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff
@@ -6,14 +6,14 @@
  export const f1 = function() {
 ->f1 : import("/types").M
 ->function() {    this.test();} : (this: import("/types").Foo) => void
-+>f1 : import("./types.js").M
-+>function() {    this.test();} : (this: import("./types.js").Foo) => void
++>f1 : import("./types").M
++>function() {    this.test();} : (this: import("./types").Foo) => void
 
      this.test();
  >this.test() : any
  >this.test : any
 ->this : import("/types").Foo
-+>this : import("./types.js").Foo
++>this : import("./types").Foo
  >test : any
  }
 
@@ -30,18 +30,12 @@
  >test : any
  }
 
- /** @type {(this: import('./types').Foo) => void} */
- export const f3 = function() {
-->f3 : (this: import("./types").Foo) => void
-->function() {    this.test();} : (this: import("./types").Foo) => void
-+>f3 : (this: import("./types.js").Foo) => void
-+>function() {    this.test();} : (this: import("./types.js").Foo) => void
-
+@@= skipped -29, +29 lines =@@
      this.test();
  >this.test() : any
  >this.test : any
 ->this : import("/types").Foo
-+>this : import("./types.js").Foo
++>this : import("./types").Foo
  >test : any
  }
 
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/node10AlternateResult_noResolution.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/node10AlternateResult_noResolution.errors.txt.diff
index 3e1767a3ca..aed7baaa89 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/node10AlternateResult_noResolution.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/node10AlternateResult_noResolution.errors.txt.diff
@@ -3,7 +3,7 @@
 @@= skipped -0, +0 lines =@@
 -/index.ts(1,21): error TS2307: Cannot find module 'pkg' or its corresponding type declarations.
 -  There are types at '/node_modules/pkg/definitely-not-index.d.ts', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'.
-+/index.ts(1,10): error TS2305: Module '"/node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
++/index.ts(1,10): error TS2305: Module '"./node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
 
 
  ==== /node_modules/pkg/package.json (0 errors) ====
@@ -15,5 +15,5 @@
 -!!! error TS2307: Cannot find module 'pkg' or its corresponding type declarations.
 -!!! error TS2307:   There are types at '/node_modules/pkg/definitely-not-index.d.ts', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'.
 +             ~~~
-+!!! error TS2305: Module '"/node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
++!!! error TS2305: Module '"./node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/node10Alternateresult_noTypes.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/node10Alternateresult_noTypes.errors.txt.diff
index c1291cc7a9..56d416d7fc 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/node10Alternateresult_noTypes.errors.txt.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/node10Alternateresult_noTypes.errors.txt.diff
@@ -11,7 +11,7 @@
 -!!! error TS6504: File '/node_modules/pkg/untyped.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 -!!! error TS6504:   The file is in the program because:
 -!!! error TS6504:     Root file specified for compilation
-+/index.ts(1,10): error TS2305: Module '"/node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
++/index.ts(1,10): error TS2305: Module '"./node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
 +
 +
  ==== /node_modules/pkg/package.json (0 errors) ====
@@ -25,5 +25,5 @@
 -!!! error TS7016: Could not find a declaration file for module 'pkg'. '/node_modules/pkg/untyped.js' implicitly has an 'any' type.
 -!!! error TS7016:   There are types at '/node_modules/pkg/definitely-not-index.d.ts', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'.
 +             ~~~
-+!!! error TS2305: Module '"/node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
++!!! error TS2305: Module '"./node_modules/pkg/definitely-not-index"' has no exported member 'pkg'.
      
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/requireAssertsFromTypescript.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/requireAssertsFromTypescript.types.diff
index c3bcd5a66b..d4a7a39898 100644
--- a/testdata/baselines/reference/submoduleAccepted/conformance/requireAssertsFromTypescript.types.diff
+++ b/testdata/baselines/reference/submoduleAccepted/conformance/requireAssertsFromTypescript.types.diff
@@ -5,6 +5,6 @@
  const { art } = require('./ex')
  >art : (value: any, message?: string | Error) => asserts value
 ->require('./ex') : typeof import("ex")
-+>require('./ex') : typeof import("./ex.js")
++>require('./ex') : typeof import("./ex")
  >require : any
  >'./ex' : "./ex"

From 427464100072fd39970ef3d11f7c8b1984d06256 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Mon, 2 Jun 2025 10:43:09 -0700
Subject: [PATCH 5/7] Update baseline

---
 internal/checker/checker.go                                   | 2 +-
 .../symbolLinkDeclarationEmitModuleNamesRootDir.types         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/checker/checker.go b/internal/checker/checker.go
index b7f5d00a88..423eb4e764 100644
--- a/internal/checker/checker.go
+++ b/internal/checker/checker.go
@@ -14931,7 +14931,7 @@ func (c *Checker) getFullyQualifiedName(symbol *ast.Symbol, containingLocation *
 	if symbol.Parent != nil {
 		return c.getFullyQualifiedName(symbol.Parent, containingLocation) + "." + c.symbolToString(symbol)
 	}
-	return c.symbolToStringEx(symbol, containingLocation, ast.SymbolFlagsAll, SymbolFormatFlagsDoNotIncludeSymbolChain|SymbolFormatFlagsAllowAnyNodeKind, nil /*writer*/)
+	return c.symbolToStringEx(symbol, containingLocation, ast.SymbolFlagsAll, SymbolFormatFlagsDoNotIncludeSymbolChain|SymbolFormatFlagsAllowAnyNodeKind)
 }
 
 func (c *Checker) getExportsOfSymbol(symbol *ast.Symbol) ast.SymbolTable {
diff --git a/testdata/baselines/reference/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types b/testdata/baselines/reference/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
index f15f65a56d..1baf44e028 100644
--- a/testdata/baselines/reference/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
+++ b/testdata/baselines/reference/compiler/symbolLinkDeclarationEmitModuleNamesRootDir.types
@@ -17,9 +17,9 @@ import { BindingKey } from '@loopback/context';
 export const CONTROLLER_CLASS = BindingKey.create<ControllerClass>(null as any); // line in question
 >CONTROLLER_CLASS : BindingKey<ControllerClass>
 >BindingKey.create<ControllerClass>(null as any) : BindingKey<ControllerClass>
->BindingKey.create : <T extends import("../../context/index.js").Constructor<any>>(ctor: T) => BindingKey<T>
+>BindingKey.create : <T extends import("../../context").Constructor<any>>(ctor: T) => BindingKey<T>
 >BindingKey : typeof BindingKey
->create : <T extends import("../../context/index.js").Constructor<any>>(ctor: T) => BindingKey<T>
+>create : <T extends import("../../context").Constructor<any>>(ctor: T) => BindingKey<T>
 >null as any : any
 
 === /monorepo/context/src/value-promise.d.ts ===

From 961e1812fc0caf5d84ac42bdd8f1178ad0f1f5e0 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Mon, 2 Jun 2025 11:04:26 -0700
Subject: [PATCH 6/7] Fix JSDoc namespace imports

---
 internal/checker/checker.go                   | 14 +++++++--
 .../importTag15(module=es2015).errors.txt     |  5 +---
 .../importTag15(module=esnext).errors.txt     |  5 +---
 .../conformance/importTag2.errors.txt         | 20 -------------
 .../conformance/importTag9.errors.txt         | 26 ----------------
 ...importTag15(module=es2015).errors.txt.diff | 22 --------------
 ...importTag15(module=esnext).errors.txt.diff | 22 --------------
 .../conformance/importTag2.errors.txt.diff    | 24 ---------------
 .../conformance/importTag9.errors.txt.diff    | 30 -------------------
 9 files changed, 13 insertions(+), 155 deletions(-)
 delete mode 100644 testdata/baselines/reference/submodule/conformance/importTag2.errors.txt
 delete mode 100644 testdata/baselines/reference/submodule/conformance/importTag9.errors.txt
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=es2015).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=esnext).errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/importTag2.errors.txt.diff
 delete mode 100644 testdata/baselines/reference/submoduleAccepted/conformance/importTag9.errors.txt.diff

diff --git a/internal/checker/checker.go b/internal/checker/checker.go
index 423eb4e764..59ed4274e8 100644
--- a/internal/checker/checker.go
+++ b/internal/checker/checker.go
@@ -14326,9 +14326,17 @@ func (c *Checker) resolveExternalModule(location *ast.Node, moduleReference stri
 		contextSpecifier = location.AsVariableDeclaration().Initializer.AsCallExpression().Arguments.Nodes[0]
 	} else {
 		var ancestor *ast.Node
-		ancestor = ast.FindAncestor(location, ast.IsImportCall)
-		if ancestor != nil {
-			contextSpecifier = ancestor.AsCallExpression().Arguments.Nodes[0]
+		if location.Flags&ast.NodeFlagsJSDoc != 0 {
+			ancestor = ast.FindAncestor(location, ast.IsJSDocImportTag)
+			if ancestor != nil {
+				contextSpecifier = ancestor.AsJSDocImportTag().JSImportDeclaration.ModuleSpecifier
+			}
+		}
+		if ancestor == nil {
+			ancestor = ast.FindAncestor(location, ast.IsImportCall)
+			if ancestor != nil {
+				contextSpecifier = ancestor.AsCallExpression().Arguments.Nodes[0]
+			}
 		}
 		if ancestor == nil {
 			ancestor = ast.FindAncestor(location, ast.IsImportDeclarationOrJSImportDeclaration)
diff --git a/testdata/baselines/reference/submodule/conformance/importTag15(module=es2015).errors.txt b/testdata/baselines/reference/submodule/conformance/importTag15(module=es2015).errors.txt
index 00d266cd48..e3dba21b47 100644
--- a/testdata/baselines/reference/submodule/conformance/importTag15(module=es2015).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/importTag15(module=es2015).errors.txt
@@ -1,18 +1,15 @@
 1.js(1,30): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-1.js(2,27): error TS2307: Cannot find module './0' or its corresponding type declarations.
 1.js(2,33): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
 
 
 ==== 0.ts (0 errors) ====
     export interface I { }
     
-==== 1.js (3 errors) ====
+==== 1.js (2 errors) ====
     /** @import { I } from './0' with { type: "json" } */
                                  ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     /** @import * as foo from './0' with { type: "json" } */
-                              ~~~~~
-!!! error TS2307: Cannot find module './0' or its corresponding type declarations.
                                     ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
     
diff --git a/testdata/baselines/reference/submodule/conformance/importTag15(module=esnext).errors.txt b/testdata/baselines/reference/submodule/conformance/importTag15(module=esnext).errors.txt
index 3cf89722e4..3b98c15768 100644
--- a/testdata/baselines/reference/submodule/conformance/importTag15(module=esnext).errors.txt
+++ b/testdata/baselines/reference/submodule/conformance/importTag15(module=esnext).errors.txt
@@ -1,18 +1,15 @@
 1.js(1,30): error TS2857: Import attributes cannot be used with type-only imports or exports.
-1.js(2,27): error TS2307: Cannot find module './0' or its corresponding type declarations.
 1.js(2,33): error TS2857: Import attributes cannot be used with type-only imports or exports.
 
 
 ==== 0.ts (0 errors) ====
     export interface I { }
     
-==== 1.js (3 errors) ====
+==== 1.js (2 errors) ====
     /** @import { I } from './0' with { type: "json" } */
                                  ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2857: Import attributes cannot be used with type-only imports or exports.
     /** @import * as foo from './0' with { type: "json" } */
-                              ~~~~~
-!!! error TS2307: Cannot find module './0' or its corresponding type declarations.
                                     ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2857: Import attributes cannot be used with type-only imports or exports.
     
diff --git a/testdata/baselines/reference/submodule/conformance/importTag2.errors.txt b/testdata/baselines/reference/submodule/conformance/importTag2.errors.txt
deleted file mode 100644
index 97285af554..0000000000
--- a/testdata/baselines/reference/submodule/conformance/importTag2.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/foo.js(2,28): error TS2307: Cannot find module './types' or its corresponding type declarations.
-
-
-==== /types.ts (0 errors) ====
-    export interface Foo {
-        a: number;
-    }
-    
-==== /foo.js (1 errors) ====
-    /**
-     * @import * as types from "./types"
-                               ~~~~~~~~~
-!!! error TS2307: Cannot find module './types' or its corresponding type declarations.
-     */
-    
-    /**
-     * @param { types.Foo } foo
-     */
-    export function f(foo) {}
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/conformance/importTag9.errors.txt b/testdata/baselines/reference/submodule/conformance/importTag9.errors.txt
deleted file mode 100644
index 19d5f86897..0000000000
--- a/testdata/baselines/reference/submodule/conformance/importTag9.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-/foo.js(4,9): error TS2307: Cannot find module './types' or its corresponding type declarations.
-
-
-==== /types.ts (0 errors) ====
-    export interface A {
-        a: number;
-    }
-    export interface B {
-        a: number;
-    }
-    
-==== /foo.js (1 errors) ====
-    /**
-     * @import
-     * * as types
-     * from "./types"
-            ~~~~~~~~~
-!!! error TS2307: Cannot find module './types' or its corresponding type declarations.
-     */
-    
-    /**
-     * @param { types.A } a
-     * @param { types.B } b
-     */
-    function f(a, b) {}
-    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=es2015).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=es2015).errors.txt.diff
deleted file mode 100644
index 68d32de5a0..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=es2015).errors.txt.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.importTag15(module=es2015).errors.txt
-+++ new.importTag15(module=es2015).errors.txt
-@@= skipped -0, +0 lines =@@
- 1.js(1,30): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-+1.js(2,27): error TS2307: Cannot find module './0' or its corresponding type declarations.
- 1.js(2,33): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-
-
- ==== 0.ts (0 errors) ====
-     export interface I { }
-     
--==== 1.js (2 errors) ====
-+==== 1.js (3 errors) ====
-     /** @import { I } from './0' with { type: "json" } */
-                                  ~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     /** @import * as foo from './0' with { type: "json" } */
-+                              ~~~~~
-+!!! error TS2307: Cannot find module './0' or its corresponding type declarations.
-                                     ~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=esnext).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=esnext).errors.txt.diff
deleted file mode 100644
index 9c9e343cf3..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/importTag15(module=esnext).errors.txt.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- old.importTag15(module=esnext).errors.txt
-+++ new.importTag15(module=esnext).errors.txt
-@@= skipped -0, +0 lines =@@
- 1.js(1,30): error TS2857: Import attributes cannot be used with type-only imports or exports.
-+1.js(2,27): error TS2307: Cannot find module './0' or its corresponding type declarations.
- 1.js(2,33): error TS2857: Import attributes cannot be used with type-only imports or exports.
-
-
- ==== 0.ts (0 errors) ====
-     export interface I { }
-     
--==== 1.js (2 errors) ====
-+==== 1.js (3 errors) ====
-     /** @import { I } from './0' with { type: "json" } */
-                                  ~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-     /** @import * as foo from './0' with { type: "json" } */
-+                              ~~~~~
-+!!! error TS2307: Cannot find module './0' or its corresponding type declarations.
-                                     ~~~~~~~~~~~~~~~~~~~~~
- !!! error TS2857: Import attributes cannot be used with type-only imports or exports.
-     
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/importTag2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/importTag2.errors.txt.diff
deleted file mode 100644
index e22c3e396c..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/importTag2.errors.txt.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- old.importTag2.errors.txt
-+++ new.importTag2.errors.txt
-@@= skipped -0, +0 lines =@@
--<no content>
-+/foo.js(2,28): error TS2307: Cannot find module './types' or its corresponding type declarations.
-+
-+
-+==== /types.ts (0 errors) ====
-+    export interface Foo {
-+        a: number;
-+    }
-+    
-+==== /foo.js (1 errors) ====
-+    /**
-+     * @import * as types from "./types"
-+                               ~~~~~~~~~
-+!!! error TS2307: Cannot find module './types' or its corresponding type declarations.
-+     */
-+    
-+    /**
-+     * @param { types.Foo } foo
-+     */
-+    export function f(foo) {}
-+    
\ No newline at end of file
diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/importTag9.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/importTag9.errors.txt.diff
deleted file mode 100644
index 20b36d2b6b..0000000000
--- a/testdata/baselines/reference/submoduleAccepted/conformance/importTag9.errors.txt.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- old.importTag9.errors.txt
-+++ new.importTag9.errors.txt
-@@= skipped -0, +0 lines =@@
--<no content>
-+/foo.js(4,9): error TS2307: Cannot find module './types' or its corresponding type declarations.
-+
-+
-+==== /types.ts (0 errors) ====
-+    export interface A {
-+        a: number;
-+    }
-+    export interface B {
-+        a: number;
-+    }
-+    
-+==== /foo.js (1 errors) ====
-+    /**
-+     * @import
-+     * * as types
-+     * from "./types"
-+            ~~~~~~~~~
-+!!! error TS2307: Cannot find module './types' or its corresponding type declarations.
-+     */
-+    
-+    /**
-+     * @param { types.A } a
-+     * @param { types.B } b
-+     */
-+    function f(a, b) {}
-+    
\ No newline at end of file

From 3d6564a4bb174f788baf7584f3ff71a21428b644 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Mon, 2 Jun 2025 14:13:48 -0700
Subject: [PATCH 7/7] Fix more races

---
 internal/compiler/fileloader.go | 5 ++---
 internal/parser/jsdoc.go        | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/compiler/fileloader.go b/internal/compiler/fileloader.go
index 65d5dc36c6..457108c0fa 100644
--- a/internal/compiler/fileloader.go
+++ b/internal/compiler/fileloader.go
@@ -495,7 +495,7 @@ func getModeForUsageLocation(file *ast.SourceFile, meta *ast.SourceFileMetaData,
 			}
 		}
 	}
-	if usage.Parent.Parent != nil && ast.IsImportTypeNode(usage.Parent.Parent) {
+	if ast.IsLiteralTypeNode(usage.Parent) && ast.IsImportTypeNode(usage.Parent.Parent) {
 		if override, ok := usage.Parent.Parent.AsImportTypeNode().Attributes.GetResolutionModeOverride(); ok {
 			return override
 		}
@@ -521,8 +521,7 @@ func getEmitSyntaxForUsageLocationWorker(file *ast.SourceFile, meta *ast.SourceF
 		return core.ResolutionModeNone
 	}
 
-	exprParentParent := ast.WalkUpParenthesizedExpressions(usage.Parent).Parent
-	if exprParentParent != nil && ast.IsImportEqualsDeclaration(exprParentParent) || ast.IsRequireCall(usage.Parent) {
+	if ast.IsRequireCall(usage.Parent) || ast.IsExternalModuleReference(usage.Parent) && ast.IsImportEqualsDeclaration(usage.Parent.Parent) {
 		return core.ModuleKindCommonJS
 	}
 	if ast.IsImportCall(ast.WalkUpParenthesizedExpressions(usage.Parent)) {
diff --git a/internal/parser/jsdoc.go b/internal/parser/jsdoc.go
index 580df95a1f..c70ed2a99f 100644
--- a/internal/parser/jsdoc.go
+++ b/internal/parser/jsdoc.go
@@ -457,6 +457,7 @@ func (p *Parser) parseTag(tags []*ast.Node, margin int) *ast.Node {
 		tag = p.parseSeeTag(start, tagName, margin, indentText)
 	case "import":
 		tag = p.parseImportTag(start, tagName, margin, indentText)
+		ast.SetParentInChildren(tag)
 	default:
 		tag = p.parseUnknownTag(start, tagName, margin, indentText)
 	}