fix(angular): change tsconfig path handling for angular ng-packagr executors to let ng-packagr use default options (#7702)

packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.spec.ts

@@ -1,4 +1,3 @@
-jest.mock('ng-packagr/lib/utils/ng-compiler-cli');
 jest.mock('@nrwl/workspace/src/core/project-graph');
 jest.mock('@nrwl/workspace/src/utilities/buildable-libs-utils');
 jest.mock('ng-packagr');
@@ -13,7 +12,6 @@ import {
   NX_PACKAGE_PROVIDERS,
   NX_PACKAGE_TRANSFORM,
 } from './ng-packagr-adjustments/package.di';
-import { ngCompilerCli } from 'ng-packagr/lib/utils/ng-compiler-cli';
 import ngPackagrLiteExecutor from './ng-packagr-lite.impl';
 
 describe('NgPackagrLite executor', () => {
@@ -24,14 +22,8 @@ describe('NgPackagrLite executor', () => {
   let ngPackagrWithBuildTransformMock: jest.Mock;
   let ngPackagrWithTsConfigMock: jest.Mock;
   let options: BuildAngularLibraryExecutorOptions;
-  let tsConfig: { options: { paths: { [key: string]: string[] } } };
 
   beforeEach(async () => {
-    tsConfig = {
-      options: {
-        paths: { '@myorg/my-package': ['/root/my-package/src/index.ts'] },
-      },
-    };
     (
       buildableLibsUtils.calculateProjectDependencies as jest.Mock
     ).mockImplementation(() => ({
@@ -57,7 +49,8 @@ describe('NgPackagrLite executor', () => {
       projectName: 'my-lib',
       targetName: 'build',
       configurationName: 'production',
-    } as ExecutorContext;
+      workspace: { projects: { 'my-lib': { root: '/libs/my-lib' } } },
+    } as any;
     options = { project: 'my-lib' };
   });
 
@@ -104,31 +97,39 @@ describe('NgPackagrLite executor', () => {
     expect(result.done).toBe(true);
   });
 
+  it('should not set up incremental builds when tsConfig option is not set', async () => {
+    (
+      buildableLibsUtils.checkDependentProjectsHaveBeenBuilt as jest.Mock
+    ).mockReturnValue(true);
+
+    const result = await ngPackagrLiteExecutor(options, context).next();
+
+    expect(buildableLibsUtils.createTmpTsConfig).not.toHaveBeenCalled();
+    expect(ngPackagrWithTsConfigMock).not.toHaveBeenCalled();
+    expect(ngPackagrBuildMock).toHaveBeenCalled();
+    expect(result.value).toEqual({ success: true });
+    expect(result.done).toBe(true);
+  });
+
   it('should process tsConfig for incremental builds when tsConfig options is set', async () => {
     // ARRANGE
     (
       buildableLibsUtils.checkDependentProjectsHaveBeenBuilt as jest.Mock
     ).mockReturnValue(true);
-
+    const generatedTsConfig = '/root/tmp/my-lib/tsconfig.app.generated.json';
-    (ngCompilerCli as jest.Mock).mockImplementation(() =>
+    (buildableLibsUtils.createTmpTsConfig as jest.Mock).mockImplementation(
-      Promise.resolve({
+      () => generatedTsConfig
-        readConfiguration: (...args) => tsConfig,
-      })
     );
-    const tsConfigPath = '/root/my-lib/tsconfig.app.json';
 
     // ACT
     const result = await ngPackagrLiteExecutor(
-      { ...options, tsConfig: tsConfigPath },
+      { ...options, tsConfig: '/root/my-lib/tsconfig.app.json' },
       context
     ).next();
 
     // ASSERT
-    expect(buildableLibsUtils.updatePaths).toHaveBeenCalledWith(
+    expect(buildableLibsUtils.createTmpTsConfig).toHaveBeenCalled();
-      expect.any(Array),
+    expect(ngPackagrWithTsConfigMock).toHaveBeenCalledWith(generatedTsConfig);
-      tsConfig.options.paths
-    );
-    expect(ngPackagrWithTsConfigMock).toHaveBeenCalledWith(tsConfig);
     expect(ngPackagrBuildMock).toHaveBeenCalled();
     expect(result.value).toEqual({ success: true });
     expect(result.done).toBe(true);

packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts

@@ -1,8 +1,9 @@
 import type { ExecutorContext } from '@nrwl/devkit';
-import type { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
+import {
-import { updatePaths } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
+  createTmpTsConfig,
+  DependentBuildableProjectNode,
+} from '@nrwl/workspace/src/utilities/buildable-libs-utils';
 import { NgPackagr } from 'ng-packagr';
-import { ngCompilerCli } from 'ng-packagr/lib/utils/ng-compiler-cli';
 import { resolve } from 'path';
 import { createLibraryExecutor } from '../package/package.impl';
 import type { BuildAngularLibraryExecutorOptions } from '../package/schema';
@@ -26,13 +27,13 @@ async function initializeNgPackgrLite(
   packager.withBuildTransform(NX_PACKAGE_TRANSFORM.provide);
 
   if (options.tsConfig) {
-    // read the tsconfig and modify its path in memory to
+    const tsConfigPath = createTmpTsConfig(
-    // pass it on to ngpackagr
+      options.tsConfig,
-    const parsedTSConfig = (await ngCompilerCli()).readConfiguration(
+      context.root,
-      options.tsConfig
+      context.workspace.projects[context.projectName].root,
+      projectDependencies
     );
-    updatePaths(projectDependencies, parsedTSConfig.options.paths);
+    packager.withTsConfig(tsConfigPath);
-    packager.withTsConfig(parsedTSConfig);
   }
 
   return packager;

packages/angular/src/executors/package/package.impl.spec.ts

@@ -1,4 +1,3 @@
-jest.mock('ng-packagr/lib/utils/ng-compiler-cli');
 jest.mock('@nrwl/workspace/src/core/project-graph');
 jest.mock('@nrwl/workspace/src/utilities/buildable-libs-utils');
 jest.mock('ng-packagr');
@@ -6,8 +5,12 @@ jest.mock('ng-packagr');
 import type { ExecutorContext } from '@nrwl/devkit';
 import * as buildableLibsUtils from '@nrwl/workspace/src/utilities/buildable-libs-utils';
 import * as ngPackagr from 'ng-packagr';
-import { ngCompilerCli } from 'ng-packagr/lib/utils/ng-compiler-cli';
 import { BehaviorSubject } from 'rxjs';
+import { NX_ENTRY_POINT_PROVIDERS } from './ng-packagr-adjustments/ng-package/entry-point/entry-point.di';
+import {
+  NX_PACKAGE_PROVIDERS,
+  NX_PACKAGE_TRANSFORM,
+} from './ng-packagr-adjustments/ng-package/package.di';
 import packageExecutor from './package.impl';
 import type { BuildAngularLibraryExecutorOptions } from './schema';
 
@@ -45,7 +48,8 @@ describe('Package executor', () => {
       projectName: 'my-lib',
       targetName: 'build',
       configurationName: 'production',
-    } as ExecutorContext;
+      workspace: { projects: { 'my-lib': { root: '/libs/my-lib' } } },
+    } as any;
     options = { project: 'my-lib' };
   });
 
@@ -74,49 +78,54 @@ describe('Package executor', () => {
     expect(result.done).toBe(true);
   });
 
+  it('should instantiate NgPackager with the right providers and set to use the right build transformation provider', async () => {
+    (
+      buildableLibsUtils.checkDependentProjectsHaveBeenBuilt as jest.Mock
+    ).mockReturnValue(true);
+
+    const result = await packageExecutor(options, context).next();
+
+    expect(ngPackagr.NgPackagr).toHaveBeenCalledWith([
+      ...NX_PACKAGE_PROVIDERS,
+      ...NX_ENTRY_POINT_PROVIDERS,
+    ]);
+    expect(ngPackagrWithBuildTransformMock).toHaveBeenCalledWith(
+      NX_PACKAGE_TRANSFORM.provide
+    );
+    expect(result.value).toEqual({ success: true });
+    expect(result.done).toBe(true);
+  });
+
   it('should not set up incremental builds when tsConfig option is not set', async () => {
     (
       buildableLibsUtils.checkDependentProjectsHaveBeenBuilt as jest.Mock
     ).mockReturnValue(true);
-    (ngCompilerCli as jest.Mock).mockImplementation(() =>
-      Promise.resolve({ readConfiguration: jest.fn() })
-    );
 
     const result = await packageExecutor(options, context).next();
 
-    expect((await ngCompilerCli()).readConfiguration).not.toHaveBeenCalled();
+    expect(buildableLibsUtils.createTmpTsConfig).not.toHaveBeenCalled();
-    expect(buildableLibsUtils.updatePaths).not.toHaveBeenCalled();
     expect(ngPackagrWithTsConfigMock).not.toHaveBeenCalled();
     expect(ngPackagrBuildMock).toHaveBeenCalled();
     expect(result.value).toEqual({ success: true });
     expect(result.done).toBe(true);
   });
 
-  it('should process tsConfig for incremental builds when tsConfig option is set and enableIvy is true', async () => {
+  it('should process tsConfig for incremental builds when tsConfig option is set', async () => {
     (
       buildableLibsUtils.checkDependentProjectsHaveBeenBuilt as jest.Mock
     ).mockReturnValue(true);
-    const tsConfig = {
+    const generatedTsConfig = '/root/tmp/my-lib/tsconfig.app.generated.json';
-      options: {
+    (buildableLibsUtils.createTmpTsConfig as jest.Mock).mockImplementation(
-        paths: { '@myorg/my-package': ['/root/my-package/src/index.ts'] },
+      () => generatedTsConfig
-        enableIvy: true,
-      },
-    };
-    (ngCompilerCli as jest.Mock).mockImplementation(() =>
-      Promise.resolve({ readConfiguration: () => tsConfig })
     );
-    const tsConfigPath = '/root/my-lib/tsconfig.app.json';
 
     const result = await packageExecutor(
-      { ...options, tsConfig: tsConfigPath },
+      { ...options, tsConfig: '/root/my-lib/tsconfig.app.json' },
       context
     ).next();
 
-    expect(buildableLibsUtils.updatePaths).toHaveBeenCalledWith(
+    expect(buildableLibsUtils.createTmpTsConfig).toHaveBeenCalled();
-      expect.any(Array),
+    expect(ngPackagrWithTsConfigMock).toHaveBeenCalledWith(generatedTsConfig);
-      tsConfig.options.paths
-    );
-    expect(ngPackagrWithTsConfigMock).toHaveBeenCalledWith(tsConfig);
     expect(ngPackagrBuildMock).toHaveBeenCalled();
     expect(result.value).toEqual({ success: true });
     expect(result.done).toBe(true);

packages/angular/src/executors/package/package.impl.ts

@@ -1,19 +1,19 @@
 import type { ExecutorContext } from '@nrwl/devkit';
 import { readCachedProjectGraph } from '@nrwl/workspace/src/core/project-graph';
-import type { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
+import {
+  createTmpTsConfig,
+  DependentBuildableProjectNode,
+} from '@nrwl/workspace/src/utilities/buildable-libs-utils';
 import {
   calculateProjectDependencies,
   checkDependentProjectsHaveBeenBuilt,
   updateBuildableProjectPackageJsonDependencies,
-  updatePaths,
 } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
 import type { NgPackagr } from 'ng-packagr';
-import { ngCompilerCli } from 'ng-packagr/lib/utils/ng-compiler-cli';
 import { resolve } from 'path';
 import { from } from 'rxjs';
 import { eachValueFrom } from 'rxjs-for-await';
 import { mapTo, switchMap, tap } from 'rxjs/operators';
-import * as ts from 'typescript';
 import { NX_ENTRY_POINT_PROVIDERS } from './ng-packagr-adjustments/ng-package/entry-point/entry-point.di';
 import {
   NX_PACKAGE_PROVIDERS,
@@ -34,16 +34,14 @@ async function initializeNgPackagr(
   packager.forProject(resolve(context.root, options.project));
   packager.withBuildTransform(NX_PACKAGE_TRANSFORM.provide);
 
-  // read the tsconfig and modify its path in memory to
-  // pass it on to ngpackagr if specified
   if (options.tsConfig) {
-    // read the tsconfig and modify its path in memory to
+    const tsConfigPath = createTmpTsConfig(
-    // pass it on to ngpackagr
+      options.tsConfig,
-    const parsedTSConfig = (await ngCompilerCli()).readConfiguration(
+      context.root,
-      options.tsConfig
+      context.workspace.projects[context.projectName].root,
+      projectDependencies
     );
-    updatePaths(projectDependencies, parsedTSConfig.options.paths);
+    packager.withTsConfig(tsConfigPath);
-    packager.withTsConfig(parsedTSConfig);
   }
 
   return packager;