feat(angular): incremental build generators

.eslintrc.json

@@ -23,9 +23,17 @@
                   "platform:node"
                 ]
               },
+              {
+                "sourceTag": "scope:internal",
+                "onlyDependOnLibsWithTags": ["scope:internal", "scope:shared"]
+              },
               {
                 "sourceTag": "type:e2e",
-                "onlyDependOnLibsWithTags": ["type:package"]
+                "onlyDependOnLibsWithTags": ["type:package", "type:e2e-util"]
+              },
+              {
+                "sourceTag": "type:e2e-util",
+                "onlyDependOnLibsWithTags": ["type:e2e-util"]
               },
               {
                 "sourceTag": "type:tool",

.github/workflows/ci.yml

@@ -168,4 +168,4 @@ jobs:
           --verify-store-integrity false
       - run: pnpm store prune
 
-      - run: pnpm e2e
+      - run: pnpm e2e -- --skip-nx-cache

e2e/angular-e2e/jest.config.js

@@ -6,10 +6,11 @@ module.exports = {
       tsConfig: '<rootDir>/tsconfig.spec.json',
     },
   },
-  testTimeout: 30000,
+  runner: 'jest-serial-runner',
+  testTimeout: 120_000,
   transform: {
     '^.+\\.[tj]s$': 'ts-jest',
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/e2eangular-e2e',
+  coverageDirectory: '../../coverage/e2e/angular-e2e',
 };

e2e/angular-e2e/tests/convert-to-buildable.spec.ts

@@ -0,0 +1,61 @@
+import { addPackages } from '@internal/e2e-util';
+import {
+  checkFilesExist,
+  copyNodeModules,
+  ensureNxProject,
+  readJson,
+  runNxCommandAsync,
+  uniq,
+} from '@nrwl/nx-plugin/testing';
+import * as path from 'path';
+
+describe('@nxworker/angular:convert-to-buildable generator e2e', () => {
+  beforeAll(() => {
+    copyNodeModules(['@nrwl/angular', 'ng-packagr']);
+    ensureNxProject('@nxworker/angular', 'dist/packages/angular');
+    addPackages({
+      devDependencies: {
+        ['@nrwl/angular']: '^11.2.0 || >=11.2.0-rc.2',
+      },
+    });
+  });
+
+  beforeEach(async () => {
+    projectName = uniq('convert-to-buildable');
+    await runNxCommandAsync(`generate @nrwl/angular:library ${projectName}`);
+  });
+
+  let projectName: string;
+
+  it('generates buildable library configurations', async () => {
+    const configurationFileNames = [
+      'ng-package.json',
+      'package.json',
+      'tsconfig.lib.prod.json',
+    ].map(fileName => path.join('libs', projectName, fileName));
+
+    await runNxCommandAsync(
+      `generate @nxworker/angular:convert-to-buildable ${projectName}`
+    );
+
+    expect(() => checkFilesExist(...configurationFileNames)).not.toThrow();
+  });
+
+  it('adds ng-packagr', async () => {
+    await runNxCommandAsync(
+      `generate @nxworker/angular:convert-to-buildable ${projectName}`
+    );
+
+    const { devDependencies = {} } = readJson('package.json');
+    expect(devDependencies['ng-packagr']).toBeDefined();
+  });
+
+  it('adds a "build" execution target', async () => {
+    await runNxCommandAsync(
+      `generate @nxworker/angular:convert-to-buildable ${projectName}`
+    );
+
+    const result = await runNxCommandAsync(`build ${projectName}`);
+    expect(result.stdout).toContain('Built Angular Package');
+  });
+});

e2e/angular-e2e/tests/use-incremental-build.spec.ts

@@ -0,0 +1,61 @@
+import { addPackages, useDefaultBaseBranch } from '@internal/e2e-util';
+import {
+  copyNodeModules,
+  ensureNxProject,
+  runCommandAsync,
+  runNxCommandAsync,
+  uniq,
+} from '@nrwl/nx-plugin/testing';
+
+describe('@nxworker/angular:use-incremental-build generator e2e', () => {
+  beforeAll(() => {
+    copyNodeModules(['@nrwl/angular']);
+    ensureNxProject('@nxworker/angular', 'dist/packages/angular');
+    addPackages({
+      devDependencies: {
+        ['@nrwl/angular']: '^11.2.0 || >=11.2.0-rc.2',
+      },
+    });
+    useDefaultBaseBranch('main');
+  });
+
+  beforeEach(async () => {
+    projectName = uniq('use-incremental-build');
+    await runNxCommandAsync(
+      `generate @nrwl/angular:application ${projectName}`
+    );
+  });
+
+  let projectName: string;
+
+  it('updates the "build" execution target', async () => {
+    await runNxCommandAsync(
+      `generate @nxworker/angular:use-incremental-build ${projectName}`
+    );
+
+    const result = await runNxCommandAsync(
+      `build ${projectName} --parallel --with-deps`
+    );
+    expect(result.stdout).toContain('Running target "build" succeeded');
+  });
+
+  it('updates the "build" script', async () => {
+    await runNxCommandAsync(
+      `generate @nxworker/angular:use-incremental-build ${projectName}`
+    );
+
+    const result = await runCommandAsync(`npm run build -- ${projectName}`);
+    expect(result.stdout).toContain('Running target "build" succeeded');
+  });
+
+  it('updates the "affected:build" script', async () => {
+    await runNxCommandAsync(
+      `generate @nxworker/angular:use-incremental-build ${projectName}`
+    );
+
+    const result = await runCommandAsync(
+      `npm run affected:build -- --base=remotes/origin/main`
+    );
+    expect(result.stdout).toContain('Running target "build" succeeded');
+  });
+});

e2e/angular-e2e/tsconfig.json

@@ -3,9 +3,6 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./tsconfig.e2e.json"
-    },
     {
       "path": "./tsconfig.spec.json"
     }

jest.config.js

@@ -1,22 +1,24 @@
 module.exports = {
   projects: [
     '<rootDir>/e2e/angular-e2e',
-    '<rootDir>/packages/angular',
-    '<rootDir>/tools',
     '<rootDir>/e2e/examples/angular/nrwl-airlines/booking/desktop-app',
     '<rootDir>/e2e/examples/angular/nrwl-airlines/booking/mobile-app',
     '<rootDir>/e2e/examples/angular/nrwl-airlines/check-in/desktop-app',
     '<rootDir>/e2e/examples/angular/nrwl-airlines/check-in/mobile-app',
-    '<rootDir>/packages/examples/angular/nrwl-airlines/shared/root/data-access',
-    '<rootDir>/packages/examples/angular/nrwl-airlines/check-in/root/feature-shell',
-    '<rootDir>/packages/examples/angular/nrwl-airlines/check-in/data-access',
-    '<rootDir>/packages/examples/angular/nrwl-airlines/shared/ui-buttons',
-    '<rootDir>/packages/examples/angular/nrwl-airlines/shared/util-formatting',
-    '<rootDir>/packages/examples/angular/nrwl-airlines/seatmap/data-access',
-    '<rootDir>/packages/examples/angular/nrwl-airlines/seatmap/feature-seat-listing',
+    '<rootDir>/packages/angular',
     '<rootDir>/packages/examples/angular/nrwl-airlines/booking/data-access',
     '<rootDir>/packages/examples/angular/nrwl-airlines/booking/feature-flight-search',
     '<rootDir>/packages/examples/angular/nrwl-airlines/booking/feature-passenger-info',
     '<rootDir>/packages/examples/angular/nrwl-airlines/booking/root/feature-shell',
+    '<rootDir>/packages/examples/angular/nrwl-airlines/check-in/data-access',
+    '<rootDir>/packages/examples/angular/nrwl-airlines/check-in/root/feature-shell',
+    '<rootDir>/packages/examples/angular/nrwl-airlines/seatmap/data-access',
+    '<rootDir>/packages/examples/angular/nrwl-airlines/seatmap/feature-seat-listing',
+    '<rootDir>/packages/examples/angular/nrwl-airlines/shared/root/data-access',
+    '<rootDir>/packages/examples/angular/nrwl-airlines/shared/ui-buttons',
+    '<rootDir>/packages/examples/angular/nrwl-airlines/shared/util-formatting',
+    '<rootDir>/packages/internal/e2e-util',
+    '<rootDir>/packages/internal/test-util',
+    '<rootDir>/tools',
   ],
 };

nx.json

@@ -117,6 +117,12 @@
     "examples-angular-nrwl-airlines-shared-util-formatting": {
       "tags": ["domain:shared", "platform:web", "scope:shared", "type:util"]
     },
+    "internal-e2e-util": {
+      "tags": ["platform:node", "scope:internal", "type:e2e-util"]
+    },
+    "internal-test-util": {
+      "tags": ["platform:node", "scope:internal", "type:test-util"]
+    },
     "workspace-tools": {
       "tags": ["platform:node", "type:tool"]
     }