fix(@schematics/angular): update ng-packagr and tsickle when migrating to version 8

Author: Alan

packages/schematics/angular/library/index.ts

@@ -101,12 +101,12 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: 'ng-packagr',
-        version: '^5.1.0',
+        version: latestVersions.ngPackagr,
       },
       {
         type: NodeDependencyType.Dev,
         name: 'tsickle',
-        version: '^0.35.0',
+        version: latestVersions.tsickle,
       },
       {
         type: NodeDependencyType.Default,

packages/schematics/angular/library/index_spec.ts

@@ -163,7 +163,7 @@ describe('Library Schematic', () => {
       const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
 
       const packageJson = getJsonFileContent(tree, 'package.json');
-      expect(packageJson.devDependencies['ng-packagr']).toEqual('^5.1.0');
+      expect(packageJson.devDependencies['ng-packagr']).toEqual(latestVersions.ngPackagr);
       expect(packageJson.devDependencies['@angular-devkit/build-ng-packagr'])
         .toEqual(latestVersions.DevkitBuildNgPackagr);
     });

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

@@ -11,55 +11,29 @@ import { latestVersions } from '../../utility/latest-versions';
 
 export function updateDependencies() {
   return (host: Tree) => {
-    let current = getPackageJsonDependency(host, '@angular-devkit/build-angular');
-    if (current && current.version !== latestVersions.DevkitBuildAngular) {
-      addPackageJsonDependency(
-        host,
-        {
-          type: current.type,
-          name: '@angular-devkit/build-angular',
-          version: latestVersions.DevkitBuildAngular,
-          overwrite: true,
-        },
-      );
-    }
 
-    current = getPackageJsonDependency(host, '@angular-devkit/build-ng-packagr');
-    if (current && current.version !== latestVersions.DevkitBuildNgPackagr) {
-      addPackageJsonDependency(
-        host,
-        {
-          type: current.type,
-          name: '@angular-devkit/build-ng-packagr',
-          version: latestVersions.DevkitBuildNgPackagr,
-          overwrite: true,
-        },
-      );
-    }
+    const dependenciesToUpdate: Record<string, string> = {
+      '@angular-devkit/build-angular': latestVersions.DevkitBuildAngular,
+      '@angular-devkit/build-ng-packagr': latestVersions.DevkitBuildNgPackagr,
+      'zone.js': latestVersions.ZoneJs,
+      'tsickle': latestVersions.tsickle,
+      'ng-packagr': latestVersions.ngPackagr,
+      // FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
+      'web-animations-js': 'github:angular/web-animations-js#release_pr208',
+    };
 
-    current = getPackageJsonDependency(host, 'zone.js');
-    if (current && current.version !== latestVersions.ZoneJs) {
-      addPackageJsonDependency(
-        host,
-        {
-          type: current.type,
-          name: 'zone.js',
-          version: latestVersions.ZoneJs,
-          overwrite: true,
-        },
-      );
-    }
+    for (const [name, version] of Object.entries(dependenciesToUpdate)) {
+      const current = getPackageJsonDependency(host, name);
+      if (!current || current.version === version) {
+        continue;
+      }
 
-    // FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
-    const webAnimationsJsVersion = 'github:angular/web-animations-js#release_pr208';
-    current = getPackageJsonDependency(host, 'web-animations-js');
-    if (current && current.version !== webAnimationsJsVersion) {
       addPackageJsonDependency(
         host,
         {
           type: current.type,
-          name: 'web-animations-js',
-          version: webAnimationsJsVersion,
+          name,
+          version,
           overwrite: true,
         },
       );

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

@@ -16,4 +16,8 @@ export const latestVersions = {
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.800.0',
   DevkitBuildNgPackagr: '~0.800.0',
+  DevkitBuildWebpack: '~0.800.0',
+  
+  tsickle: '^0.35.0',
+  ngPackagr: '^5.1.0',
 };