From 5034069d78a635b24e5c812a15be30435e3b641c Mon Sep 17 00:00:00 2001 From: Martin Probst Date: Thu, 29 Sep 2022 15:34:42 +0200 Subject: [PATCH] fix(compiler-cli): support hasInvalidatedResolutions. The latest TypeScript compiler exposes the previously private field `hasInvalidatedResolutions`. That breaks Angular in the newer TS, because the new field would be required on DelegatingCompilerHost. However we cannot just add the field here, because it's not present in the older compiler. This change adds the field for delegation, which works at runtime because the field is present. It suppresses the compiler error using a `// @ts-expect-error`, which should be removed once Angular moves to a TSC version that includes this change. --- packages/compiler-cli/src/ngtsc/core/src/host.ts | 5 +++++ .../src/ngtsc/program_driver/src/ts_create_program_driver.ts | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/packages/compiler-cli/src/ngtsc/core/src/host.ts b/packages/compiler-cli/src/ngtsc/core/src/host.ts index 0bd331ac03b8c0..bd5946adfa422a 100644 --- a/packages/compiler-cli/src/ngtsc/core/src/host.ts +++ b/packages/compiler-cli/src/ngtsc/core/src/host.ts @@ -68,6 +68,11 @@ export class DelegatingCompilerHost implements useCaseSensitiveFileNames = this.delegateMethod('useCaseSensitiveFileNames'); writeFile = this.delegateMethod('writeFile'); getModuleResolutionCache = this.delegateMethod('getModuleResolutionCache'); + // @ts-expect-error 'hasInvalidatedResolutions' is visible (and thus required here) in latest TSC + // main. It's already present, so the code works at runtime. + // TODO: remove this comment including the suppression once Angular uses a TSC version that + // includes this change. + hasInvalidatedResolutions = this.delegateMethod('hasInvalidatedResolutions'); } /** diff --git a/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts b/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts index dfc87fa49caece..8ef25df203ac53 100644 --- a/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts +++ b/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts @@ -52,6 +52,11 @@ export class DelegatingCompilerHost implements trace = this.delegateMethod('trace'); useCaseSensitiveFileNames = this.delegateMethod('useCaseSensitiveFileNames'); getModuleResolutionCache = this.delegateMethod('getModuleResolutionCache'); + // @ts-expect-error 'hasInvalidatedResolutions' is visible (and thus required here) in latest TSC + // main. It's already present, so the code works at runtime. + // TODO: remove this comment including the suppression once Angular uses a TSC version that + // includes this change. + hasInvalidatedResolutions = this.delegateMethod('hasInvalidatedResolutions'); } /**