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

Remove @bentley/icons-generic from AppUI packages (backport #1153) #1155

Merged
merged 2 commits into from
Dec 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

Changes

This PR resolves #798 by removing dependency on deprecated @bentley/icons-generic package.

Testing

N/A


This is an automatic backport of pull request #1153 done by [Mergify](https://mergify.com).

* Remove unused icons-generic dependency

* Avoid icons-generic usage in SnapMode field.

* Remove icons-generic from appui-react

* rush change

* Remove leftover getIconNode

* Remove failing tests that test the DOM structure.

* Fix endIcon styling.

(cherry picked from commit 594690c)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	ui/appui-react/src/appui-react/statusfields/SnapMode.tsx
@mergify mergify bot requested a review from a team as a code owner December 12, 2024 16:45
@mergify mergify bot added the conflicts label Dec 12, 2024
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of 594690c has failed:

On branch mergify/bp/release/5.0.x/pr-1153
Your branch is up to date with 'origin/release/5.0.x'.

You are currently cherry-picking commit 594690caa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   common/changes/@itwin/appui-react/remove-icons-generic_2024-12-11-15-42.json
	new file:   common/changes/@itwin/core-react/remove-icons-generic_2024-12-11-15-42.json
	new file:   common/changes/@itwin/imodel-components-react/remove-icons-generic_2024-12-11-15-42.json
	modified:   ui/appui-react/package.json
	new file:   ui/appui-react/src/appui-react/icons/snaps/SvgSnaps.tsx
	new file:   ui/appui-react/src/appui-react/icons/snaps/SvgSnapsBisector.tsx
	new file:   ui/appui-react/src/appui-react/icons/snaps/SvgSnapsCenter.tsx
	new file:   ui/appui-react/src/appui-react/icons/snaps/SvgSnapsIntersection.tsx
	new file:   ui/appui-react/src/appui-react/icons/snaps/SvgSnapsMidpoint.tsx
	new file:   ui/appui-react/src/appui-react/icons/snaps/SvgSnapsNearest.tsx
	new file:   ui/appui-react/src/appui-react/icons/snaps/SvgSnapsOrigin.tsx
	modified:   ui/appui-react/src/appui-react/layout/footer/snap-mode/Snap.scss
	modified:   ui/appui-react/src/appui-react/layout/footer/snap-mode/Snap.tsx
	modified:   ui/appui-react/src/test/layout/footer/snap-mode/Snap.test.tsx
	modified:   ui/appui-react/src/test/statusfields/SnapMode.test.tsx
	modified:   ui/core-react/package.json
	modified:   ui/imodel-components-react/package.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml
	both modified:   ui/appui-react/src/appui-react/statusfields/SnapMode.tsx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@GerardasB GerardasB enabled auto-merge (squash) December 12, 2024 17:12
@mergify mergify bot requested a review from a team December 12, 2024 17:13
@GerardasB GerardasB merged commit 282c149 into release/5.0.x Dec 12, 2024
16 of 17 checks passed
@GerardasB GerardasB deleted the mergify/bp/release/5.0.x/pr-1153 branch December 12, 2024 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant