refactor: update paths to use new API of @schematics/angular

(cherry picked from commit 12cb8ea)

Author: alan-agius4

modules/common/schematics/ng-add/index.ts

@@ -21,26 +21,27 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import {
+  DependencyType,
+  addDependency,
+  readWorkspace,
+  updateWorkspace,
+} from '@schematics/angular/utility';
 import {
   addImportToModule,
   findNode,
   getDecoratorMetadata,
 } from '@schematics/angular/utility/ast-utils';
 import { InsertChange, applyToUpdateRecorder } from '@schematics/angular/utility/change';
-import {
-  NodeDependencyType,
-  addPackageJsonDependency,
-} from '@schematics/angular/utility/dependencies';
 import { findBootstrapModulePath } from '@schematics/angular/utility/ng-ast-utils';
-import { getWorkspace, updateWorkspace } from '@schematics/angular/utility/workspace';
 import { posix } from 'path';
 import * as ts from 'typescript';
 
 import { Schema as NgAddOptions } from './schema';
 
 export default function (options: NgAddOptions): Rule {
   return async (host, context) => {
-    const workspace = await getWorkspace(host);
+    const workspace = await readWorkspace(host);
     const project = workspace.projects.get(options.project);
 
     if (project.extensions.projectType !== 'application') {
@@ -59,37 +60,19 @@ export default function (options: NgAddOptions): Rule {
     return chain([
       augmentAppModuleRule(project, clientBuildTarget, options),
       options.ssr ? addSSRRule(project, clientBuildTarget) : noop(),
-      options.prerender ? addPreRenderRule() : noop(),
+      options.prerender
+        ? addDependency('@nguniversal/builders', '~0.0.0-PLACEHOLDER', {
+            type: DependencyType.Dev,
+          })
+        : noop(),
       addScriptsRule(options),
       updateWorkspaceRule(options),
     ]);
   };
 }
 
-function addPreRenderRule(): Rule {
-  return async (host) => {
-    addPackageJsonDependency(host, {
-      name: '@nguniversal/builders',
-      type: NodeDependencyType.Dev,
-      version: '~0.0.0-PLACEHOLDER',
-    });
-  };
-}
-
 function addSSRRule(project: ProjectDefinition, buildTarget: TargetDefinition): Rule {
-  return async (host) => {
-    addPackageJsonDependency(host, {
-      type: NodeDependencyType.Default,
-      name: 'express',
-      version: 'EXPRESS_VERSION',
-    });
-
-    addPackageJsonDependency(host, {
-      type: NodeDependencyType.Dev,
-      name: '@types/express',
-      version: 'EXPRESS_TYPES_VERSION',
-    });
-
+  return async () => {
     const templateSource = apply(url('./files/src'), [
       applyTemplates({}),
       move(project.sourceRoot ?? '/src'),
@@ -102,7 +85,17 @@ function addSSRRule(project: ProjectDefinition, buildTarget: TargetDefinition):
       move(project.root),
     ]);
 
-    return chain([mergeWith(templateSource), mergeWith(rootSource)]);
+    return chain([
+      addDependency('express', 'EXPRESS_VERSION', {
+        type: DependencyType.Default,
+      }),
+
+      addDependency('@types/express', 'EXPRESS_TYPES_VERSION', {
+        type: DependencyType.Dev,
+      }),
+      mergeWith(templateSource),
+      mergeWith(rootSource),
+    ]);
   };
 }
 

modules/express-engine/schematics/install/index.ts

@@ -9,7 +9,6 @@
 import { dirname, join, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
-  SchematicContext,
   SchematicsException,
   Tree,
   apply,
@@ -21,14 +20,9 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema as UniversalOptions } from '@schematics/angular/universal/schema';
-import {
-  NodeDependencyType,
-  addPackageJsonDependency,
-} from '@schematics/angular/utility/dependencies';
+import { DependencyType, addDependency, updateWorkspace } from '@schematics/angular/utility';
 import { JSONFile } from '@schematics/angular/utility/json-file';
-import { updateWorkspace } from '@schematics/angular/utility/workspace';
 import * as ts from 'typescript';
 
 import {
@@ -263,34 +257,22 @@ function routingInitialNavigationRule(options: UniversalOptions): Rule {
   };
 }
 
-function addDependencies(options: UniversalOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    if (!options.skipInstall) {
-      context.addTask(new NodePackageInstallTask());
-    }
-    addPackageJsonDependency(host, {
-      name: '@nguniversal/builders',
-      type: NodeDependencyType.Dev,
-      version: '^0.0.0-PLACEHOLDER',
-    });
-
-    addPackageJsonDependency(host, {
-      type: NodeDependencyType.Default,
-      name: '@nguniversal/express-engine',
-      version: '^0.0.0-PLACEHOLDER',
-    });
-    addPackageJsonDependency(host, {
-      type: NodeDependencyType.Default,
-      name: 'express',
-      version: 'EXPRESS_VERSION',
-    });
-    addPackageJsonDependency(host, {
-      type: NodeDependencyType.Dev,
-      name: '@types/express',
-      version: 'EXPRESS_TYPES_VERSION',
-    });
-
-    return host;
+function addDependencies(): Rule {
+  return (_host: Tree) => {
+    return chain([
+      addDependency('@nguniversal/builders', '^0.0.0-PLACEHOLDER', {
+        type: DependencyType.Dev,
+      }),
+      addDependency('@nguniversal/express-engine', '^0.0.0-PLACEHOLDER', {
+        type: DependencyType.Default,
+      }),
+      addDependency('express', 'EXPRESS_VERSION', {
+        type: DependencyType.Default,
+      }),
+      addDependency('@types/express', 'EXPRESS_TYPES_VERSION', {
+        type: DependencyType.Dev,
+      }),
+    ]);
   };
 }
 
@@ -333,7 +315,7 @@ export default function (options: AddUniversalOptions): Rule {
       updateWorkspaceConfigRule(options),
       routingInitialNavigationRule(options),
       addServerFile(options),
-      addDependencies(options),
+      addDependencies(),
     ]);
   };
 }

modules/express-engine/schematics/utils/utils.ts

@@ -9,14 +9,14 @@
 import { workspaces } from '@angular-devkit/core';
 import { SchematicsException } from '@angular-devkit/schematics';
 import { Tree } from '@angular-devkit/schematics/src/tree/interface';
-import { getWorkspace } from '@schematics/angular/utility/workspace';
+import { readWorkspace } from '@schematics/angular/utility';
 import * as ts from 'typescript';
 
 export async function getProject(
   host: Tree,
   projectName: string,
 ): Promise<workspaces.ProjectDefinition> {
-  const workspace = await getWorkspace(host);
+  const workspace = await readWorkspace(host);
   const project = workspace.projects.get(projectName);
 
   if (!project || project.extensions.projectType !== 'application') {