Skip to content

Commit

Permalink
fix(ts): ts resolve failedLookupLocations fix
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdbradley committed May 23, 2020
1 parent 8bb1803 commit 30203b8
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/compiler/sys/typescript/typescript-resolve-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const patchedTsResolveModule = (
resolvedFileName = './' + resolvedFileName;
}

return {
const rtn: ts.ResolvedModuleWithFailedLookupLocations = {
resolvedModule: {
extension: getTsResolveExtension(resolvedFileName),
resolvedFileName,
Expand All @@ -94,6 +94,8 @@ export const patchedTsResolveModule = (
},
},
};
(rtn as any).failedLookupLocations = [];
return rtn;
}

// node module id
Expand All @@ -102,7 +104,7 @@ export const patchedTsResolveModule = (

export const tsResolveNodeModule = (config: d.Config, inMemoryFs: d.InMemoryFileSystem, moduleId: string, containingFile: string): ts.ResolvedModuleWithFailedLookupLocations => {
if (isStencilCoreImport(moduleId)) {
return {
const rtn: ts.ResolvedModuleWithFailedLookupLocations = {
resolvedModule: {
extension: ts.Extension.Dts,
resolvedFileName: getStencilInternalDtsPath(config.rootDir),
Expand All @@ -113,14 +115,16 @@ export const tsResolveNodeModule = (config: d.Config, inMemoryFs: d.InMemoryFile
},
},
};
(rtn as any).failedLookupLocations = [];
return rtn;
}

const resolved = resolveRemoteModuleIdSync(config, inMemoryFs, {
moduleId,
containingFile,
});
if (resolved) {
return {
const rtn: ts.ResolvedModuleWithFailedLookupLocations = {
resolvedModule: {
extension: ts.Extension.Js,
resolvedFileName: resolved.resolvedUrl,
Expand All @@ -131,6 +135,8 @@ export const tsResolveNodeModule = (config: d.Config, inMemoryFs: d.InMemoryFile
},
},
};
(rtn as any).failedLookupLocations = [];
return rtn;
}

return null;
Expand Down

0 comments on commit 30203b8

Please sign in to comment.