Skip to content

Commit feddb8f

Browse files
MartynasStrazdasMartynasStrazdas
committed
Merge branch 'tree-widget/next' into mast/classifications-tree-rename-action
2 parents 0299271 + 99e6218 commit feddb8f

File tree

129 files changed

+9410
-7202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+9410
-7202
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ package-lock.json
2929
*.bak
3030
*.orig
3131
.node-xmlhttprequest-sync*
32-
32+
.DS_Store
3333
# e2e tests output
3434
/**/e2e-out
3535

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Each one has it's own folder and README describing the package.
1010

1111
### iTwin.js@^5 Compatible
1212

13-
| Name | Folder | Changelog | Version |
14-
| ------------------------- | --------------------------------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
15-
| @itwin/map-layers | [map-layers](./packages/itwin/map-layers/) | [changelog](./packages/itwin/map-layers/CHANGELOG.md) | [![npm version](https://badge.fury.io/js/%40itwin%2Fmap-layers.svg)](https://badge.fury.io/js/%40itwin%2Fmap-layers) |
13+
| Name | Folder | Changelog | Version |
14+
| ----------------- | ------------------------------------------ | ----------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- |
15+
| @itwin/map-layers | [map-layers](./packages/itwin/map-layers/) | [changelog](./packages/itwin/map-layers/CHANGELOG.md) | [![npm version](https://badge.fury.io/js/%40itwin%2Fmap-layers.svg)](https://badge.fury.io/js/%40itwin%2Fmap-layers) |
1616

1717
### iTwin.js@^4 Compatible
1818

@@ -38,11 +38,11 @@ Each one has it's own folder and README describing the package.
3838

3939
The following packages have been deprecated and will no longer be maintained:
4040

41-
| Name | Folder | Changelog | Version | Replacement |
42-
| ---------------------------------- | -------------------------------------------------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | ------ |
43-
| @bentley/imodel-select-react | [imodel-select](./packages/archive/imodel-select/) | [changelog](./packages/archive/imodel-select/CHANGELOG.md) | [![npm version](https://badge.fury.io/js/%40bentley%2Fimodel-select-react.svg)](https://badge.fury.io/js/%40bentley%2Fimodel-select-react) | [@itwin/imodel-browser-react](https://www.npmjs.com/package/@itwin/imodel-browser-react) |
44-
| @bentley/markup-frontstage-react | [markup-frontstage](./packages/archive/markup-frontstage/) | [changelog](./packages/archive/markup-frontstage/CHANGELOG.md) | [![npm version](https://badge.fury.io/js/%40bentley%2Fmarkup-frontstage-react.svg)](https://badge.fury.io/js/%40bentley%2Fmarkup-frontstage-react) | N/A |
45-
| @itwin/infrastructure-iot-react | [infrastructure-iot](./packages/archive/infrastructure-iot) | [changelog](./packages/archive/infrastructure-iot/CHANGELOG.md) | [![npm version](https://badge.fury.io/js/%40itwin%2Finfrastructure-iot-react.svg)](https://badge.fury.io/js/%40itwin%2Finfrastructure-iot-react) | N/A |
41+
| Name | Folder | Changelog | Version | Replacement |
42+
| -------------------------------- | ----------------------------------------------------------- | --------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
43+
| @bentley/imodel-select-react | [imodel-select](./packages/archive/imodel-select/) | [changelog](./packages/archive/imodel-select/CHANGELOG.md) | [![npm version](https://badge.fury.io/js/%40bentley%2Fimodel-select-react.svg)](https://badge.fury.io/js/%40bentley%2Fimodel-select-react) | [@itwin/imodel-browser-react](https://www.npmjs.com/package/@itwin/imodel-browser-react) |
44+
| @bentley/markup-frontstage-react | [markup-frontstage](./packages/archive/markup-frontstage/) | [changelog](./packages/archive/markup-frontstage/CHANGELOG.md) | [![npm version](https://badge.fury.io/js/%40bentley%2Fmarkup-frontstage-react.svg)](https://badge.fury.io/js/%40bentley%2Fmarkup-frontstage-react) | N/A |
45+
| @itwin/infrastructure-iot-react | [infrastructure-iot](./packages/archive/infrastructure-iot) | [changelog](./packages/archive/infrastructure-iot/CHANGELOG.md) | [![npm version](https://badge.fury.io/js/%40itwin%2Finfrastructure-iot-react.svg)](https://badge.fury.io/js/%40itwin%2Finfrastructure-iot-react) | N/A |
4646

4747
## Adding a new "project"
4848

‎apps/learning-snippets/package.json

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,32 @@
1717
"dependencies": {
1818
"@itwin/tree-widget-react": "workspace:*",
1919
"@itwin/property-grid-react": "workspace:*",
20-
"@itwin/itwinui-icons": "5.0.0-alpha.7",
21-
"@itwin/itwinui-react": "3.17.2",
22-
"@itwin/appui-abstract": "^4.10.2",
23-
"@itwin/appui-react": "^5.0.5",
24-
"@itwin/build-tools": "^4.10.2",
25-
"@itwin/components-react": "^5.0.5",
26-
"@itwin/core-backend": "^4.10.2",
27-
"@itwin/core-bentley": "^4.10.2",
28-
"@itwin/core-common": "^4.10.2",
29-
"@itwin/core-frontend": "^4.10.2",
30-
"@itwin/core-geometry": "^4.10.2",
31-
"@itwin/core-orbitgt": "^4.10.2",
32-
"@itwin/core-quantity": "^4.10.2",
33-
"@itwin/core-react": "^5.0.5",
34-
"@itwin/core-telemetry": "^4.10.2",
35-
"@itwin/ecschema-metadata": "^4.10.2",
36-
"@itwin/ecschema-rpcinterface-common": "^4.10.2",
37-
"@itwin/ecschema-rpcinterface-impl": "^4.10.2",
20+
"@itwin/itwinui-react": "^3.16.5",
21+
"@itwin/appui-abstract": "^5.0.0",
22+
"@itwin/appui-react": "^5.10.0",
23+
"@itwin/build-tools": "^5.0.0",
24+
"@itwin/components-react": "^5.10.0",
25+
"@itwin/core-backend": "^5.0.0",
26+
"@itwin/core-bentley": "^5.0.0",
27+
"@itwin/core-common": "^5.0.0",
28+
"@itwin/core-frontend": "^5.0.0",
29+
"@itwin/core-geometry": "^5.0.0",
30+
"@itwin/core-orbitgt": "^5.0.0",
31+
"@itwin/core-quantity": "^5.0.0",
32+
"@itwin/core-react": "^5.10.0",
33+
"@itwin/ecschema-metadata": "^5.0.0",
34+
"@itwin/ecschema-rpcinterface-common": "^5.0.0",
35+
"@itwin/ecschema-rpcinterface-impl": "^5.0.0",
3836
"@itwin/eslint-plugin": "^4.1.1",
39-
"@itwin/imodel-components-react": "^5.0.5",
40-
"@itwin/presentation-backend": "^4.10.2",
41-
"@itwin/presentation-common": "^4.10.2",
42-
"@itwin/presentation-components": "^5.11.0",
43-
"@itwin/presentation-frontend": "^4.10.2",
44-
"@itwin/presentation-testing": "^5.3.1",
45-
"@itwin/presentation-hierarchies": "^1.4.1",
46-
"@itwin/presentation-shared": "^1.2.0",
47-
"@itwin/unified-selection": "^1.3.0",
37+
"@itwin/imodel-components-react": "^5.10.0",
38+
"@itwin/presentation-backend": "^5.0.0",
39+
"@itwin/presentation-common": "^5.0.0",
40+
"@itwin/presentation-components": "^5.12.4",
41+
"@itwin/presentation-frontend": "^5.0.0",
42+
"@itwin/presentation-testing": "^5.4.5",
43+
"@itwin/presentation-hierarchies": "^1.5.1",
44+
"@itwin/presentation-shared": "^1.2.2",
45+
"@itwin/unified-selection": "^1.4.2",
4846
"@testing-library/dom": "^10.4.0",
4947
"@testing-library/react": "^16.2.0",
5048
"@testing-library/user-event": "^14.6.0",

0 commit comments

Comments
 (0)