Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-22 23:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): Revert change to config reading

Browse Source 
The code before this change prevented reading of global configuration values.
This commit is contained in:
Mike Brocchi 2017-08-10 09:52:55 -04:00 committed by Hans
parent 41dce6e76f
commit 99eba9823c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@angular/cli/models/config.ts
View File

@ -32,7 +32,7 @@ export class CliConfig extends CliConfigBase<ConfigInterface> {
const projectConfig = CliConfig.fromProject(); const projectConfig = CliConfig.fromProject();
if (projectConfig) { if (projectConfig) {
value = projectConfig.get(jsonPath); value = projectConfig.get(jsonPath);
} else if (CliConfig.globalConfigFilePath() !== CliConfig.configFilePath()) { } else {
const globalConfig = CliConfig.fromGlobal(); const globalConfig = CliConfig.fromGlobal();
if (globalConfig) { if (globalConfig) {
value = globalConfig.get(jsonPath); value = globalConfig.get(jsonPath);