diff --git a/packages/angular/migrations.json b/packages/angular/migrations.json index 71b800d39edbe..f6ac605c29ecf 100644 --- a/packages/angular/migrations.json +++ b/packages/angular/migrations.json @@ -154,6 +154,12 @@ "version": "14.5.0-beta.0", "description": "Update any references of MFE to MF.", "factory": "./src/migrations/update-14-5-0/migrate-mfe-to-mf" + }, + "update-angular-cli-version-14-1-0": { + "cli": "nx", + "version": "14.5.2-beta.0", + "description": "Update the @angular/cli package version to ~14.1.0.", + "factory": "./src/migrations/update-14-5-2/update-angular-cli" } }, "packageJsonUpdates": { @@ -1341,17 +1347,33 @@ } } }, - "14.5.0": { - "version": "14.5.0-beta.4", + "14.5.2": { + "version": "14.5.2-beta.0", "packages": { - "@angular/cli": { + "@angular-devkit/architect": { + "version": "~0.1401.0", + "alwaysAddToPackageJson": false + }, + "@angular-devkit/build-angular": { "version": "~14.1.0", "alwaysAddToPackageJson": false }, - "@schematics/angular": { + "@angular-devkit/build-webpack": { + "version": "~0.1401.0", + "alwaysAddToPackageJson": false + }, + "@angular-devkit/core": { + "version": "~14.1.0", + "alwaysAddToPackageJson": false + }, + "@angular-devkit/schematics": { "version": "~14.1.0", "alwaysAddToPackageJson": false }, + "@schematics/angular": { + "version": "~14.0.0", + "alwaysAddToPackageJson": false + }, "@angular/core": { "version": "~14.1.0", "alwaysAddToPackageJson": true diff --git a/packages/angular/src/migrations/update-14-5-2/update-angular-cli.spec.ts b/packages/angular/src/migrations/update-14-5-2/update-angular-cli.spec.ts new file mode 100644 index 0000000000000..1b88b0cf485d8 --- /dev/null +++ b/packages/angular/src/migrations/update-14-5-2/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(2); + }); + + 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('~14.1.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('~14.1.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); + }); +}); diff --git a/packages/angular/src/migrations/update-14-5-2/update-angular-cli.ts b/packages/angular/src/migrations/update-14-5-2/update-angular-cli.ts new file mode 100644 index 0000000000000..d7f74fe76ac98 --- /dev/null +++ b/packages/angular/src/migrations/update-14-5-2/update-angular-cli.ts @@ -0,0 +1,23 @@ +import { formatFiles, Tree, updateJson } from '@nrwl/devkit'; + +const angularCliVersion = '~14.1.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); + } +}