Skip to content

Commit 15f7d0c

Browse files
Alanalexeagle
Alan
authored andcommitted
fix(@schematics/angular): update ng-packagr and tsickle when migrating to version 8
1 parent 23f9899 commit 15f7d0c

File tree

4 files changed

+23
-45
lines changed

4 files changed

+23
-45
lines changed

packages/schematics/angular/library/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ function addDependenciesToPackageJson() {
101101
{
102102
type: NodeDependencyType.Dev,
103103
name: 'ng-packagr',
104-
version: '^5.1.0',
104+
version: latestVersions.ngPackagr,
105105
},
106106
{
107107
type: NodeDependencyType.Dev,
108108
name: 'tsickle',
109-
version: '^0.35.0',
109+
version: latestVersions.tsickle,
110110
},
111111
{
112112
type: NodeDependencyType.Default,

packages/schematics/angular/library/index_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ describe('Library Schematic', () => {
163163
const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
164164

165165
const packageJson = getJsonFileContent(tree, 'package.json');
166-
expect(packageJson.devDependencies['ng-packagr']).toEqual('^5.1.0');
166+
expect(packageJson.devDependencies['ng-packagr']).toEqual(latestVersions.ngPackagr);
167167
expect(packageJson.devDependencies['@angular-devkit/build-ng-packagr'])
168168
.toEqual(latestVersions.DevkitBuildNgPackagr);
169169
});

packages/schematics/angular/migrations/update-8/update-dependencies.ts

Lines changed: 16 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,29 @@ import { latestVersions } from '../../utility/latest-versions';
1111

1212
export function updateDependencies() {
1313
return (host: Tree) => {
14-
let current = getPackageJsonDependency(host, '@angular-devkit/build-angular');
15-
if (current && current.version !== latestVersions.DevkitBuildAngular) {
16-
addPackageJsonDependency(
17-
host,
18-
{
19-
type: current.type,
20-
name: '@angular-devkit/build-angular',
21-
version: latestVersions.DevkitBuildAngular,
22-
overwrite: true,
23-
},
24-
);
25-
}
2614

27-
current = getPackageJsonDependency(host, '@angular-devkit/build-ng-packagr');
28-
if (current && current.version !== latestVersions.DevkitBuildNgPackagr) {
29-
addPackageJsonDependency(
30-
host,
31-
{
32-
type: current.type,
33-
name: '@angular-devkit/build-ng-packagr',
34-
version: latestVersions.DevkitBuildNgPackagr,
35-
overwrite: true,
36-
},
37-
);
38-
}
15+
const dependenciesToUpdate: Record<string, string> = {
16+
'@angular-devkit/build-angular': latestVersions.DevkitBuildAngular,
17+
'@angular-devkit/build-ng-packagr': latestVersions.DevkitBuildNgPackagr,
18+
'zone.js': latestVersions.ZoneJs,
19+
'tsickle': latestVersions.tsickle,
20+
'ng-packagr': latestVersions.ngPackagr,
21+
// FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
22+
'web-animations-js': 'github:angular/web-animations-js#release_pr208',
23+
};
3924

40-
current = getPackageJsonDependency(host, 'zone.js');
41-
if (current && current.version !== latestVersions.ZoneJs) {
42-
addPackageJsonDependency(
43-
host,
44-
{
45-
type: current.type,
46-
name: 'zone.js',
47-
version: latestVersions.ZoneJs,
48-
overwrite: true,
49-
},
50-
);
51-
}
25+
for (const [name, version] of Object.entries(dependenciesToUpdate)) {
26+
const current = getPackageJsonDependency(host, name);
27+
if (!current || current.version === version) {
28+
continue;
29+
}
5230

53-
// FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
54-
const webAnimationsJsVersion = 'github:angular/web-animations-js#release_pr208';
55-
current = getPackageJsonDependency(host, 'web-animations-js');
56-
if (current && current.version !== webAnimationsJsVersion) {
5731
addPackageJsonDependency(
5832
host,
5933
{
6034
type: current.type,
61-
name: 'web-animations-js',
62-
version: webAnimationsJsVersion,
35+
name,
36+
version,
6337
overwrite: true,
6438
},
6539
);

packages/schematics/angular/utility/latest-versions.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ export const latestVersions = {
1616
// The versions below must be manually updated when making a new devkit release.
1717
DevkitBuildAngular: '~0.800.0',
1818
DevkitBuildNgPackagr: '~0.800.0',
19+
DevkitBuildWebpack: '~0.800.0',
20+
21+
tsickle: '^0.35.0',
22+
ngPackagr: '^5.1.0',
1923
};

0 commit comments

Comments
 (0)