refactor(@angular/cli): use standard node resolution methods where possible

clydin · mgechev · commit cfa1649fddcb · 2019-03-30T18:36:22.000-07:00
diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { analytics, tags, terminal } from '@angular-devkit/core';
-import { ModuleNotFoundException, resolve } from '@angular-devkit/core/node';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
-import { dirname } from 'path';
+import { dirname, join } from 'path';
 import { intersects, prerelease, rcompare, satisfies, valid, validRange } from 'semver';
 import { isPackageNameSafeForAnalytics } from '../models/analytics';
 import { Arguments } from '../models/interface';
@@ -160,15 +159,11 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
 
   private isPackageInstalled(name: string): boolean {
     try {
-      resolve(name, {
-        checkLocal: true,
-        basedir: this.workspace.root,
-        resolvePackageJson: true,
-      });
+      require.resolve(join(name, 'package.json'), { paths: [this.workspace.root] });
 
       return true;
     } catch (e) {
-      if (!(e instanceof ModuleNotFoundException)) {
+      if (e.code !== 'MODULE_NOT_FOUND') {
         throw e;
       }
     }
@@ -209,9 +204,9 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
   private async findProjectVersion(name: string): Promise<string | null> {
     let installedPackage;
     try {
-      installedPackage = resolve(
-        name,
-        { checkLocal: true, basedir: this.workspace.root, resolvePackageJson: true },
+      installedPackage = require.resolve(
+        join(name, 'package.json'),
+        { paths: [this.workspace.root] },
       );
     } catch { }
 
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
@@ -9,7 +9,6 @@ import 'symbol-observable';
 // symbol polyfill must go first
 // tslint:disable-next-line:ordered-imports import-groups
 import { tags, terminal } from '@angular-devkit/core';
-import { resolve } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
 import { SemVer } from 'semver';
@@ -77,14 +76,7 @@ if (process.env['NG_CLI_PROFILING']) {
 
 let cli;
 try {
-  const projectLocalCli = resolve(
-    '@angular/cli',
-    {
-      checkGlobal: false,
-      basedir: process.cwd(),
-      preserveSymlinks: true,
-    },
-  );
+  const projectLocalCli = require.resolve('@angular/cli', { paths: [process.cwd()] });
 
   // This was run from a global, check local version.
   const globalVersion = new SemVer(packageJson['version']);
diff --git a/packages/angular/cli/upgrade/version.ts b/packages/angular/cli/upgrade/version.ts
@@ -7,7 +7,6 @@
  */
 
 import { tags, terminal } from '@angular-devkit/core';
-import { resolve } from '@angular-devkit/core/node';
 import * as path from 'path';
 import { SemVer } from 'semver';
 
@@ -41,13 +40,9 @@ export class Version {
     let rxjsPkgJson;
 
     try {
-      const resolveOptions = {
-        basedir: projectRoot,
-        checkGlobal: false,
-        checkLocal: true,
-      };
-      const angularPackagePath = resolve('@angular/core/package.json', resolveOptions);
-      const rxjsPackagePath = resolve('rxjs/package.json', resolveOptions);
+      const resolveOptions = { paths: [projectRoot] };
+      const angularPackagePath = require.resolve('@angular/core/package.json', resolveOptions);
+      const rxjsPackagePath = require.resolve('rxjs/package.json', resolveOptions);
 
       angularPkgJson = require(angularPackagePath);
       rxjsPkgJson = require(rxjsPackagePath);
