From c5ccd9c2fb6a0318ef9a5ca9f36496e14f09d6d1 Mon Sep 17 00:00:00 2001 From: Jason Jean Date: Wed, 16 Jun 2021 10:37:31 -0400 Subject: [PATCH] fix(core): resolve npm packages after typescript --- .../workspace/src/core/target-project-locator.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/workspace/src/core/target-project-locator.ts b/packages/workspace/src/core/target-project-locator.ts index b2b1880440..80bbba03f4 100644 --- a/packages/workspace/src/core/target-project-locator.ts +++ b/packages/workspace/src/core/target-project-locator.ts @@ -69,12 +69,6 @@ export class TargetProjectLocator { } } - // try to find npm package before using expensive typescript resolution - const npmProject = this.findNpmPackage(importExpr); - if (npmProject || this.npmResolutionCache.has(importExpr)) { - return npmProject; - } - let resolvedModule: string; if (this.typescriptResolutionCache.has(normalizedImportExpr)) { resolvedModule = this.typescriptResolutionCache.get(normalizedImportExpr); @@ -97,6 +91,13 @@ export class TargetProjectLocator { return resolvedProject; } } + + // try to find npm package before using expensive typescript resolution + const npmProject = this.findNpmPackage(importExpr); + if (npmProject || this.npmResolutionCache.has(importExpr)) { + return npmProject; + } + // TODO: meeroslav this block should be probably removed const importedProject = this.sortedWorkspaceProjects.find((p) => { const projectImport = `@${npmScope}/${p.data.normalizedRoot}`;