-
Notifications
You must be signed in to change notification settings - Fork 6.8k
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
feat(ng-add): respect project default inlineStyle, inlineTemplate and spec option value #12888
Conversation
if (!options.styleext) { | ||
options.styleext = determineDefaultStyleExt(project); | ||
} | ||
setDefaultSchematicOptions(project, options); |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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};
There was a problem hiding this comment.
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) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
!= null
?
There was a problem hiding this comment.
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); |
There was a problem hiding this comment.
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, |
There was a problem hiding this comment.
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.
643a296
to
aa770c4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
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.