Switch theming API migration to ng update and other fixes #22628
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
crisbeto
added
P1
This comment has been minimized.
This comment has been minimized.
google-cla
bot
added
the
cla: no
josephperrott
added
cla: yes
crisbeto
force-pushed
the
theming-api-ng-update
branch
from
7a17485 to
ec7ebff
Compare
This comment has been minimized.
This comment has been minimized.
google-cla
bot
added
cla: no
|
@googlebot I consent. |
google-cla
bot
added
cla: yes
devversion
approved these changes
May 5, 2021
| const count = ThemingApiMigration.migratedFileCount; | ||
|
|
||
| if (count > 0) { | ||
| context.logger.info(`Migrated ${count === 1 ? `${count} files` : `1 file`} to the ` + |
There was a problem hiding this comment.
I think the ternary needs to be inversed.
There was a problem hiding this comment.
Also, out of curiosity, is there a doc/guide we could link too? that might be nice to see when the migration ran.
There was a problem hiding this comment.
I don't think that we have a doc about the migration in particular. It'll be mentioned in the changelog.
crisbeto
force-pushed
the
theming-api-ng-update
branch
from
ec7ebff to
70343d7
Compare
Switches the `themingApi` migration from `ng generate` to `ng update`. Includes refactoring it into a `DevkitMigration` and changing the test setup to match.
Stylesheets which aren't referneced as part of any component are also candidates for migration. We search for such stylesheets by recursing through the virtual devkit tree. This logic is currently not working for cases where project targets have a `root` set within the Angular CLI workspace configuration. It breaks because we do not build up a workspace-relative path, but instead only collect the file names. Signed-off-by: Kristiyan Kostadinov <[email protected]>
…e is an import Changes the migration logic so that variables without a `mat-` or `cdk-` prefix are only migrated if there is an explicit Material import. This aims to prevent accidental renames for variables that we don't own. Also adds a few variables that were previously skipped.
…tion Based on external feedback, adds a message with the number of migrated files at the end of the theming API migration.
…se statement at the top of the file in some cases Our logic for determining where to insert an `@use` statement is to look for the first `@import` and insert before it. The problem is that if the theming import is the only one in the file and it's further down, we'll insert it incorrectly, because `@use` has to always be above other statements.
crisbeto
force-pushed
the
theming-api-ng-update
branch
from
70343d7 to
d5f2935
Compare
|
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. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Split up into several commits that include the following changes:
themingApimigration fromng generatetong updateas discussed. This required some adjustments to the code that is called by the CLI, as well as some changes to the unit test setup.@usestatement for the new API would be inserted too far down in the file, if the file only has one@importstatement which is placed further down too. This results in a compilation error, because@usestatements have to be at the top.