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.

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

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

Merged
merged 1 commit into from Feb 18, 2021
Merged

Conversation

@andrewseguin
Copy link
Contributor

@andrewseguin andrewseguin commented Feb 10, 2021

No description provided.

@google-cla google-cla bot added the cla: yes label Feb 10, 2021
@andrewseguin andrewseguin force-pushed the andrewseguin:sass branch from d7b8f64 to cc59322 Feb 10, 2021
@andrewseguin andrewseguin force-pushed the andrewseguin:sass branch from bc288e1 to 9395bd4 Feb 11, 2021
@andrewseguin andrewseguin requested review from jelbourn, crisbeto and annieyw Feb 11, 2021
@andrewseguin andrewseguin marked this pull request as ready for review Feb 11, 2021
@andrewseguin andrewseguin requested review from devversion, mmalerba and angular/dev-infra-components as code owners Feb 11, 2021
@andrewseguin andrewseguin force-pushed the andrewseguin:sass branch from 9395bd4 to abfff64 Feb 12, 2021
Copy link
Member

@crisbeto crisbeto left a comment

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?

@andrewseguin andrewseguin force-pushed the andrewseguin:sass branch from abfff64 to 6bf2977 Feb 16, 2021
@andrewseguin andrewseguin force-pushed the andrewseguin:sass branch from 6bf2977 to d2111f2 Feb 16, 2021
@andrewseguin
Copy link
Contributor Author

@andrewseguin andrewseguin commented Feb 16, 2021

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

@jelbourn jelbourn commented Feb 16, 2021

@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
16 checks passed
16 checks passed
Inclusive Language Check completed with success
Details
ci/angular: merge status All checks passed!
ci/circleci: api_golden_checks Your tests passed on CircleCI!
Details
ci/circleci: bazel_build Your tests passed on CircleCI!
Details
ci/circleci: build_release_packages Your tests passed on CircleCI!
Details
ci/circleci: e2e_tests Your tests passed on CircleCI!
Details
ci/circleci: integration_tests Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: ngcc_compatibility Your tests passed on CircleCI!
Details
ci/circleci: tests_browserstack Your tests passed on CircleCI!
Details
ci/circleci: tests_local_browsers Your tests passed on CircleCI!
Details
ci/circleci: tests_saucelabs Your tests passed on CircleCI!
Details
ci/circleci: upload_release_packages Your tests passed on CircleCI!
Details
ci/circleci: view_engine_build Your tests passed on CircleCI!
Details
ci/circleci: view_engine_test Your tests passed on CircleCI!
Details
cla/google All necessary CLAs are signed
andrewseguin added a commit that referenced this pull request Feb 18, 2021
(cherry picked from commit 4ae90cc)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants