@@ -15,12 +15,10 @@ const require = createRequire(import.meta.url)
1515let hookedIn = false
1616
1717function seedCJSModuleCacheAndReturnTarget ( matchedModule : RegisteredModule , parent : Module ) {
18- console . error ( 'matched' , matchedModule . filename )
1918 if ( matchedModule . loaded ) {
2019 return matchedModule . filename
2120 }
2221 const { source, filename } = matchedModule
23- console . error ( 'evaluating module' , { filename } )
2422
2523 const mod = new Module ( filename )
2624 mod . parent = parent
@@ -39,14 +37,12 @@ function seedCJSModuleCacheAndReturnTarget(matchedModule: RegisteredModule, pare
3937 compiled ( mod . exports , createRequire ( pathToFileURL ( filename ) ) , mod , filename , dirname ( filename ) )
4038 mod . loaded = matchedModule . loaded = true
4139
42- console . error ( 'evaluated module' , { filename } )
4340 return filename
4441}
4542
4643const exts = [ '.js' , '.cjs' , '.json' ]
4744
4845function tryWithExtensions ( filename : string ) {
49- // console.error('trying to match', filename)
5046 let matchedModule = registeredModules . get ( filename )
5147 if ( ! matchedModule ) {
5248 for ( const ext of exts ) {
@@ -64,7 +60,6 @@ function tryWithExtensions(filename: string) {
6460}
6561
6662function tryMatchingWithIndex ( target : string ) {
67- console . error ( 'trying to match' , target )
6863 let matchedModule = tryWithExtensions ( target )
6964 if ( ! matchedModule ) {
7065 // require("./test") might resolve to ./test/index.js
@@ -84,20 +79,11 @@ export function registerCJSModules(baseUrl: URL, modules: Map<string, string>) {
8479 registeredModules . set ( target , { source, loaded : false , filename : target } )
8580 }
8681
87- console . error ( [ ...registeredModules . values ( ) ] . map ( ( m ) => m . filename ) )
88-
8982 if ( ! hookedIn ) {
90- // magic
9183 // @ts -expect-error - private untyped API
9284 const original_resolveFilename = Module . _resolveFilename . bind ( Module )
9385 // @ts -expect-error - private untyped API
9486 Module . _resolveFilename = ( ...args ) => {
95- console . error (
96- 'resolving file name for specifier' ,
97- args [ 0 ] ?? '--missing specifier--' ,
98- 'from' ,
99- args [ 1 ] ?. filename ?? 'unknown' ,
100- )
10187 let target = args [ 0 ]
10288 let isRelative = args ?. [ 0 ] . startsWith ( '.' )
10389
@@ -111,10 +97,8 @@ export function registerCJSModules(baseUrl: URL, modules: Map<string, string>) {
11197 let matchedModule = tryMatchingWithIndex ( target )
11298
11399 if ( ! isRelative && ! target . startsWith ( '/' ) ) {
114- console . log ( 'not relative, checking node_modules' , args [ 0 ] )
115100 for ( const nodeModulePaths of args [ 1 ] . paths ) {
116101 const potentialPath = join ( nodeModulePaths , target )
117- console . log ( 'checking potential path' , potentialPath )
118102 matchedModule = tryMatchingWithIndex ( potentialPath )
119103 if ( matchedModule ) {
120104 break
@@ -123,7 +107,6 @@ export function registerCJSModules(baseUrl: URL, modules: Map<string, string>) {
123107 }
124108
125109 if ( matchedModule ) {
126- console . log ( 'matched module' , matchedModule . filename )
127110 return seedCJSModuleCacheAndReturnTarget ( matchedModule , args [ 1 ] )
128111 }
129112
0 commit comments