Skip to content

Conversation

@crisbeto
Copy link
Member

@crisbeto crisbeto commented Jan 2, 2023

Fixes that imports weren't being combined in the ImportManager when multiple new imports are added for the same file. This wasn't a problem for previous schematics that used the manager, but it'll come up in some of the new ones.

@crisbeto crisbeto added action: review The PR is still awaiting reviews from at least one requested reviewer target: patch This PR is targeted for the next patch release area: migrations Issues related to `ng update`/`ng generate` migrations labels Jan 2, 2023
@crisbeto crisbeto requested a review from devversion January 2, 2023 08:14
@ngbot ngbot bot added this to the Backlog milestone Jan 2, 2023
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! Hopefully the import manager can soon be shared across all of our schematics/migrations

@crisbeto crisbeto added action: merge The PR is ready for merge by the caretaker target: minor This PR is targeted for the next minor release and removed action: review The PR is still awaiting reviews from at least one requested reviewer target: patch This PR is targeted for the next patch release labels Jan 2, 2023
Fixes that imports weren't being combined in the `ImportManager` when multiple new imports are added for the same file. This wasn't a problem for previous schematics that used the manager, but it'll come up in some of the new ones.

Also moves the logic for writing new imports into `recordChanges`, instead of `addImportToSourceFile`.
@crisbeto crisbeto force-pushed the import-manager-fix branch from f024ce4 to 912a6c8 Compare January 2, 2023 11:34
@devversion
Copy link
Member

This PR was merged into the repository by commit cc284af.

@devversion devversion closed this in cc284af Jan 2, 2023
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Jan 12, 2023
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [@angular/animations](https://github.com/angular/angular) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fanimations/15.0.4/15.1.0) |
| [@angular/common](https://github.com/angular/angular) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fcommon/15.0.4/15.1.0) |
| [@angular/compiler](https://github.com/angular/angular) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fcompiler/15.0.4/15.1.0) |
| [@angular/compiler-cli](https://github.com/angular/angular/tree/main/packages/compiler-cli) ([source](https://github.com/angular/angular)) | devDependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fcompiler-cli/15.0.4/15.1.0) |
| [@angular/core](https://github.com/angular/angular) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fcore/15.0.4/15.1.0) |
| [@angular/forms](https://github.com/angular/angular) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fforms/15.0.4/15.1.0) |
| [@angular/platform-browser](https://github.com/angular/angular) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fplatform-browser/15.0.4/15.1.0) |
| [@angular/platform-browser-dynamic](https://github.com/angular/angular) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fplatform-browser-dynamic/15.0.4/15.1.0) |

---

### Release Notes

<details>
<summary>angular/angular</summary>

### [`v15.1.0`](https://github.com/angular/angular/blob/HEAD/CHANGELOG.md#&#8203;1510-2023-01-10)

[Compare Source](angular/angular@15.0.4...15.1.0)

#### Deprecations

##### router

-   CanLoad guards in the Router are deprecated. Use CanMatch
    instead.
-   router writable properties

    The following strategies are meant to be configured by registering the
    application strategy in DI via the `providers` in the root `NgModule` or
    `bootstrapApplication`:

    -   `routeReuseStrategy`
    -   `titleStrategy`
    -   `urlHandlingStrategy`

    The following options are meant to be configured using the options
    available in `RouterModule.forRoot` or `provideRouter`.

    -   `onSameUrlNavigation`
    -   `paramsInheritanceStrategy`
    -   `urlUpdateStrategy`
    -   `canceledNavigationResolution`

    The following options are available in `RouterModule.forRoot` but not
    available in `provideRouter`:

    -   `malformedUriErrorHandler` - This was found to not be used anywhere
        internally.
    -   `errorHandler` - Developers can instead subscribe to `Router.events`
        and filter for `NavigationError`.

##### common

| Commit | Type | Description |
| -- | -- | -- |
| [fe50813664](angular/angular@fe50813) | feat | Add BrowserPlatformLocation to the public API ([#&#8203;48488](angular/angular#48488)) |
| [2f4f0638c7](angular/angular@2f4f063) | fix | Add data attribtue to NgOptimizedImage ([#&#8203;48497](angular/angular#48497)) |

##### compiler

| Commit | Type | Description |
| -- | -- | -- |
| [a532d71975](angular/angular@a532d71) | feat | allow self-closing tags on custom elements ([#&#8203;48535](angular/angular#48535)) |
| [caf7228f8a](angular/angular@caf7228) | fix | resolve deprecation warning ([#&#8203;48652](angular/angular#48652)) |
| [33f35b04ef](angular/angular@33f35b0) | fix | type-only symbols incorrectly retained when downlevelling custom decorators ([#&#8203;48638](angular/angular#48638)) |

##### compiler-cli

| Commit | Type | Description |
| -- | -- | -- |
| [caedef0f5b](angular/angular@caedef0) | fix | update `@babel/core` dependency and lock version ([#&#8203;48634](angular/angular#48634)) |

##### core

| Commit | Type | Description |
| -- | -- | -- |
| [6acae1477a](angular/angular@6acae14) | feat | Add `TestBed.runInInjectionContext` to help test functions which use `inject` ([#&#8203;47955](angular/angular#47955)) |
| [38421578a2](angular/angular@3842157) | feat | Make the `isStandalone()` function available in public API ([#&#8203;48114](angular/angular#48114)) |
| [dd42974b07](angular/angular@dd42974) | feat | support TypeScript 4.9 ([#&#8203;48005](angular/angular#48005)) |

##### forms

| Commit | Type | Description |
| -- | -- | -- |
| [8aa8b4b77c](angular/angular@8aa8b4b) | fix | Form provider FormsModule.withConfig return a FormsModule ([#&#8203;48526](angular/angular#48526)) |

##### language-service

| Commit | Type | Description |
| -- | -- | -- |
| [5f0b53c735](angular/angular@5f0b53c) | feat | Allow auto-imports to suggest multiple possible imports. ([#&#8203;47787](angular/angular#47787)) |
| [6a8ea29a04](angular/angular@6a8ea29) | fix | expose `package.json` for vscode extension resolution ([#&#8203;48678](angular/angular#48678)) |
| [ce8160ecb2](angular/angular@ce8160e) | fix | Prevent crashes on unemitable references ([#&#8203;47938](angular/angular#47938)) |
| [e615b598ba](angular/angular@e615b59) | fix | ship `/api` entry-point ([#&#8203;48670](angular/angular#48670)) |
| [6ce7d76a0e](angular/angular@6ce7d76) | fix | update packages/language-service/build.sh script to work with vscode-ng-language-service's new Bazel build ([#&#8203;48663](angular/angular#48663)) |

##### localize

| Commit | Type | Description |
| -- | -- | -- |
| [a1a8e91eca](angular/angular@a1a8e91) | fix | add triple slash type reference on `@angular/localize` on \`ng  add ([#&#8203;48502](angular/angular#48502)) |

##### migrations

| Commit | Type | Description |
| -- | -- | -- |
| [cc284afbbc](angular/angular@cc284af) | fix | combine newly-added imports in import manager ([#&#8203;48620](angular/angular#48620)) |

##### router

| Commit | Type | Description |
| -- | -- | -- |
| [228e992db7](angular/angular@228e992) | docs | Deprecate canLoad guards in favor of canMatch ([#&#8203;48180](angular/angular#48180)) |
| [0a8b8a66cd](angular/angular@0a8b8a6) | docs | Deprecate public members of Router that are meant to be configured elsewhere ([#&#8203;48006](angular/angular#48006)) |
| [332461bd0c](angular/angular@332461b) | feat | Add ability to override `onSameUrlNavigation` default per-navigation ([#&#8203;48050](angular/angular#48050)) |
| [f58ad86e51](angular/angular@f58ad86) | feat | Add feature provider for enabling hash navigation ([#&#8203;48301](angular/angular#48301)) |
| [73f03ad2d2](angular/angular@73f03ad) | feat | Add new NavigationSkipped event for ignored navigations ([#&#8203;48024](angular/angular#48024)) |
| [3fe75710d9](angular/angular@3fe7571) | fix | page refresh should not destroy history state ([#&#8203;48540](angular/angular#48540)) |

#### Special Thanks

Alan Agius, Alex Castle, Alex Rickabaugh, Andrew Kushnir, Andrew Scott, Bob Watson, Charles Lyding, Derek Cormier, Doug Parker, Dylan Hunn, George Kalpakas, Greg Magolan, Jessica Janiuk, JiaLiPassion, Joey Perrott, Kristiyan Kostadinov, Matthieu Riegler, Paul Gschwendtner, Pawel Kozlowski, Renan Ferro, Tim Gates, Vadim, Virginia Dooley, ced, mgechev, piyush132000, robertIsaac and sr5434

<!-- 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:eyJjcmVhdGVkSW5WZXIiOiIzNC45Ny41IiwidXBkYXRlZEluVmVyIjoiMzQuOTkuMiJ9-->

Co-authored-by: cabr2-bot <[email protected]>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1719
Reviewed-by: Epsilon_02 <[email protected]>
Co-authored-by: Calciumdibromid Bot <[email protected]>
Co-committed-by: Calciumdibromid Bot <[email protected]>
trekladyone pushed a commit to trekladyone/angular that referenced this pull request Feb 1, 2023
…ar#48620)

Fixes that imports weren't being combined in the `ImportManager` when multiple new imports are added for the same file. This wasn't a problem for previous schematics that used the manager, but it'll come up in some of the new ones.

Also moves the logic for writing new imports into `recordChanges`, instead of `addImportToSourceFile`.

PR Close angular#48620
@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 Feb 2, 2023
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 area: migrations Issues related to `ng update`/`ng generate` migrations target: minor This PR is targeted for the next minor release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants