@@ -1006,9 +1006,10 @@ export class ProjectConfiguration {
1006
1006
* @param initialDir
1007
1007
*/
1008
1008
private resolveModule ( moduleName : string , initialDir : string ) : { } | undefined {
1009
- const resolvedPath = path . resolve ( initialDir , 'node_modules' ) ;
1009
+ // const resolvedPath = path.resolve(initialDir, 'node_modules');
1010
+ const resolvedPath = '' ;
1010
1011
this . logger . info ( `Loading ${ moduleName } from ${ initialDir } (resolved to ${ resolvedPath } )` ) ;
1011
- const result = this . requirePlugin ( resolvedPath , moduleName ) ;
1012
+ const result = this . requirePlugin ( initialDir , moduleName ) ;
1012
1013
if ( result . error ) {
1013
1014
this . logger . info ( `Failed to load module: ${ JSON . stringify ( result . error ) } ` ) ;
1014
1015
return undefined ;
@@ -1037,14 +1038,16 @@ export class ProjectConfiguration {
1037
1038
* Throws an error if the module can't be resolved.
1038
1039
*/
1039
1040
private resolveJavaScriptModule ( moduleName : string , initialDir : string , host : ts . ModuleResolutionHost ) : string {
1040
- const { resolvedModule /* , failedLookupLocations */ } =
1041
- ts . nodeModuleNameResolver ( moduleName , /* containingFile */ initialDir , { moduleResolution : ts . ModuleResolutionKind . NodeJs , allowJs : true } , this . fs , undefined ) ;
1041
+ // const { resolvedModule /* , failedLookupLocations */ } =
1042
+ const result =
1043
+ ts . nodeModuleNameResolver ( moduleName , /* containingFile */ initialDir . replace ( '\\' , '/' ) + '/package.json' , { moduleResolution : ts . ModuleResolutionKind . NodeJs , allowJs : true } , this . fs , undefined ) ;
1042
1044
// TODO: jsOnly flag missing :(
1043
- if ( ! resolvedModule ) {
1045
+ if ( ! result . resolvedModule ) {
1044
1046
// TODO: add Looked in: ${failedLookupLocations.join(', ')} back into error.
1047
+ // this.logger.error(result.failedLookupLocations!);
1045
1048
throw new Error ( `Could not resolve JS module ${ moduleName } starting at ${ initialDir } .` ) ;
1046
1049
}
1047
- return resolvedModule . resolvedFileName ;
1050
+ return result . resolvedModule . resolvedFileName ;
1048
1051
}
1049
1052
1050
1053
/**
0 commit comments