fix(@angular/cli): fix angular-cli logic

The old logic was failing if the global angular-cli config was .angular-cli.json.

Author: hansl

packages/@angular/cli/models/config.ts

@@ -22,14 +22,12 @@ const configCacheMap = new Map<string, CliConfigBase<ConfigInterface>>();
 
 export class CliConfig extends CliConfigBase<ConfigInterface> {
   static configFilePath(projectPath?: string): string {
+    const configNames = [CLI_CONFIG_FILE_NAME, CLI_CONFIG_FILE_NAME_ALT];
     // Find the configuration, either where specified, in the Angular CLI project
     // (if it's in node_modules) or from the current process.
-    return (projectPath && findUp(CLI_CONFIG_FILE_NAME, projectPath))
-        || (projectPath && findUp(CLI_CONFIG_FILE_NAME_ALT, projectPath))
-        || findUp(CLI_CONFIG_FILE_NAME, process.cwd())
-        || findUp(CLI_CONFIG_FILE_NAME_ALT, process.cwd())
-        || findUp(CLI_CONFIG_FILE_NAME, __dirname)
-        || findUp(CLI_CONFIG_FILE_NAME_ALT, __dirname);
+    return (projectPath && findUp(configNames, projectPath))
+        || findUp(configNames, process.cwd())
+        || findUp(configNames, __dirname);
   }
 
   static globalConfigFilePath(): string {

packages/@angular/cli/utilities/find-up.ts

@@ -1,14 +1,19 @@
 import * as path from 'path';
 import { existsSync } from 'fs';
 
-export function findUp(name: string, from: string, stopOnNodeModules = false) {
+export function findUp(names: string | string[], from: string, stopOnNodeModules = false) {
+  if (!Array.isArray(names)) {
+    names = [names];
+  }
   const root = path.parse(from).root;
 
   let currentDir = from;
   while (currentDir && currentDir !== root) {
-    const p = path.join(currentDir, name);
-    if (existsSync(p)) {
-      return p;
+    for (const name of names) {
+      const p = path.join(currentDir, name);
+      if (existsSync(p)) {
+        return p;
+      }
     }
 
     if (stopOnNodeModules) {