Skip to content

Commit

Permalink
chore(app/angular): add additional log outputs
Browse files Browse the repository at this point in the history
this should help improving the error reporting when a user has trouble using app/angular
  • Loading branch information
kroeder committed Jan 11, 2020
1 parent 93ccb84 commit 7980eb6
Showing 1 changed file with 22 additions and 4 deletions.
26 changes: 22 additions & 4 deletions app/angular/src/server/angular-cli_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export function getAngularCliConfig(dirToSearch: string) {
const fname = path.join(dirToSearch, 'angular.json');

if (!fs.existsSync(fname)) {
logger.error(`Could not find angular.json using ${fname}`);
return undefined;
}

Expand All @@ -67,9 +68,26 @@ export function getLeadingAngularCliProject(ngCliConfig: any) {
throw new Error('angular.json must have projects entry.');
}

const fallbackProject = defaultProject && projects[defaultProject];
const firstProject = projects[Object.keys(projects)[0]];
return projects.storybook || fallbackProject || firstProject;
let projectName;
const firstProjectName = Object.keys(projects)[0];
if (projects.storybook) {
projectName = 'storybook';
} else if (defaultProject && projects[defaultProject]) {
projectName = defaultProject;
} else if (projects[firstProjectName]) {
projectName = firstProjectName;
}

const project = projects[projectName];
if (!project) {
logger.error(`Could not find angular project '${projectName}' in angular.json.`);
} else {
logger.info(`=> Using angular project '${projectName}' for configuring Storybook.`);
}
if (!project.architect.build) {
logger.error(`architect.build is not defined for project '${projectName}'.`);
}
return project;
}

export function getAngularCliWebpackConfigOptions(dirToSearch: Path) {
Expand Down Expand Up @@ -102,7 +120,7 @@ export function getAngularCliWebpackConfigOptions(dirToSearch: Path) {
optimization: {},
...projectOptions,
assets: normalizedAssets,
budgets
budgets,
},
};
}
Expand Down

0 comments on commit 7980eb6

Please sign in to comment.