Skip to content

feat(ng-add): respect project default inlineStyle, inlineTemplate and spec option value #12888

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.

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

Conversation

devversion
Copy link
Member

If developers create a new Angular CLI project, options like --skipTests, --inlineTemplate or --inlineStyle can be specified. These options will be stored in the workspace config file and will be respected if someone generates another component on the existing project.

Since we technically also generate components, we should respect the default option value for those options if not explicitly specified.

Closes #11874.

@devversion devversion added pr: merge safe target: major This PR is targeted for the next major release labels Aug 29, 2018
@devversion devversion requested a review from amcdnl as a code owner August 29, 2018 14:08
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Aug 29, 2018
if (!options.styleext) {
options.styleext = determineDefaultStyleExt(project);
}
setDefaultSchematicOptions(project, options);
Copy link
Member Author

Choose a reason for hiding this comment

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

@jelbourn I'm very unhappy with that function name. Do you have any better ideas?

Copy link
Member

Choose a reason for hiding this comment

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

How about

options = {...getDefaultComponentOptions(project), ...options};

Copy link
Member Author

Choose a reason for hiding this comment

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

That would have been perfect. Unfortunately the options will look something like: {spec: undefined} and therefore wouldn't be replaced by the default component options.

I've went with something like that:

// Add the default component option values to the options if an option is not explicitly
// specified but a default component option is available.
Object.keys(options)
  .filter(optionName => options[optionName] == null && defaultComponentOptions[optionName])
  .forEach(optionName => options[optionName] = defaultComponentOptions[optionName]);

fallbackValue: T): T | null {
if (project.schematics &&
project.schematics['@schematics/angular:component'] &&
project.schematics['@schematics/angular:component'][optionName] !== undefined) {
Copy link
Member

Choose a reason for hiding this comment

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

!= null?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done. Please have another look.

if (!options.styleext) {
options.styleext = determineDefaultStyleExt(project);
}
setDefaultSchematicOptions(project, options);
Copy link
Member

Choose a reason for hiding this comment

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

How about

options = {...getDefaultComponentOptions(project), ...options};

* by looking at the stored schematic options for `@schematics/angular:component` in the
* CLI workspace configuration.
*/
function getDefaultSchematicOption<T>(project: WorkspaceProject, optionName: string,
Copy link
Member

Choose a reason for hiding this comment

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

getDefaultComponentOption?

… spec option value

If developers create a new Angular CLI project, options like `--skipTests`, `--inlineTemplate` or `--inlineStyle` can be specified. These options will be stored in the workspace config file and will be respected if someone generates another component on the existing project.

Since we technically also generate components, we should respect the default option value for those options if _not_ explicitly specified.

Closes angular#11874.
@devversion devversion force-pushed the feat/ng-add-respect-inall-project-default-options branch from 643a296 to aa770c4 Compare August 29, 2018 20:44
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

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

LGTM

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Aug 29, 2018
@ngbot
Copy link

ngbot bot commented Aug 29, 2018

I see that you just added the pr: merge ready label, but the following checks are still failing:
    failure status "ci/circleci: build" is failing
    pending status "continuous-integration/travis-ci/pr" is pending

If you want your PR to be merged, it has to pass all the CI checks.

If you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help.

@jelbourn jelbourn merged commit 8831a7a into angular:master Aug 29, 2018
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: major This PR is targeted for the next major release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Material schematics doesn't work with configured angular schematics (scss, spec, etc...)
3 participants