fix(@angular-devkit/build-angular): fully resolve project modules

clydin · hansl · commit 228a2edd4a6c · 2018-09-26T08:53:14.000-04:00
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts
@@ -5,19 +5,18 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-import * as fs from 'fs';
-import * as path from 'path';
+import { resolve } from '@angular-devkit/core/node';
 
 // Resolve dependencies within the target project.
 export function resolveProjectModule(root: string, moduleName: string) {
-  const rootModules = path.join(root, 'node_modules');
-  if (fs.existsSync(rootModules)) {
-    return require.resolve(moduleName, { paths: [rootModules] });
-  } else {
-    return require.resolve(moduleName, { paths: [root] });
-  }
+  return resolve(
+    moduleName,
+    {
+      basedir: root,
+      checkGlobal: false,
+      checkLocal: true,
+    },
+  );
 }
 
 // Require dependencies within the target project.
