refactor(@schematics/angular): use updated utilities in E2E schematic

Updates the E2E schematic to use the workspace and dependency utility rules exported from `@schematics/angular/utility`.
This change also removes the use of the custom path manipulation functions from `@angular-devkit/core`.
The development dependency versions for `protractor` and `jasmine-spec-reporter` are also moved to the latest
versions helper `package.json` file. This move allows the versions to be automatically updated via renovate
instead of hardcoded in the schematic source code.

Author: clydin

packages/schematics/angular/e2e/index.ts

@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { join, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
-  Tree,
   apply,
   applyTemplates,
   chain,
@@ -19,14 +17,29 @@ import {
   strings,
   url,
 } from '@angular-devkit/schematics';
-import { readWorkspace, writeWorkspace } from '../utility';
-import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
+import {
+  AngularBuilder,
+  DependencyType,
+  addDependency,
+  updateWorkspace,
+} from '@schematics/angular/utility';
+import { posix as path } from 'path';
 import { JSONFile } from '../utility/json-file';
 import { latestVersions } from '../utility/latest-versions';
-import { relativePathToWorkspaceRoot } from '../utility/paths';
-import { Builders } from '../utility/workspace-models';
 import { Schema as E2eOptions } from './schema';
 
+/**
+ * The list of development dependencies used by the E2E protractor-based builder.
+ * The versions are sourced from the latest versions `../utility/latest-versions/package.json`
+ * file which is automatically updated via renovate.
+ */
+const E2E_DEV_DEPENDENCIES = Object.freeze([
+  'protractor',
+  'jasmine-spec-reporter',
+  'ts-node',
+  '@types/node',
+]);
+
 function addScriptsToPackageJson(): Rule {
   return (host) => {
     const pkgJson = new JSONFile(host, 'package.json');
@@ -39,70 +52,49 @@ function addScriptsToPackageJson(): Rule {
 }
 
 export default function (options: E2eOptions): Rule {
-  return async (host: Tree) => {
-    const appProject = options.relatedAppName;
-    const workspace = await readWorkspace(host);
-    const project = workspace.projects.get(appProject);
+  const { relatedAppName } = options;
+
+  return updateWorkspace((workspace) => {
+    const project = workspace.projects.get(relatedAppName);
+
     if (!project) {
-      throw new SchematicsException(`Project name "${appProject}" doesn't not exist.`);
+      throw new SchematicsException(`Project name "${relatedAppName}" doesn't not exist.`);
     }
 
-    const root = join(normalize(project.root), 'e2e');
+    const e2eRootPath = path.join(project.root, 'e2e');
 
     project.targets.add({
       name: 'e2e',
-      builder: Builders.Protractor,
+      builder: AngularBuilder.Protractor,
       defaultConfiguration: 'development',
       options: {
-        protractorConfig: `${root}/protractor.conf.js`,
+        protractorConfig: path.join(e2eRootPath, 'protractor.conf.js'),
       },
       configurations: {
         production: {
-          devServerTarget: `${options.relatedAppName}:serve:production`,
+          devServerTarget: `${relatedAppName}:serve:production`,
         },
         development: {
-          devServerTarget: `${options.relatedAppName}:serve:development`,
+          devServerTarget: `${relatedAppName}:serve:development`,
         },
       },
     });
 
-    await writeWorkspace(host, workspace);
-
     return chain([
       mergeWith(
         apply(url('./files'), [
           applyTemplates({
             utils: strings,
             ...options,
-            relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(root),
+            relativePathToWorkspaceRoot: path.relative(path.join('/', e2eRootPath), '/'),
           }),
-          move(root),
+          move(e2eRootPath),
         ]),
       ),
-      (host) =>
-        [
-          {
-            type: NodeDependencyType.Dev,
-            name: 'protractor',
-            version: '~7.0.0',
-          },
-          {
-            type: NodeDependencyType.Dev,
-            name: 'jasmine-spec-reporter',
-            version: '~7.0.0',
-          },
-          {
-            type: NodeDependencyType.Dev,
-            name: 'ts-node',
-            version: latestVersions['ts-node'],
-          },
-          {
-            type: NodeDependencyType.Dev,
-            name: '@types/node',
-            version: latestVersions['@types/node'],
-          },
-        ].forEach((dep) => addPackageJsonDependency(host, dep)),
+      ...E2E_DEV_DEPENDENCIES.map((name) =>
+        addDependency(name, latestVersions[name], { type: DependencyType.Dev }),
+      ),
       addScriptsToPackageJson(),
     ]);
-  };
+  });
 }

packages/schematics/angular/utility/latest-versions/package.json

@@ -6,12 +6,14 @@
     "@types/jasmine": "~4.0.0",
     "@types/node": "^14.15.0",
     "jasmine-core": "~4.1.0",
+    "jasmine-spec-reporter": "~7.0.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.2.0",
     "karma-jasmine-html-reporter": "~1.7.0",
     "karma-jasmine": "~5.0.0",
     "karma": "~6.3.0",
     "ng-packagr": "^14.0.0-next.8",
+    "protractor": "~7.0.0",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
     "ts-node": "~10.8.0",