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 @itwin/core-geometry from @itwin/components-react (backport #1147) #1149

Merged
merged 2 commits into from
Dec 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 10, 2024

Changes

Inlined single usage of @itwin/core-geometry in @itwin/components-react to avoid having it as a peer dependency.

Testing

N/A


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

* Add missing peer deps

* change

* Remove  from  only types from it are used.

* Inline clamp

* change

(cherry picked from commit 687abfc)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
Copy link
Contributor Author

mergify bot commented Dec 10, 2024

Cherry-pick of 687abfc has failed:

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

You are currently cherry-picking commit 687abfc6d.
  (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/components-react/add-missing-peer_2024-12-09-19-16.json
	modified:   ui/components-react/package.json
	modified:   ui/components-react/src/components-react/propertygrid/component/ColumnResizingPropertyListPropsSupplier.tsx

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml

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

@mergify mergify bot requested a review from a team as a code owner December 10, 2024 14:21
@mergify mergify bot added the conflicts label Dec 10, 2024
@mergify mergify bot requested a review from a team as a code owner December 10, 2024 14:21
@GerardasB GerardasB self-assigned this Dec 10, 2024
@GerardasB GerardasB enabled auto-merge (squash) December 11, 2024 11:08
@mergify mergify bot requested a review from a team December 11, 2024 11:09
@GerardasB GerardasB merged commit 330b528 into release/5.0.x Dec 11, 2024
17 checks passed
@GerardasB GerardasB deleted the mergify/bp/release/5.0.x/pr-1147 branch December 11, 2024 11:26
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.

2 participants