Skip to content

Commit

Permalink
fix(@schematics/angular): update @angular-devkit/build-ng-packagr w…
Browse files Browse the repository at this point in the history
…hen migrating

Closes #12642
  • Loading branch information
alan-agius4 authored and alexeagle committed Nov 1, 2018
1 parent f3330db commit da2554a
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
"version": "7.0.4",
"factory": "./update-7",
"description": "Update an Angular CLI project to version 7."
},
"migration-06": {
"version": "7.0.3",
"factory": "./update-7/index#updateDevkitBuildNgPackagr",
"description": "Update an Angular CLI project to version 7."
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import { Rule } from '@angular-devkit/schematics';
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
import { latestVersions } from '../../utility/latest-versions';

export function updateDevkitBuildNgPackagr(): Rule {
return (tree, context) => {
const existing = getPackageJsonDependency(tree, '@angular-devkit/build-ng-packagr');

if (!existing) {
return;
}

addPackageJsonDependency(
tree,
{
type: existing.type,
name: '@angular-devkit/build-ng-packagr',
version: latestVersions.DevkitBuildNgPackagr,
overwrite: true,
},
);

context.addTask(new NodePackageInstallTask());
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import { EmptyTree } from '@angular-devkit/schematics';
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
import { latestVersions } from '../../utility/latest-versions';

const oldPkg = `
{
"devDependencies": {
"@angular-devkit/build-angular": "0.0.0",
"@angular-devkit/build-ng-packagr": "0.0.0"
}
}
`;

describe('updateDevkitBuildNgPackagr', () => {
const schematicRunner = new SchematicTestRunner(
'migrations',
require.resolve('../migration-collection.json'),
);

let tree: UnitTestTree;

beforeEach(async () => {
tree = new UnitTestTree(new EmptyTree());
tree = await schematicRunner.runExternalSchematicAsync(
require.resolve('../../collection.json'), 'ng-new',
{
name: 'migration-test',
version: '1.2.3',
directory: '.',
},
tree,
).toPromise();
});

it('should work as expected', async () => {
tree.overwrite('/package.json', oldPkg);
const tree2 = await schematicRunner.runSchematicAsync('migration-06', {}, tree.branch())
.toPromise();

const content = tree2.readContent('/package.json');
const pkg = JSON.parse(content);
expect(pkg.devDependencies['@angular-devkit/build-ng-packagr'])
.toBe(latestVersions.DevkitBuildNgPackagr);
});
});
1 change: 1 addition & 0 deletions packages/schematics/angular/migrations/update-7/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
import { latestVersions } from '../../utility/latest-versions';

export { polyfillMetadataRule } from './polyfill-metadata';
export { updateDevkitBuildNgPackagr } from './devkit-ng-packagr';

export default function(): Rule {
return (tree, context) => {
Expand Down

0 comments on commit da2554a

Please sign in to comment.