fix(angular): emit dts when using entrypoint name as filename in ng-p…

…ackagr executors (nrwl#11032)
isaacplmann · Jul 6, 2022 · bc5c414 · bc5c414
1 parent d579f94
commit bc5c414
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 16 deletions.
diff --git a/...es/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.ts b/...es/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.ts
@@ -45,8 +45,12 @@ export function cacheCompilerHost(
     entryPoint.dependsOn(node);
   };
 
-  const { flatModuleFile, entryFile } = entryPoint.data.entryPoint;
+  const { flatModuleFile, destinationPath, entryFile } =
+    entryPoint.data.entryPoint;
   const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;
+  const flatModuleFileDtsPath = ensureUnixPath(
+    path.join(destinationPath, flatModuleFileDtsFilename)
+  );
   const hasIndexEntryFile =
     path.basename(entryFile.toLowerCase()) === 'index.ts';
 
@@ -85,13 +89,19 @@ export function cacheCompilerHost(
       sourceFiles?: ReadonlyArray<ts.SourceFile>
     ) => {
       if (fileName.endsWith('.d.ts')) {
-        if (
-          hasIndexEntryFile &&
-          path.basename(fileName) === flatModuleFileDtsFilename
-        ) {
-          // In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
-          // Because it will cause a conflict.
-          return;
+        if (fileName === flatModuleFileDtsPath) {
+          if (hasIndexEntryFile) {
+            // In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
+            // Because it will cause a conflict.
+            return;
+          } else {
+            // Rename file to index.d.ts so that TypeScript can resolve types without
+            // them needing to be referenced in the package.json manifest.
+            fileName = fileName.replace(
+              flatModuleFileDtsFilename,
+              'index.d.ts'
+            );
+          }
         }
 
         // Rename file to index.d.ts so that TypeScript can resolve types without

diff --git a/packages/angular/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.ts b/packages/angular/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.ts
@@ -45,8 +45,12 @@ export function cacheCompilerHost(
     entryPoint.dependsOn(node);
   };
 
-  const { flatModuleFile, entryFile } = entryPoint.data.entryPoint;
+  const { flatModuleFile, destinationPath, entryFile } =
+    entryPoint.data.entryPoint;
   const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;
+  const flatModuleFileDtsPath = ensureUnixPath(
+    path.join(destinationPath, flatModuleFileDtsFilename)
+  );
   const hasIndexEntryFile =
     path.basename(entryFile.toLowerCase()) === 'index.ts';
 
@@ -85,13 +89,19 @@ export function cacheCompilerHost(
       sourceFiles?: ReadonlyArray<ts.SourceFile>
     ) => {
       if (fileName.endsWith('.d.ts')) {
-        if (
-          hasIndexEntryFile &&
-          path.basename(fileName) === flatModuleFileDtsFilename
-        ) {
-          // In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
-          // Because it will cause a conflict.
-          return;
+        if (fileName === flatModuleFileDtsPath) {
+          if (hasIndexEntryFile) {
+            // In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
+            // Because it will cause a conflict.
+            return;
+          } else {
+            // Rename file to index.d.ts so that TypeScript can resolve types without
+            // them needing to be referenced in the package.json manifest.
+            fileName = fileName.replace(
+              flatModuleFileDtsFilename,
+              'index.d.ts'
+            );
+          }
         }
 
         // Rename file to index.d.ts so that TypeScript can resolve types without