feat: add support for using TypeScript 4.1

ng-packagr · Nov 30, 2020 · ffe3ab9 · ffe3ab9
1 parent f45658a
commit ffe3ab9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -54,10 +54,10 @@
     "terser": "^5.0.0"
   },
   "peerDependencies": {
-    "@angular/compiler": "^11.0.0-next.0",
-    "@angular/compiler-cli": "^11.0.0-next.0",
+    "@angular/compiler": "^11.0.0",
+    "@angular/compiler-cli": "^11.0.0",
     "tslib": "^2.0.0",
-    "typescript": "^4.0.0"
+    "typescript": ">=4.0 <4.2"
   },
   "devDependencies": {
     "@angular/cdk": "^11.0.0",

diff --git a/src/lib/ngc/compile-source-files.ts b/src/lib/ngc/compile-source-files.ts
@@ -42,7 +42,7 @@ export async function compileSourceFiles(
 
   const scriptTarget = tsConfigOptions.target;
   const cache = entryPoint.cache;
-  const oldProgram = cache.oldPrograms && (cache.oldPrograms[scriptTarget] as ng.Program | undefined);
+  const oldProgram = (cache.oldPrograms && cache.oldPrograms[scriptTarget]) as ng.Program | undefined;
 
   const ngProgram = ng.createProgram({
     rootNames: tsConfig.rootNames,
@@ -53,9 +53,11 @@ export async function compileSourceFiles(
 
   await ngProgram.loadNgStructureAsync();
 
+  // TS 4.1+ stores the reuse state in the new program
+  const checkReuseProgram = (ts.versionMajorMinor as string) === '4.0' ? oldProgram : ngProgram;
   log.debug(
     `ngc program structure is reused: ${
-      oldProgram ? (oldProgram.getTsProgram() as any).structureIsReused : 'No old program'
+      checkReuseProgram ? (checkReuseProgram.getTsProgram() as any).structureIsReused : 'No old program'
     }`,
   );