From 30203b86b0bb2f43706d55ba6d07f6867f81ce38 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Sat, 23 May 2020 16:10:23 -0500 Subject: [PATCH] fix(ts): ts resolve failedLookupLocations fix --- .../sys/typescript/typescript-resolve-module.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/compiler/sys/typescript/typescript-resolve-module.ts b/src/compiler/sys/typescript/typescript-resolve-module.ts index 6274c3c2b12..d6f2007a7fd 100644 --- a/src/compiler/sys/typescript/typescript-resolve-module.ts +++ b/src/compiler/sys/typescript/typescript-resolve-module.ts @@ -83,7 +83,7 @@ export const patchedTsResolveModule = ( resolvedFileName = './' + resolvedFileName; } - return { + const rtn: ts.ResolvedModuleWithFailedLookupLocations = { resolvedModule: { extension: getTsResolveExtension(resolvedFileName), resolvedFileName, @@ -94,6 +94,8 @@ export const patchedTsResolveModule = ( }, }, }; + (rtn as any).failedLookupLocations = []; + return rtn; } // node module id @@ -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), @@ -113,6 +115,8 @@ export const tsResolveNodeModule = (config: d.Config, inMemoryFs: d.InMemoryFile }, }, }; + (rtn as any).failedLookupLocations = []; + return rtn; } const resolved = resolveRemoteModuleIdSync(config, inMemoryFs, { @@ -120,7 +124,7 @@ export const tsResolveNodeModule = (config: d.Config, inMemoryFs: d.InMemoryFile containingFile, }); if (resolved) { - return { + const rtn: ts.ResolvedModuleWithFailedLookupLocations = { resolvedModule: { extension: ts.Extension.Js, resolvedFileName: resolved.resolvedUrl, @@ -131,6 +135,8 @@ export const tsResolveNodeModule = (config: d.Config, inMemoryFs: d.InMemoryFile }, }, }; + (rtn as any).failedLookupLocations = []; + return rtn; } return null;