feat(angular): support Angular 15.2 (#14953)

docs/generated/packages/angular/executors/module-federation-dev-ssr.json

@@ -76,7 +76,8 @@
       },
       "verbose": {
         "type": "boolean",
-        "description": "Adds more details to output logging."
+        "description": "Adds more details to output logging.",
+        "default": false
       },
       "pathToManifestFile": {
         "type": "string",

package.json

@@ -26,19 +26,19 @@
     "preinstall": "node ./scripts/preinstall.js"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1501.0",
-    "@angular-devkit/build-angular": "~15.1.0",
-    "@angular-devkit/core": "~15.1.0",
-    "@angular-devkit/schematics": "~15.1.0",
+    "@angular-devkit/architect": "~0.1502.0",
+    "@angular-devkit/build-angular": "~15.2.0",
+    "@angular-devkit/core": "~15.2.0",
+    "@angular-devkit/schematics": "~15.2.0",
     "@angular-eslint/eslint-plugin": "~15.0.0",
     "@angular-eslint/eslint-plugin-template": "~15.0.0",
     "@angular-eslint/template-parser": "~15.0.0",
-    "@angular/cli": "~15.1.0",
-    "@angular/common": "~15.1.0",
-    "@angular/compiler": "~15.1.0",
-    "@angular/compiler-cli": "~15.1.0",
-    "@angular/core": "~15.1.0",
-    "@angular/router": "~15.1.0",
+    "@angular/cli": "~15.2.0",
+    "@angular/common": "~15.2.0",
+    "@angular/compiler": "~15.2.0",
+    "@angular/compiler-cli": "~15.2.0",
+    "@angular/core": "~15.2.0",
+    "@angular/router": "~15.2.0",
     "@babel/core": "^7.15.0",
     "@babel/helper-create-regexp-features-plugin": "^7.14.5",
     "@babel/preset-react": "^7.14.5",
@@ -57,7 +57,7 @@
     "@ngrx/effects": "~15.0.0",
     "@ngrx/router-store": "~15.0.0",
     "@ngrx/store": "~15.0.0",
-    "@nguniversal/builders": "~15.1.0",
+    "@nguniversal/builders": "~15.2.0",
     "@nrwl/cypress": "15.7.2",
     "@nrwl/devkit": "15.7.2",
     "@nrwl/eslint-plugin-nx": "15.7.2",
@@ -81,7 +81,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-url": "^7.0.0",
-    "@schematics/angular": "~15.1.0",
+    "@schematics/angular": "~15.2.0",
     "@storybook/addon-essentials": "^6.5.15",
     "@storybook/angular": "^6.5.15",
     "@storybook/builder-webpack5": "^6.5.15",
@@ -194,7 +194,7 @@
     "mini-css-extract-plugin": "~2.4.7",
     "minimatch": "3.0.5",
     "next-sitemap": "^3.1.10",
-    "ng-packagr": "~15.1.0",
+    "ng-packagr": "~15.2.2",
     "node-fetch": "^2.6.7",
     "nx": "15.7.2",
     "open": "^8.4.0",

packages/angular/migrations.json

@@ -230,6 +230,12 @@
       "version": "15.7.0-beta.1",
       "description": "Install the required angular-devkit packages as we do not directly depend on them anymore",
       "factory": "./src/migrations/update-15-7-0/install-required-packages"
+    },
+    "update-angular-cli-version-15-2-0": {
+      "cli": "nx",
+      "version": "15.8.0-beta.4",
+      "description": "Update the @angular/cli package version to ~15.2.0.",
+      "factory": "./src/migrations/update-15-8-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1836,6 +1842,68 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "15.8.0": {
+      "version": "15.8.0-beta.4",
+      "x-prompt": "Do you want to update the Angular version to v15.2?",
+      "requires": {
+        "@angular/core": ">=15.1.0 <15.2.0",
+        "typescript": ">=4.8.2 <5.0"
+      },
+      "packages": {
+        "@angular-devkit/architect": {
+          "version": "~0.1502.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-angular": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1502.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/express-engine": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/build-angular": {
+          "version": "~15.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~15.2.2",
+          "alwaysAddToPackageJson": false
+        },
+        "zone.js": {
+          "version": "~0.12.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

packages/angular/src/builders/module-federation-dev-ssr/schema.d.ts

@@ -12,6 +12,6 @@ export interface Schema {
   proxyConfig?: string;
   devRemotes?: string[];
   skipRemotes?: string[];
-  verbose?: boolean;
+  verbose: boolean;
   pathToManifestFile?: string;
 }

packages/angular/src/builders/module-federation-dev-ssr/schema.json

@@ -77,7 +77,8 @@
     },
     "verbose": {
       "type": "boolean",
-      "description": "Adds more details to output logging."
+      "description": "Adds more details to output logging.",
+      "default": false
     },
     "pathToManifestFile": {
       "type": "string",

packages/angular/src/migrations/update-15-8-0/update-angular-cli.spec.ts

@@ -0,0 +1,42 @@
+import { readJson, Tree, writeJson } from '@nrwl/devkit';
+import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import updateAngularCli from './update-angular-cli';
+
+describe('update-angular-cli migration', () => {
+  let tree: Tree;
+
+  beforeEach(() => {
+    tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+  });
+
+  it('should update @angular/cli version when defined as a dev dependency', async () => {
+    writeJson(tree, 'package.json', {
+      devDependencies: { '@angular/cli': '~13.3.0' },
+    });
+
+    await updateAngularCli(tree);
+
+    const { devDependencies } = readJson(tree, 'package.json');
+    expect(devDependencies['@angular/cli']).toEqual('~15.2.0');
+  });
+
+  it('should update @angular/cli version when defined as a dependency', async () => {
+    writeJson(tree, 'package.json', {
+      dependencies: { '@angular/cli': '~13.3.0' },
+    });
+
+    await updateAngularCli(tree);
+
+    const { dependencies } = readJson(tree, 'package.json');
+    expect(dependencies['@angular/cli']).toEqual('~15.2.0');
+  });
+
+  it('should add @angular/cli to package.json when it is not set', async () => {
+    const initialPackageJson = readJson(tree, 'package.json');
+
+    await updateAngularCli(tree);
+
+    const packageJson = readJson(tree, 'package.json');
+    expect(packageJson).toStrictEqual(initialPackageJson);
+  });
+});

packages/angular/src/migrations/update-15-8-0/update-angular-cli.ts

@@ -0,0 +1,23 @@
+import { formatFiles, Tree, updateJson } from '@nrwl/devkit';
+
+const angularCliVersion = '~15.2.0';
+
+export default async function (tree: Tree) {
+  let shouldFormat = false;
+
+  updateJson(tree, 'package.json', (json) => {
+    if (json.devDependencies?.['@angular/cli']) {
+      json.devDependencies['@angular/cli'] = angularCliVersion;
+      shouldFormat = true;
+    } else if (json.dependencies?.['@angular/cli']) {
+      json.dependencies['@angular/cli'] = angularCliVersion;
+      shouldFormat = true;
+    }
+
+    return json;
+  });
+
+  if (shouldFormat) {
+    await formatFiles(tree);
+  }
+}

packages/angular/src/utils/versions.ts

@@ -1,11 +1,11 @@
 export const nxVersion = require('../../package.json').version;
 
-export const angularVersion = '~15.1.0';
-export const angularDevkitVersion = '~15.1.0';
-export const ngPackagrVersion = '~15.1.0';
+export const angularVersion = '~15.2.0';
+export const angularDevkitVersion = '~15.2.0';
+export const ngPackagrVersion = '~15.2.2';
 export const ngrxVersion = '~15.0.0';
 export const rxjsVersion = '~7.8.0';
-export const zoneJsVersion = '~0.11.4';
+export const zoneJsVersion = '~0.12.0';
 export const angularJsVersion = '1.7.9';
 export const tsLibVersion = '^2.3.0';
 

packages/nx/src/utils/versions.ts

@@ -1,6 +1,6 @@
 export const nxVersion = require('../../package.json').version;
 
-export const angularCliVersion = '~15.1.0';
+export const angularCliVersion = '~15.2.0';
 export const typescriptVersion = '~4.9.5';
 export const prettierVersion = '^2.6.2';
 export const typescriptESLintVersion = '^5.36.1';

packages/workspace/src/utils/versions.ts

@@ -1,6 +1,6 @@
 export const nxVersion = require('../../package.json').version;
 
-export const angularCliVersion = '~15.1.0';
+export const angularCliVersion = '~15.2.0';
 export const typescriptVersion = '~4.9.5';
 export const prettierVersion = '^2.6.2';
 export const typescriptESLintVersion = '^5.36.1';