refactor(@schematics/angular): make application and library deps declarative

Moves the dependency information for the `application` and `library` schematics to module-level constants. This makes the `addDependenciesToPackageJson` functions in both schematics more declarative and easier to read and maintain.

Author: clydin

packages/schematics/angular/application/index.ts

@@ -10,7 +10,6 @@ import { JsonObject, join, normalize } from '@angular-devkit/core';
 import {
   MergeStrategy,
   Rule,
-  SchematicContext,
   Tree,
   apply,
   applyTemplates,
@@ -23,7 +22,6 @@ import {
   strings,
   url,
 } from '@angular-devkit/schematics';
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema as ComponentOptions } from '../component/schema';
 import {
   DependencyType,
@@ -38,6 +36,12 @@ import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders, ProjectType } from '../utility/workspace-models';
 import { Schema as ApplicationOptions, Style } from './schema';
 
+const APPLICATION_DEV_DEPENDENCIES = [
+  { name: '@angular/compiler-cli', version: latestVersions.Angular },
+  { name: '@angular/build', version: latestVersions.AngularBuild },
+  { name: 'typescript', version: latestVersions['typescript'] },
+];
+
 function addTsProjectReference(...paths: string[]) {
   return (host: Tree) => {
     if (!host.exists('tsconfig.json')) {
@@ -136,23 +140,13 @@ export default function (options: ApplicationOptions): Rule {
 }
 
 function addDependenciesToPackageJson(options: ApplicationOptions): Rule {
-  const rules: Rule[] = [
-    addDependency('@angular/compiler-cli', latestVersions.Angular, {
-      type: DependencyType.Dev,
-      existing: ExistingBehavior.Skip,
-      install: options.skipInstall ? InstallBehavior.None : InstallBehavior.Auto,
-    }),
-    addDependency('@angular/build', latestVersions.AngularBuild, {
-      type: DependencyType.Dev,
-      existing: ExistingBehavior.Skip,
-      install: options.skipInstall ? InstallBehavior.None : InstallBehavior.Auto,
-    }),
-    addDependency('typescript', latestVersions['typescript'], {
+  const rules: Rule[] = APPLICATION_DEV_DEPENDENCIES.map((dependency) =>
+    addDependency(dependency.name, dependency.version, {
       type: DependencyType.Dev,
       existing: ExistingBehavior.Skip,
       install: options.skipInstall ? InstallBehavior.None : InstallBehavior.Auto,
     }),
-  ];
+  );
 
   if (!options.zoneless) {
     rules.push(

packages/schematics/angular/library/index.ts

@@ -35,6 +35,13 @@ import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders, ProjectType } from '../utility/workspace-models';
 import { Schema as LibraryOptions } from './schema';
 
+const LIBRARY_DEV_DEPENDENCIES = [
+  { name: '@angular/compiler-cli', version: latestVersions.Angular },
+  { name: '@angular/build', version: latestVersions.AngularBuild },
+  { name: 'ng-packagr', version: latestVersions.NgPackagr },
+  { name: 'typescript', version: latestVersions['typescript'] },
+];
+
 function updateTsConfig(packageName: string, ...paths: string[]) {
   return (host: Tree) => {
     if (!host.exists('tsconfig.json')) {
@@ -65,26 +72,16 @@ function addTsProjectReference(...paths: string[]) {
 
 function addDependenciesToPackageJson(): Rule {
   return chain([
-    addDependency('@angular/compiler-cli', latestVersions.Angular, {
-      type: DependencyType.Dev,
-      existing: ExistingBehavior.Skip,
-    }),
-    addDependency('@angular/build', latestVersions.AngularBuild, {
-      type: DependencyType.Dev,
-      existing: ExistingBehavior.Skip,
-    }),
-    addDependency('ng-packagr', latestVersions.NgPackagr, {
-      type: DependencyType.Dev,
-      existing: ExistingBehavior.Skip,
-    }),
+    ...LIBRARY_DEV_DEPENDENCIES.map((dependency) =>
+      addDependency(dependency.name, dependency.version, {
+        type: DependencyType.Dev,
+        existing: ExistingBehavior.Skip,
+      }),
+    ),
     addDependency('tslib', latestVersions['tslib'], {
       type: DependencyType.Default,
       existing: ExistingBehavior.Skip,
     }),
-    addDependency('typescript', latestVersions['typescript'], {
-      type: DependencyType.Dev,
-      existing: ExistingBehavior.Skip,
-    }),
   ]);
 }