Skip to content

fix(styling): Add .import sass files #21869

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
Feb 18, 2021
Merged

Conversation

andrewseguin
Copy link
Contributor

No description provided.

@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Feb 10, 2021
@andrewseguin andrewseguin added the target: patch This PR is targeted for the next patch release label Feb 10, 2021
@andrewseguin andrewseguin marked this pull request as ready for review February 11, 2021 21:39
@andrewseguin andrewseguin requested review from devversion, mmalerba and a team as code owners February 11, 2021 21:39
Copy link
Member

@crisbeto crisbeto left a comment

Choose a reason for hiding this comment

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

LGTM, but I wonder whether this won't conflict with the changes in #21204. The sass migration script also generates .import files. Will we have to merge the two together or overwrite the existing ones?

@crisbeto crisbeto added the action: merge The PR is ready for merge by the caretaker label Feb 14, 2021
@andrewseguin
Copy link
Contributor Author

I think adding these .import.scss files separately in this PR would be easier since we don't need to worry about fixing google3 issues that arise from it. I had to make a few changes internally since @forward didn't always seem to work transitively. If we can get this in, we won't regress on any future client changes

@jelbourn
Copy link
Member

@crisbeto once we can get Google apps switched over to targeting these shim .import.scss files, your PR to adopt @use can basically delete all of these shims and replace them with the real ones. The only catch is that we have to make sure we're forwarding all the same stuff under the same names.

@andrewseguin andrewseguin merged commit 4ae90cc into angular:master Feb 18, 2021
andrewseguin added a commit that referenced this pull request Feb 18, 2021
@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 Mar 21, 2021
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: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants