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

Jump to bottom

fix(material/schematics): gracefully skip broken css files #25767

Merged
merged 3 commits into from
Oct 5, 2022
Merged

fix(material/schematics): gracefully skip broken css files #25767

merged 3 commits into from
Oct 5, 2022

Conversation

mmalerba
Copy link
Contributor

@mmalerba mmalerba commented Oct 5, 2022

also don't treat files like something.css.map as a CSS file.

@mmalerba mmalerba added merge safe target: major This PR is targeted for the next major release labels Oct 5, 2022
crisbeto
crisbeto approved these changes Oct 5, 2022
View reviewed changes
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

src/material/schematics/ng-generate/mdc-migration/rules/theming-styles.ts Outdated Show resolved Hide resolved
src/material/schematics/ng-update/migrations/legacy-components-v15/index.ts Show resolved Hide resolved
wagnermaciel
wagnermaciel approved these changes Oct 5, 2022
View reviewed changes
Copy link
Contributor

@wagnermaciel wagnermaciel left a comment

Choose a reason for hiding this comment

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

LGTM!

@mmalerba mmalerba added the action: merge The PR is ready for merge by the caretaker label Oct 5, 2022
devversion
devversion approved these changes Oct 5, 2022
View reviewed changes
Copy link
Member

@devversion devversion left a comment

Choose a reason for hiding this comment

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

Nice, good fix with the regex. Interesting that maps are part of the source tree at the same time though

src/material/schematics/ng-generate/mdc-migration/rules/theming-styles.ts Outdated Show resolved Hide resolved
@mmalerba
Copy link
Contributor Author

mmalerba commented Oct 5, 2022

Yeah people shouldn't have broken css or map files in the source tree I guess, but just making the script a little more robust so it doesn't blow up when it encounters those kinds of things.

@mmalerba mmalerba merged commit 0b423d4 into angular:main Oct 5, 2022
@mmalerba mmalerba deleted the ng-update branch October 5, 2022 22:36
@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 Nov 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@crisbeto crisbeto crisbeto approved these changes

@devversion devversion devversion approved these changes

@wagnermaciel wagnermaciel wagnermaciel approved these changes

@andrewseguin andrewseguin Awaiting requested review from andrewseguin

Assignees

@crisbeto crisbeto

@wagnermaciel wagnermaciel

Labels
action: merge The PR is ready for merge by the caretaker target: major This PR is targeted for the next major release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mmalerba @crisbeto @devversion @wagnermaciel