Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 64d7378

Browse files
Tom van Ommerentomv564
Tom van Ommeren
authored andcommitted
fix: plugin loading for windows
1 parent 3df438c commit 64d7378

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/project-manager.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,9 +1006,10 @@ export class ProjectConfiguration {
10061006
* @param initialDir
10071007
*/
10081008
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 = '';
10101011
this.logger.info(`Loading ${moduleName} from ${initialDir} (resolved to ${resolvedPath})`);
1011-
const result = this.requirePlugin(resolvedPath, moduleName);
1012+
const result = this.requirePlugin(initialDir, moduleName);
10121013
if (result.error) {
10131014
this.logger.info(`Failed to load module: ${JSON.stringify(result.error)}`);
10141015
return undefined;
@@ -1037,14 +1038,16 @@ export class ProjectConfiguration {
10371038
* Throws an error if the module can't be resolved.
10381039
*/
10391040
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);
10421044
// TODO: jsOnly flag missing :(
1043-
if (!resolvedModule) {
1045+
if (!result.resolvedModule) {
10441046
// TODO: add Looked in: ${failedLookupLocations.join(', ')} back into error.
1047+
// this.logger.error(result.failedLookupLocations!);
10451048
throw new Error(`Could not resolve JS module ${moduleName} starting at ${initialDir}.`);
10461049
}
1047-
return resolvedModule.resolvedFileName;
1050+
return result.resolvedModule.resolvedFileName;
10481051
}
10491052

10501053
/**

0 commit comments

Comments
 (0)