Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Angular: Fix missing architect properties #9390

Merged
merged 2 commits into from
Jan 14, 2020
Merged

Angular: Fix missing architect properties #9390

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7980eb6
chore(app/angular): add additional log outputs
kroeder Jan 11, 2020
f419b7f
fix(app/angular): add missing architect.build properties
kroeder Jan 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions app/angular/src/server/angular-cli_config.ts
View file
Open in desktop
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];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is projects guaranteed to have at least one key?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It must, or else we are speaking of an empty project.
A couple of lines earlier there's also a check for making sure there is at least one project

storybook/app/angular/src/server/angular-cli_config.ts

Line 67 in f419b7f

if (!projects || !Object.keys(projects).length) {

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 All @@ -90,6 +108,9 @@ export function getAngularCliWebpackConfigOptions(dirToSearch: Path) {
const tsConfigPath = path.resolve(dirToSearch, projectOptions.tsConfig) as Path;
const tsConfig = getTsConfigOptions(tsConfigPath);
const budgets = projectOptions.budgets || [];
const scripts = projectOptions.scripts || [];
const outputPath = projectOptions.outputPath || 'dist/storybook-angular';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the output path?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

outputPath is needed by angular.json - more specifically it is needed by the function we call in @angular-devkit for receiving the default angular webpack config.

Storybook does not need it and usually it is already set in angular.json. If it is not set then storybook throws an error that it can't load the angular cli configuration

const styles = projectOptions.styles || [];

return {
root: dirToSearch,
Expand All @@ -102,7 +123,10 @@ export function getAngularCliWebpackConfigOptions(dirToSearch: Path) {
optimization: {},
...projectOptions,
assets: normalizedAssets,
budgets
budgets,
scripts,
styles,
outputPath,
},
};
}
Expand Down