Skip to content

Commit 4731d0f

Browse files
aruniversearuniverse
committed
point to core 5.0 rc, and update other deps
1 parent 9b4bc1f commit 4731d0f

15 files changed

Lines changed: 2494 additions & 1768 deletions

File tree

‎common/config/rush/pnpm-lock.yaml‎

Lines changed: 2253 additions & 1544 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/apps/desktop-viewer-test/package.json‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,47 +32,48 @@
3232
],
3333
"dependencies": {
3434
"@bentley/icons-generic-webfont": "^1.0.34",
35-
"@itwin/appui-abstract": "^4.7.3",
36-
"@itwin/appui-react": "^4.3.0",
35+
"@itwin/appui-abstract": "rc",
36+
"@itwin/appui-react": "^5.4.0",
3737
"@itwin/unified-selection": "^1.1.1",
38-
"@itwin/components-react": "^4.3.0",
39-
"@itwin/core-backend": "^4.7.3",
40-
"@itwin/core-bentley": "^4.7.3",
41-
"@itwin/core-common": "^4.7.3",
42-
"@itwin/core-electron": "^4.7.3",
43-
"@itwin/core-frontend": "^4.7.3",
44-
"@itwin/core-geometry": "^4.7.3",
45-
"@itwin/core-i18n": "^4.7.3",
46-
"@itwin/core-markup": "^4.7.3",
47-
"@itwin/core-orbitgt": "^4.7.3",
48-
"@itwin/core-quantity": "^4.7.3",
49-
"@itwin/core-react": "^4.3.0",
50-
"@itwin/core-telemetry": "^4.7.3",
38+
"@itwin/components-react": "^5.4.0",
39+
"@itwin/core-backend": "rc",
40+
"@itwin/core-bentley": "rc",
41+
"@itwin/core-common": "rc",
42+
"@itwin/core-electron": "rc",
43+
"@itwin/core-frontend": "rc",
44+
"@itwin/core-geometry": "rc",
45+
"@itwin/core-i18n": "rc",
46+
"@itwin/core-markup": "rc",
47+
"@itwin/core-orbitgt": "rc",
48+
"@itwin/core-quantity": "rc",
49+
"@itwin/core-react": "^5.4.0",
50+
"@itwin/core-telemetry": "rc",
5151
"@itwin/desktop-viewer-react": "workspace:*",
52-
"@itwin/ecschema-metadata": "^4.7.3",
53-
"@itwin/ecschema-rpcinterface-common": "^4.7.3",
54-
"@itwin/ecschema-rpcinterface-impl": "^4.7.3",
52+
"@itwin/ecschema-metadata": "rc",
53+
"@itwin/ecschema-rpcinterface-common": "rc",
54+
"@itwin/ecschema-rpcinterface-impl": "rc",
5555
"@itwin/electron-authorization": "^0.15.0",
56-
"@itwin/express-server": "^4.7.3",
56+
"@itwin/express-server": "rc",
5757
"@itwin/imodel-browser-react": "^1.0.0",
58-
"@itwin/imodel-components-react": "^4.3.0",
59-
"@itwin/imodels-access-backend": "^5.2.1",
60-
"@itwin/imodels-access-frontend": "^5.2.1",
58+
"@itwin/imodel-components-react": "^5.4.0",
59+
"@itwin/imodels-access-backend": "6.0.0-dev.1",
60+
"@itwin/imodels-access-frontend": "6.0.0-dev.1",
6161
"@itwin/itwinui-css": "^1.12.0",
6262
"@itwin/itwinui-icons-react": "^2.4.0",
6363
"@itwin/itwinui-illustrations-react": "^2.0.1",
6464
"@itwin/itwinui-layouts-css": "^0.2.0",
6565
"@itwin/itwinui-layouts-react": "^0.2.0",
66-
"@itwin/itwinui-react": "^3.16.0",
66+
"@itwin/itwinui-react": "^3.18.0",
6767
"@itwin/itwinui-variables": "^2.0.0",
6868
"@itwin/measure-tools-react": "^0.23.2",
69-
"@itwin/presentation-backend": "^4.7.3",
70-
"@itwin/presentation-common": "^4.7.3",
71-
"@itwin/presentation-components": "^5.0.0",
72-
"@itwin/presentation-frontend": "^4.7.3",
69+
"@itwin/presentation-backend": "rc",
70+
"@itwin/presentation-common": "rc",
71+
"@itwin/presentation-components": "^5.12.0",
72+
"@itwin/presentation-frontend": "rc",
7373
"@itwin/property-grid-react": "^1.0.0",
7474
"@itwin/tree-widget-react": "^3.0.0",
75-
"@itwin/webgl-compatibility": "^4.7.3",
75+
"@itwin/webgl-compatibility": "rc",
76+
"@itwin/unified-selection-react": "^1.0.0",
7677
"dotenv-flow": "^3.2.0",
7778
"electron": "^24.8.5",
7879
"minimist": "^1.2.8",
@@ -88,7 +89,7 @@
8889
"@itwin/build-tools": "^4.0.6",
8990
"@types/electron-devtools-installer": "^2.2.2",
9091
"@types/minimist": "^1.2.2",
91-
"@types/node": "^18.17.1",
92+
"@types/node": "^20",
9293
"@types/react": "^18.2.18",
9394
"@types/react-dom": "^18.2.7",
9495
"cpx2": "4.2.0",

‎packages/apps/web-viewer-test/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ IMJS_AUTH_CLIENT_IMODEL_ID2_PROD="435e704b-ae19-418c-a02e-fc75686e213c"
2222
IMJS_AUTH_CLIENT_CLIENT_ID=""
2323
IMJS_AUTH_CLIENT_REDIRECT_URI="http://localhost:3000/signin-callback"
2424
IMJS_AUTH_CLIENT_LOGOUT_URI="http://localhost:3000/logout"
25-
IMJS_AUTH_CLIENT_SCOPES ="imodelaccess:read imodels:read realitydata:read"
25+
IMJS_AUTH_CLIENT_SCOPES ="itwin-platform"
2626

2727
IMJS_ITWIN_STACK_ITWIN_ID="678a34a5-3ed1-412c-a9ba-086dee14d6c2"
2828
IMJS_ITWIN_STACK_IMODEL_ID="4dcff98f-8570-497e-b7ce-8df981b5b8c7"

‎packages/apps/web-viewer-test/package.json‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,37 @@
44
"private": true,
55
"dependencies": {
66
"@bentley/icons-generic": "^1.0.34",
7-
"@itwin/appui-abstract": "^4.7.3",
8-
"@itwin/appui-react": "^5.0.0",
7+
"@itwin/appui-abstract": "rc",
8+
"@itwin/appui-react": "^5.4.0",
99
"@itwin/unified-selection": "^1.1.1",
1010
"@itwin/browser-authorization": "^1.0.1",
11-
"@itwin/components-react": "^5.0.0",
12-
"@itwin/core-bentley": "^4.7.3",
13-
"@itwin/core-common": "^4.7.3",
14-
"@itwin/core-frontend": "^4.7.3",
15-
"@itwin/core-geometry": "^4.7.3",
16-
"@itwin/core-i18n": "^4.7.3",
17-
"@itwin/core-markup": "^4.7.3",
18-
"@itwin/core-orbitgt": "^4.7.3",
19-
"@itwin/core-quantity": "^4.7.3",
20-
"@itwin/core-react": "^5.0.0",
21-
"@itwin/core-telemetry": "^4.7.3",
22-
"@itwin/ecschema-metadata": "^4.7.3",
23-
"@itwin/ecschema-rpcinterface-common": "^4.7.3",
24-
"@itwin/frontend-devtools": "^4.7.3",
25-
"@itwin/imodel-components-react": "^5.0.0",
26-
"@itwin/imodels-access-frontend": "^5.2.1",
27-
"@itwin/itwinui-react": "^3.16.0",
28-
"@itwin/measure-tools-react": "^0.23.2",
29-
"@itwin/presentation-common": "^4.7.3",
30-
"@itwin/presentation-components": "^5.0.0",
31-
"@itwin/presentation-frontend": "^4.7.3",
32-
"@itwin/property-grid-react": "^1.0.0",
11+
"@itwin/components-react": "^5.4.0",
12+
"@itwin/core-bentley": "rc",
13+
"@itwin/core-common": "rc",
14+
"@itwin/core-frontend": "rc",
15+
"@itwin/core-geometry": "rc",
16+
"@itwin/core-i18n": "rc",
17+
"@itwin/core-markup": "rc",
18+
"@itwin/core-orbitgt": "rc",
19+
"@itwin/core-quantity": "rc",
20+
"@itwin/core-react": "^5.4.0",
21+
"@itwin/core-telemetry": "rc",
22+
"@itwin/ecschema-metadata": "rc",
23+
"@itwin/ecschema-rpcinterface-common": "rc",
24+
"@itwin/frontend-devtools": "rc",
25+
"@itwin/imodel-components-react": "^5.4.0",
26+
"@itwin/imodels-access-frontend": "6.0.0-dev.1",
27+
"@itwin/itwinui-react": "^3.18.0",
28+
"@itwin/measure-tools-react": "latest",
29+
"@itwin/presentation-common": "rc",
30+
"@itwin/presentation-components": "^5.12.0",
31+
"@itwin/presentation-frontend": "rc",
32+
"@itwin/property-grid-react": "latest",
3333
"@itwin/reality-data-client": "^1.1.0",
34-
"@itwin/tree-widget-react": "^3.0.0",
34+
"@itwin/tree-widget-react": "latest",
3535
"@itwin/web-viewer-react": "workspace:*",
36-
"@itwin/webgl-compatibility": "^4.7.3",
36+
"@itwin/webgl-compatibility": "rc",
37+
"@itwin/unified-selection-react": "^1.0.0",
3738
"@remix-run/router": "^1.7.2",
3839
"history": "^5.3.0",
3940
"react": "^18.2.0",
@@ -45,7 +46,7 @@
4546
},
4647
"devDependencies": {
4748
"@bentley/react-scripts": "^5.0.4",
48-
"@types/node": "^18.17.1",
49+
"@types/node": "^20",
4950
"@types/react": "^18.2.18",
5051
"@types/react-dom": "^18.2.7",
5152
"typescript": "~5.0.4"

‎packages/apps/web-viewer-test/src/components/home/ViewerHome.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ const ViewerHome: React.FC = () => {
133133
iTwinId={iTwinId ?? ""}
134134
iModelId={iModelId ?? ""}
135135
changeSetId={changesetId}
136-
theme={ColorTheme.Dark}
137136
loadingComponent={<Loader />}
138137
mapLayerOptions={{
139138
BingMaps: {

‎packages/apps/web-viewer-test/src/decorators/GeometryDecorator.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export class GeometryDecorator implements Decorator {
164164
const builder = context.createGraphicBuilder(
165165
GraphicType.Scene,
166166
undefined,
167-
context.viewport.iModel.transientIds.next
167+
context.viewport.iModel.transientIds.getNext()
168168
);
169169
// builder.wantNormals = true;
170170
this.points.forEach((styledPoint) => {

‎packages/modules/desktop-viewer-react/package.json‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,34 @@
2929
"@itwin/viewer-react": "workspace:*"
3030
},
3131
"devDependencies": {
32-
"@itwin/appui-abstract": "^4.7.3",
33-
"@itwin/appui-react": "^5.0.0",
34-
"@itwin/build-tools": "^4.7.3",
35-
"@itwin/components-react": "^5.0.0",
36-
"@itwin/core-backend": "^4.7.3",
37-
"@itwin/core-bentley": "^4.7.3",
38-
"@itwin/core-common": "^4.7.3",
39-
"@itwin/core-electron": "^4.7.3",
40-
"@itwin/core-frontend": "^4.7.3",
41-
"@itwin/core-geometry": "^4.7.3",
42-
"@itwin/core-markup": "^4.7.3",
43-
"@itwin/core-orbitgt": "^4.7.3",
44-
"@itwin/core-quantity": "^4.7.3",
45-
"@itwin/core-react": "^5.0.0",
46-
"@itwin/core-telemetry": "^4.7.3",
47-
"@itwin/ecschema-metadata": "^4.7.3",
32+
"@itwin/appui-abstract": "rc",
33+
"@itwin/appui-react": "^5.4.0",
34+
"@itwin/build-tools": "rc",
35+
"@itwin/components-react": "^5.4.0",
36+
"@itwin/core-backend": "rc",
37+
"@itwin/core-bentley": "rc",
38+
"@itwin/core-common": "rc",
39+
"@itwin/core-electron": "rc",
40+
"@itwin/core-frontend": "rc",
41+
"@itwin/core-geometry": "rc",
42+
"@itwin/core-markup": "rc",
43+
"@itwin/core-orbitgt": "rc",
44+
"@itwin/core-quantity": "rc",
45+
"@itwin/core-react": "^5.4.0",
46+
"@itwin/ecschema-metadata": "rc",
47+
"@itwin/ecschema-rpcinterface-common": "rc",
4848
"@itwin/electron-authorization": "^0.15.0",
49-
"@itwin/imodel-components-react": "^5.0.0",
50-
"@itwin/presentation-common": "^4.7.3",
51-
"@itwin/presentation-components": "^5.0.0",
52-
"@itwin/presentation-frontend": "^4.7.3",
53-
"@itwin/webgl-compatibility": "^4.7.3",
49+
"@itwin/imodel-components-react": "^5.4.0",
50+
"@itwin/presentation-common": "rc",
51+
"@itwin/presentation-components": "^5.12.0",
52+
"@itwin/presentation-frontend": "rc",
53+
"@itwin/webgl-compatibility": "rc",
54+
"@itwin/unified-selection-react": "^1.0.0",
5455
"@testing-library/jest-dom": "^4.2.4",
5556
"@testing-library/react": "^14.0.0",
5657
"@testing-library/user-event": "^7.1.2",
5758
"@types/jest": "^26.0.4",
58-
"@types/node": "^18.12.0",
59+
"@types/node": "^20",
5960
"@types/react": "^18.2.9",
6061
"@types/react-dom": "^18.2.4",
6162
"@types/react-redux": "^7.1.9",
@@ -71,14 +72,14 @@
7172
"redux": "^4.0.5",
7273
"rimraf": "^3.0.2",
7374
"ts-jest": "^29.1.0",
74-
"typescript": "~5.0.2"
75+
"typescript": "~5.6.2"
7576
},
7677
"peerDependencies": {
77-
"@itwin/core-bentley": "^4.0.0",
78-
"@itwin/core-common": "^4.0.0",
79-
"@itwin/core-electron": "^4.0.0",
80-
"@itwin/core-frontend": "^4.0.0",
81-
"@itwin/ecschema-metadata": "^4.0.0",
78+
"@itwin/core-bentley": "rc",
79+
"@itwin/core-common": "rc",
80+
"@itwin/core-electron": "rc",
81+
"@itwin/core-frontend": "rc",
82+
"@itwin/ecschema-metadata": "rc",
8283
"@itwin/electron-authorization": "^0.13.0 || ^0.14.0 || ^0.15.0",
8384
"electron": "^24.0.0",
8485
"react": "^18.0.0",

‎packages/modules/test-local-extension/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
"devDependencies": {
1616
"@esbuild-plugins/node-modules-polyfill": "~0.1.2",
1717
"@esbuild-plugins/node-globals-polyfill": "~0.1.1",
18-
"@itwin/appui-abstract": "^4.7.3",
19-
"@itwin/build-tools": "^4.7.3",
20-
"@itwin/core-bentley": "^4.7.3",
21-
"@itwin/core-common": "^4.7.3",
22-
"@itwin/core-geometry": "^4.7.3",
23-
"@itwin/core-orbitgt": "^4.7.3",
24-
"@itwin/core-quantity": "^4.7.3",
25-
"@itwin/webgl-compatibility": "^4.7.3",
18+
"@itwin/appui-abstract": "rc",
19+
"@itwin/build-tools": "rc",
20+
"@itwin/core-bentley": "rc",
21+
"@itwin/core-common": "rc",
22+
"@itwin/core-geometry": "rc",
23+
"@itwin/core-orbitgt": "rc",
24+
"@itwin/core-quantity": "rc",
25+
"@itwin/webgl-compatibility": "rc",
2626
"esbuild": "^0.13.13",
2727
"npm-run-all": "^4.1.5",
2828
"rimraf": "^3.0.2",
2929
"serve": "^14.2.0",
30-
"typescript": "~5.0.2"
30+
"typescript": "~5.6.2"
3131
},
3232
"scripts": {
3333
"build": "run-p build:**",

‎packages/modules/test-remote-extension/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
"devDependencies": {
1515
"@esbuild-plugins/node-modules-polyfill": "~0.1.2",
1616
"@esbuild-plugins/node-globals-polyfill": "~0.1.1",
17-
"@itwin/appui-abstract": "^4.7.3",
18-
"@itwin/build-tools": "^4.7.3",
19-
"@itwin/core-bentley": "^4.7.3",
20-
"@itwin/core-common": "^4.7.3",
21-
"@itwin/core-geometry": "^4.7.3",
22-
"@itwin/core-orbitgt": "^4.7.3",
23-
"@itwin/core-quantity": "^4.7.3",
24-
"@itwin/webgl-compatibility": "^4.7.3",
17+
"@itwin/appui-abstract": "rc",
18+
"@itwin/build-tools": "rc",
19+
"@itwin/core-bentley": "rc",
20+
"@itwin/core-common": "rc",
21+
"@itwin/core-geometry": "rc",
22+
"@itwin/core-orbitgt": "rc",
23+
"@itwin/core-quantity": "rc",
24+
"@itwin/webgl-compatibility": "rc",
2525
"esbuild": "^0.13.13",
2626
"npm-run-all": "^4.1.5",
2727
"rimraf": "^3.0.2",
2828
"serve": "^14.2.0",
29-
"typescript": "~5.0.2"
29+
"typescript": "~5.6.2"
3030
},
3131
"scripts": {
3232
"build": "run-p build:**",

0 commit comments

Comments
 (0)