Skip to content

Commit

Permalink
fix(angular): update angular cli package in a migration generator to …
Browse files Browse the repository at this point in the history
…prevent migration issues (#11375)
  • Loading branch information
leosvelperez committed Jul 30, 2022
1 parent c21e6eb commit e5ec39a
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 4 deletions.
30 changes: 26 additions & 4 deletions packages/angular/migrations.json
Expand Up @@ -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": {
Expand Down Expand Up @@ -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
Expand Down
@@ -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);
});
});
@@ -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);
}
}

0 comments on commit e5ec39a

Please sign in to comment.