Skip to content

chore: make compatibility mode work for apps with multiple modules #2093

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

Merged
merged 1 commit into from
Jan 20, 2017

Conversation

jelbourn
Copy link
Member

@jelbourn jelbourn commented Dec 7, 2016

R: @kara

The way I previously had the compatibility mode set up, it wouldn't have worked for applications that are composed of multiple NgModules because the sub-modules wouldn't have included the MdPrefixEnforcer directive.

For this new way, you're always going to have one of the prefix-enforcer directives loaded, but not the other.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Dec 7, 2016
@jelbourn jelbourn force-pushed the no-conflict-submodules branch from 85164e7 to 8c317e3 Compare January 13, 2017 22:31
@jelbourn jelbourn requested review from kara and andrewseguin January 13, 2017 22:56
@jelbourn
Copy link
Member Author

@kara rebased and updated
@andrewseguin can you also take a look at this?

Copy link
Contributor

@andrewseguin andrewseguin left a comment

Choose a reason for hiding this comment

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

Looks good to me. Curious that we have that list of selectors, is that to be maintained by us whenever we add/remove component selectors?

Copy link
Contributor

@kara kara left a comment

Choose a reason for hiding this comment

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

LGTM


/** Directive that enforces that the `mat-` prefix cannot be used. */
@Directive({selector: MAT_ELEMENTS_SELECTOR})
export class MatPrefixEnforcer {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: From the name, I originally thought that this would enforce that you only had mat- prefixes, rather than you can't have mat- prefixes (as in, you're enforcing that they're present). I think it's the word "Enforcer". "MatPrefixRejector"?

Copy link
Member Author

Choose a reason for hiding this comment

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

Renamed

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool, LGTM (although it was LGTM before too)

@jelbourn jelbourn added the action: merge The PR is ready for merge by the caretaker label Jan 13, 2017
@kara kara removed their assignment Jan 17, 2017
@mmalerba
Copy link
Contributor

please rebase

@mmalerba
Copy link
Contributor

whoops, tried using the github button to resolve but that was apparently a bad idea, now it complains about merge conflicts when I try to g3sync presubmit.

@jelbourn is this something that can be fixed or do i just have to manually sync it now?

@jelbourn jelbourn force-pushed the no-conflict-submodules branch from ad80d1d to e0ca485 Compare January 20, 2017 00:31
@mmalerba mmalerba merged commit 0420729 into angular:master Jan 20, 2017
@jelbourn jelbourn deleted the no-conflict-submodules branch September 13, 2017 04:37
@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 7, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants