From d5c93bfa39c798bc5f594aa85e37a8b0cbe0b44e Mon Sep 17 00:00:00 2001 From: Spencer Date: Fri, 30 Dec 2022 12:43:04 -0600 Subject: [PATCH] fix(core): find imports in `export type` statements (#13921) --- packages/nx/src/utils/strip-source-code.spec.ts | 2 ++ packages/nx/src/utils/strip-source-code.ts | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/nx/src/utils/strip-source-code.spec.ts b/packages/nx/src/utils/strip-source-code.spec.ts index a47549a9d5..082783b45a 100644 --- a/packages/nx/src/utils/strip-source-code.spec.ts +++ b/packages/nx/src/utils/strip-source-code.spec.ts @@ -47,6 +47,7 @@ import('./module.ts')`; } from './a'; export { B } from './b'; + export type { B } from './b'; export { C as D } from './c'; @@ -58,6 +59,7 @@ export { A } from './a' export { B } from './b' +export type { B } from './b' export { C as D } from './c'`; expect(stripSourceCode(scanner, input)).toEqual(expected); diff --git a/packages/nx/src/utils/strip-source-code.ts b/packages/nx/src/utils/strip-source-code.ts index 585d5f5f0c..0e85d38c3d 100644 --- a/packages/nx/src/utils/strip-source-code.ts +++ b/packages/nx/src/utils/strip-source-code.ts @@ -1,6 +1,6 @@ import type { Scanner } from 'typescript'; -let SyntaxKind; +let SyntaxKind: typeof import('typescript').SyntaxKind; export function stripSourceCode(scanner: Scanner, contents: string): string { if (!SyntaxKind) { SyntaxKind = require('typescript').SyntaxKind; @@ -90,7 +90,8 @@ export function stripSourceCode(scanner: Scanner, contents: string): string { } if ( token === SyntaxKind.OpenBraceToken || - token === SyntaxKind.AsteriskToken + token === SyntaxKind.AsteriskToken || + token === SyntaxKind.TypeKeyword ) { start = potentialStart; }