@@ -948,9 +948,10 @@ export class ProjectConfiguration {
948
948
* @param initialDir
949
949
*/
950
950
private resolveModule ( moduleName : string , initialDir : string ) : { } | undefined {
951
- const resolvedPath = path . resolve ( initialDir , 'node_modules' ) ;
951
+ // const resolvedPath = path.resolve(initialDir, 'node_modules');
952
+ const resolvedPath = '' ;
952
953
this . logger . info ( `Loading ${ moduleName } from ${ initialDir } (resolved to ${ resolvedPath } )` ) ;
953
- const result = this . requirePlugin ( resolvedPath , moduleName ) ;
954
+ const result = this . requirePlugin ( initialDir , moduleName ) ;
954
955
if ( result . error ) {
955
956
this . logger . info ( `Failed to load module: ${ JSON . stringify ( result . error ) } ` ) ;
956
957
return undefined ;
@@ -979,14 +980,16 @@ export class ProjectConfiguration {
979
980
* Throws an error if the module can't be resolved.
980
981
*/
981
982
private resolveJavaScriptModule ( moduleName : string , initialDir : string , host : ts . ModuleResolutionHost ) : string {
982
- const { resolvedModule /* , failedLookupLocations */ } =
983
- ts . nodeModuleNameResolver ( moduleName , /* containingFile */ initialDir , { moduleResolution : ts . ModuleResolutionKind . NodeJs , allowJs : true } , this . fs , undefined ) ;
983
+ // const { resolvedModule /* , failedLookupLocations */ } =
984
+ const result =
985
+ ts . nodeModuleNameResolver ( moduleName , /* containingFile */ initialDir . replace ( '\\' , '/' ) + '/package.json' , { moduleResolution : ts . ModuleResolutionKind . NodeJs , allowJs : true } , this . fs , undefined ) ;
984
986
// TODO: jsOnly flag missing :(
985
- if ( ! resolvedModule ) {
987
+ if ( ! result . resolvedModule ) {
986
988
// TODO: add Looked in: ${failedLookupLocations.join(', ')} back into error.
989
+ // this.logger.error(result.failedLookupLocations!);
987
990
throw new Error ( `Could not resolve JS module ${ moduleName } starting at ${ initialDir } .` ) ;
988
991
}
989
- return resolvedModule . resolvedFileName ;
992
+ return result . resolvedModule . resolvedFileName ;
990
993
}
991
994
992
995
/**
0 commit comments