fix(migrations): return correct alias when conflicting import exists #49139
Conversation
This file contains 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
action: review
crisbeto
added
the
merge: caretaker note
This comment was marked as outdated.
This comment was marked as outdated.
devversion
approved these changes
Feb 20, 2023
crisbeto
added
action: merge
Fixes that the `ImportManager` was returning the `propertyName` instead of the `name` when there's an import with a conflicting identifier.
crisbeto
force-pushed
the
standalone-migration-aliases
branch
from
09cdcc6
to
f4117f6
Compare
crisbeto
removed
the
merge: caretaker note
|
This PR was merged into the repository by commit 36b9ff7. |
crapStone
pushed a commit
to Calciumdibromid/CaBr2
that referenced
this pull request
Feb 23, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@angular/animations](https://github.com/angular/angular) | dependencies | minor | [`15.1.5` -> `15.2.0`](https://renovatebot.com/diffs/npm/@angular%2fanimations/15.1.5/15.2.0) | | [@angular/common](https://github.com/angular/angular) | dependencies | minor | [`15.1.5` -> `15.2.0`](https://renovatebot.com/diffs/npm/@angular%2fcommon/15.1.5/15.2.0) | | [@angular/compiler](https://github.com/angular/angular) | dependencies | minor | [`15.1.5` -> `15.2.0`](https://renovatebot.com/diffs/npm/@angular%2fcompiler/15.1.5/15.2.0) | | [@angular/compiler-cli](https://github.com/angular/angular/tree/main/packages/compiler-cli) ([source](https://github.com/angular/angular)) | devDependencies | minor | [`15.1.5` -> `15.2.0`](https://renovatebot.com/diffs/npm/@angular%2fcompiler-cli/15.1.5/15.2.0) | | [@angular/core](https://github.com/angular/angular) | dependencies | minor | [`15.1.5` -> `15.2.0`](https://renovatebot.com/diffs/npm/@angular%2fcore/15.1.5/15.2.0) | | [@angular/forms](https://github.com/angular/angular) | dependencies | minor | [`15.1.5` -> `15.2.0`](https://renovatebot.com/diffs/npm/@angular%2fforms/15.1.5/15.2.0) | | [@angular/platform-browser](https://github.com/angular/angular) | dependencies | minor | [`15.1.5` -> `15.2.0`](https://renovatebot.com/diffs/npm/@angular%2fplatform-browser/15.1.5/15.2.0) | | [@angular/platform-browser-dynamic](https://github.com/angular/angular) | dependencies | minor | [`15.1.5` -> `15.2.0`](https://renovatebot.com/diffs/npm/@angular%2fplatform-browser-dynamic/15.1.5/15.2.0) | --- ### Release Notes <details> <summary>angular/angular</summary> ### [`v15.2.0`](https://github.com/angular/angular/blob/HEAD/CHANGELOG.md#​1520-2023-02-22) [Compare Source](angular/angular@15.1.5...15.2.0) #### Deprecations ##### - Class and `InjectionToken` guards and resolvers are deprecated. Instead, write guards as plain JavaScript functions and inject dependencies with `inject` from `@angular/core`. ##### | Commit | Type | Description | | -- | -- | -- | | [926c35f4ac](angular/angular@926c35f) | docs | Deprecate class and InjectionToken and resolvers ([#​47924](angular/angular#47924)) | ##### common | Commit | Type | Description | | -- | -- | -- | | [54b24eb40f](angular/angular@54b24eb) | feat | Add loaderParams attribute to NgOptimizedImage ([#​48907](angular/angular#48907)) | ##### compiler-cli | Commit | Type | Description | | -- | -- | -- | | [0cf11167f1](angular/angular@0cf1116) | fix | incorrectly detecting forward refs when symbol already exists in file ([#​48988](angular/angular#48988)) | ##### core | Commit | Type | Description | | -- | -- | -- | | [a154db8a81](angular/angular@a154db8) | feat | add ng generate schematic to convert declarations to standalone ([#​48790](angular/angular#48790)) | | [345e737daa](angular/angular@345e737) | feat | add ng generate schematic to convert to standalone bootstrapping APIs ([#​48848](angular/angular#48848)) | | [e7318fc758](angular/angular@e7318fc) | feat | add ng generate schematic to remove unnecessary modules ([#​48832](angular/angular#48832)) | ##### language-service | Commit | Type | Description | | -- | -- | -- | | [4ae384fd61](angular/angular@4ae384f) | feat | Allow auto-imports of a pipe via quick fix when its selector is used, both directly and via reexports. ([#​48354](angular/angular#48354)) | | [141333411e](angular/angular@1413334) | feat | Introduce a new NgModuleIndex, and use it to suggest re-exports. ([#​48354](angular/angular#48354)) | | [d0145033bd](angular/angular@d014503) | fix | generate forwardRef for same file imports ([#​48898](angular/angular#48898)) | ##### migrations | Commit | Type | Description | | -- | -- | -- | | [2796230e95](angular/angular@2796230) | fix | add `enum` in `mode` option in `standalone` schema ([#​48851](angular/angular#48851)) | | [816e76a578](angular/angular@816e76a) | fix | automatically prune root module after bootstrap step ([#​49030](angular/angular#49030)) | | [bdbf21d04b](angular/angular@bdbf21d) | fix | avoid generating imports with forward slashes ([#​48993](angular/angular#48993)) | | [32cf4e5cb9](angular/angular@32cf4e5) | fix | avoid internal modules when generating imports ([#​48958](angular/angular#48958)) | | [521ccfbe6c](angular/angular@521ccfb) | fix | avoid interrupting the migration if language service lookup fails ([#​49010](angular/angular#49010)) | | [a40cd47aa7](angular/angular@a40cd47) | fix | avoid modifying testing modules without declarations ([#​48921](angular/angular#48921)) | | [1afa6ed322](angular/angular@1afa6ed) | fix | don't add ModuleWithProviders to standalone test components ([#​48987](angular/angular#48987)) | | [c98c6a8452](angular/angular@c98c6a8) | fix | don't copy animations modules into the imports of test components ([#​49147](angular/angular#49147)) | | [8389557848](angular/angular@8389557) | fix | don't copy unmigrated declarations into imports array ([#​48882](angular/angular#48882)) | | [f82bdc4b01](angular/angular@f82bdc4) | fix | don't delete classes that may provide dependencies transitively ([#​48866](angular/angular#48866)) | | [759db12e0b](angular/angular@759db12) | fix | duplicated comments on migrated classes ([#​48966](angular/angular#48966)) | | [ba38178d19](angular/angular@ba38178) | fix | generate forwardRef for same file imports ([#​48898](angular/angular#48898)) | | [03fcb36cfd](angular/angular@03fcb36) | fix | migrate HttpClientModule to provideHttpClient() ([#​48949](angular/angular#48949)) | | [2de6dae16d](angular/angular@2de6dae) | fix | migrate RouterModule.forRoot with a config object to use features ([#​48935](angular/angular#48935)) | | [770191cf1f](angular/angular@770191c) | fix | migrate tests when switching to standalone bootstrap API ([#​48987](angular/angular#48987)) | | [c7926b5773](angular/angular@c7926b5) | fix | move standalone migrations into imports ([#​48987](angular/angular#48987)) | | [65c74ed93e](angular/angular@65c74ed) | fix | normalize paths to posix ([#​48850](angular/angular#48850)) | | [6377487b1a](angular/angular@6377487) | fix | only exclude bootstrapped declarations from initial standalone migration ([#​48987](angular/angular#48987)) | | [e9e4449a43](angular/angular@e9e4449) | fix | preserve tsconfig in standalone migration ([#​48987](angular/angular#48987)) | | [ffad1b49d9](angular/angular@ffad1b4) | fix | reduce number of files that need to be checked ([#​48987](angular/angular#48987)) | | [ba7a757cc5](angular/angular@ba7a757) | fix | return correct alias when conflicting import exists ([#​49139](angular/angular#49139)) | | [49a7c9f94a](angular/angular@49a7c9f) | fix | standalone migration incorrectly throwing path error for multi app projects ([#​48958](angular/angular#48958)) | | [584976e6c8](angular/angular@584976e) | fix | support --defaults in standalone migration ([#​48921](angular/angular#48921)) | | [03f47ac901](angular/angular@03f47ac) | fix | use consistent quotes in generated imports ([#​48876](angular/angular#48876)) | | [ebae506d89](angular/angular@ebae506) | fix | use import remapper in root component ([#​49046](angular/angular#49046)) | | [40c976c909](angular/angular@40c976c) | fix | use NgForOf instead of NgFor ([#​49022](angular/angular#49022)) | | [4ac25b2aff](angular/angular@4ac25b2) | perf | avoid re-traversing nodes when resolving bootstrap call dependencies ([#​49010](angular/angular#49010)) | | [26cb7ab2e6](angular/angular@26cb7ab) | perf | speed up language service lookups ([#​49010](angular/angular#49010)) | ##### platform-browser | Commit | Type | Description | | -- | -- | -- | | [bf4ad38117](angular/angular@bf4ad38) | fix | remove styles from DOM of destroyed components ([#​48298](angular/angular#48298)) | ##### platform-server | Commit | Type | Description | | -- | -- | -- | | [25e220a23a](angular/angular@25e220a) | fix | avoid duplicate TransferState info after renderApplication call ([#​49094](angular/angular#49094)) | ##### router | Commit | Type | Description | | -- | -- | -- | | [31b94c762f](angular/angular@31b94c7) | feat | Add a withNavigationErrorHandler feature to provideRouter ([#​48551](angular/angular#48551)) | | [dedac8d3f7](angular/angular@dedac8d) | feat | Add test helper for trigger navigations in tests ([#​48552](angular/angular#48552)) | #### Special Thanks Alan Agius, Alex Castle, Alex Rickabaugh, Andrew Kushnir, Andrew Scott, Dylan Hunn, Ikko Eltociear Ashimine, Ilyass, Jessica Janiuk, Joey Perrott, John Manners, Kalbarczyk, Kristiyan Kostadinov, Matthieu Riegler, Paul Gschwendtner, Pawel Kozlowski, Virginia Dooley, Walid Bouguima, cexbrayat and mgechev <!-- CHANGELOG SPLIT MARKER --> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xNDkuMCIsInVwZGF0ZWRJblZlciI6IjM0LjE1Mi4wIn0=--> Co-authored-by: cabr2-bot <cabr2.help@gmail.com> Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1793 Reviewed-by: Epsilon_02 <epsilon_02@noreply.codeberg.org> Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org> Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
|
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.
Fixes that the
ImportManagerwas returning thepropertyNameinstead of thenamewhen there's an import with a conflicting identifier.