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

Author: Angular Builds

commands/add-impl.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * found in the LICENSE file at https://angular.io/license
  */
 const core_1 = require("@angular-devkit/core");
-const node_1 = require("@angular-devkit/core/node");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -119,15 +118,11 @@ class AddCommand extends schematic_command_1.SchematicCommand {
     }
     isPackageInstalled(name) {
         try {
-            node_1.resolve(name, {
-                checkLocal: true,
-                basedir: this.workspace.root,
-                resolvePackageJson: true,
-            });
+            require.resolve(path_1.join(name, 'package.json'), { paths: [this.workspace.root] });
             return true;
         }
         catch (e) {
-            if (!(e instanceof node_1.ModuleNotFoundException)) {
+            if (e.code !== 'MODULE_NOT_FOUND') {
                 throw e;
             }
         }
@@ -160,7 +155,7 @@ class AddCommand extends schematic_command_1.SchematicCommand {
     async findProjectVersion(name) {
         let installedPackage;
         try {
-            installedPackage = node_1.resolve(name, { checkLocal: true, basedir: this.workspace.root, resolvePackageJson: true });
+            installedPackage = require.resolve(path_1.join(name, 'package.json'), { paths: [this.workspace.root] });
         }
         catch (_a) { }
         if (installedPackage) {

lib/init.js

@@ -11,7 +11,6 @@ require("symbol-observable");
 // symbol polyfill must go first
 // tslint:disable-next-line:ordered-imports import-groups
 const core_1 = require("@angular-devkit/core");
-const node_1 = require("@angular-devkit/core/node");
 const fs = require("fs");
 const path = require("path");
 const semver_1 = require("semver");
@@ -62,11 +61,7 @@ if (process.env['NG_CLI_PROFILING']) {
 }
 let cli;
 try {
-    const projectLocalCli = node_1.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_1.SemVer(packageJson['version']);
     let localVersion;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "8.0.0-beta.10+33.a355e7d",
+  "version": "8.0.0-beta.10+34.cfa1649",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,11 +28,11 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#a355e7d",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#a355e7d",
-    "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#a355e7d",
-    "@schematics/angular": "github:angular/schematics-angular-builds#a355e7d",
-    "@schematics/update": "github:angular/schematics-update-builds#a355e7d",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#cfa1649",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#cfa1649",
+    "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#cfa1649",
+    "@schematics/angular": "github:angular/schematics-angular-builds#cfa1649",
+    "@schematics/update": "github:angular/schematics-update-builds#cfa1649",
     "@yarnpkg/lockfile": "1.1.0",
     "debug": "^4.1.1",
     "ini": "1.3.5",

uniqueId

@@ -1 +1 @@
-Sat Mar 30 2019 01:23:40 GMT+0000 (Coordinated Universal Time)
+Sun Mar 31 2019 01:57:00 GMT+0000 (Coordinated Universal Time)

upgrade/version.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
-const node_1 = require("@angular-devkit/core/node");
 const path = require("path");
 const semver_1 = require("semver");
 class Version {
@@ -35,13 +34,9 @@ class Version {
         let angularPkgJson;
         let rxjsPkgJson;
         try {
-            const resolveOptions = {
-                basedir: projectRoot,
-                checkGlobal: false,
-                checkLocal: true,
-            };
-            const angularPackagePath = node_1.resolve('@angular/core/package.json', resolveOptions);
-            const rxjsPackagePath = node_1.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);
         }