Closed mergify[bot] closed 1 week ago
Cherry-pick of 66f79b7cb3f8e8a55b5f600fe0b11c6c7c795ef5 has failed:
On branch mergify/bp/release/5.0.x/pr-1115
Your branch is up to date with 'origin/release/5.0.x'.
You are currently cherry-picking commit 66f79b7cb.
(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:
modified: apps/test-app/package.json
modified: apps/test-providers/package.json
new file: common/changes/@itwin/appui-react/itwinui-peer_2024-11-13-14-05.json
new file: common/changes/@itwin/components-react/itwinui-peer_2024-11-13-14-05.json
new file: common/changes/@itwin/core-react/itwinui-peer_2024-11-13-14-05.json
new file: common/changes/@itwin/imodel-components-react/itwinui-peer_2024-11-13-14-05.json
modified: common/config/rush/browser-approved-packages.json
modified: docs/storybook/package.json
modified: e2e-tests/tests/accudraw/accudraw-dialog.test.ts-snapshots/accudraw-dialog-test-1-chromium-linux.png
modified: e2e-tests/tests/accudraw/accudraw-widget.test.ts-snapshots/accudraw-widget-test-1-chromium-linux.png
modified: e2e-tests/tests/accudraw/calculator.test.ts-snapshots/calculator-test-1-chromium-linux.png
modified: e2e-tests/tests/configurableui/configurable-ui.test.ts-snapshots/configurable-ui-test-1-chromium-linux.png
modified: e2e-tests/tests/editors/editors.test.ts-snapshots/Editor-Primitive-number-numeric-input-UiAbstract-InputEditorSize-UiAbstract-Range-default-visual-1-chromium-linux.png
modified: e2e-tests/tests/editors/editors.test.ts-snapshots/Editor-Primitive-number-numeric-input-UiAbstract-InputEditorSize-default-visual-1-chromium-linux.png
modified: e2e-tests/tests/editors/editors.test.ts-snapshots/Editor-Primitive-number-numeric-input-UiAbstract-Range-default-visual-1-chromium-linux.png
modified: e2e-tests/tests/editors/editors.test.ts-snapshots/Editor-Primitive-number-numeric-input-default-visual-1-chromium-linux.png
modified: e2e-tests/tests/popup/keyin-palette-panel.test.ts-snapshots/keyin-palette-panel-test-1-chromium-linux.png
modified: package.json
modified: ui/appui-react/src/test/statusfields/toolassistance/ToolAssistanceField.test.tsx
modified: ui/components-react/src/test/filter-builder/FilterBuilder.test.tsx
modified: ui/components-react/src/test/filter-builder/FilterBuilderRule.test.tsx
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: common/config/rush/pnpm-lock.yaml
both modified: ui/appui-react/package.json
both modified: ui/components-react/package.json
both modified: ui/core-react/package.json
both modified: ui/imodel-components-react/package.json
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
Changes
This PR moves
@itwin/itwinui-react
to peerDependencies to simplify the process of ensuring that a single version of iTwinUI package is installed per major version. Will be backported torelease/5.0.x
branch whereNextVersion.md
will be updated to mention this change.Testing
N/A
This is an automatic backport of pull request #1115 done by Mergify.