Merge branch 'master' into tool-icons

iTwin · Dec 11, 2024 · f3994c2 · f3994c2
2 parents 1206dc9 + d5c1ed9
commit f3994c2
Show file tree

Hide file tree

Showing 61 changed files with 10,624 additions and 7,845 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ FROM mcr.microsoft.com/playwright:v1.46.1-jammy
 RUN npm install -g @microsoft/rush
 
 # Set the work directory
-WORKDIR appui
+WORKDIR /appui
 
 # Copy for `rush install`
 COPY rush.json ./

diff --git a/apps/test-app/eslint.config.cjs b/apps/test-app/eslint.config.cjs
@@ -44,6 +44,7 @@ module.exports = [
         },
       ],
       "@typescript-eslint/unbound-method": "off",
+      "@typescript-eslint/no-non-null-assertion": "off",
     },
   },
 ];
diff --git a/apps/test-app/package.json b/apps/test-app/package.json
@@ -38,26 +38,28 @@
     "url": "http://www.bentley.com"
   },
   "devDependencies": {
-    "@itwin/build-tools": "4.10.0-dev.34",
-    "@itwin/eslint-plugin": "5.0.0-dev.1",
-    "@tanstack/router-plugin": "~1.46.6",
-    "@tanstack/router-devtools": "~1.46.8",
-    "@types/node": "18.11.5",
+    "@itwin/build-tools": "4.10.2",
+    "@itwin/eslint-plugin": "5.0.0-dev.2",
+    "@tanstack/router-plugin": "^1.87.6",
+    "@tanstack/router-devtools": "^1.87.6",
+    "@types/node": "20.17.8",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@types/react-redux": "^7.1.18",
-    "@typescript-eslint/parser": "^6.1.0",
+    "@typescript-eslint/parser": "~8.11.0",
     "@vitejs/plugin-react-swc": "^3.7.0",
     "cross-env": "^5.1.4",
     "copyfiles": "^2.4.1",
+    "csstype": "^3.1.3",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "electron": "^22.0.0",
+    "electron": "^28.0.0",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "~8.8.0",
+    "inversify": "^6.0.1",
     "npm-run-all": "^4.1.5",
-    "null-loader": "^4.0.1",
-    "rimraf": "^3.0.2",
+    "reflect-metadata": "^0.1.13",
+    "rimraf": "^6.0.1",
     "sass": "^1.80.3",
     "typescript": "~5.6.2",
     "vite": "^5.4.7",
@@ -81,6 +83,7 @@
     "@itwin/core-orbitgt": "^4.0.0",
     "@itwin/core-quantity": "^4.0.0",
     "@itwin/core-react": "workspace:*",
+    "@itwin/ecschema-metadata": "^4.0.0",
     "@itwin/ecschema-rpcinterface-common": "^4.0.0",
     "@itwin/ecschema-rpcinterface-impl": "^4.0.0",
     "@itwin/editor-backend": "^4.0.0",
@@ -89,21 +92,21 @@
     "@itwin/express-server": "^4.0.0",
     "@itwin/frontend-devtools": "^4.0.0",
     "@itwin/hypermodeling-frontend": "^4.0.0",
-    "@itwin/imodel-browser-react": "^1.3.1",
+    "@itwin/imodel-browser-react": "^2.1.2",
     "@itwin/imodel-components-react": "workspace:*",
-    "@itwin/imodels-access-backend": "^3.0.0",
-    "@itwin/imodels-access-frontend": "^3.0.0",
-    "@itwin/imodels-client-authoring": "^3.0.0",
-    "@itwin/imodels-client-management": "^3.0.0",
+    "@itwin/imodels-access-backend": "^5.2.3",
+    "@itwin/imodels-access-frontend": "^5.2.3",
+    "@itwin/imodels-client-authoring": "^5.9.0",
+    "@itwin/imodels-client-management": "^5.9.0",
     "@itwin/itwinui-react": "^3.15.0",
     "@itwin/itwinui-react-v2": "npm:@itwin/itwinui-react@^2.12.26",
     "@itwin/itwinui-icons-react": "^2.8.0",
     "@itwin/itwinui-layouts-react": "~0.4.1",
     "@itwin/itwinui-layouts-css": "~0.4.0",
     "@itwin/presentation-common": "^4.0.0",
-    "@itwin/reality-data-client": "0.9.0",
+    "@itwin/reality-data-client": "1.2.2",
     "@itwin/webgl-compatibility": "^4.0.0",
-    "@tanstack/react-router": "~1.46.8",
+    "@tanstack/react-router": "^1.87.6",
     "classnames": "2.5.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/apps/test-app/src/frontend/Localization.tsx b/apps/test-app/src/frontend/Localization.tsx
@@ -56,6 +56,7 @@ export function AppLocalizationProvider({
 }
 
 export function AppLanguageSelect() {
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const { language, onChange } = React.useContext(LanguageContext)!;
   return <LanguageSelect language={language} onChange={onChange} />;
 }

diff --git a/apps/test-app/src/frontend/config.ts b/apps/test-app/src/frontend/config.ts
@@ -3,7 +3,7 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 function createConfig() {
-  const urlPrefix = import.meta.env.IMJS_URL_PREFIX as string;
+  const urlPrefix = import.meta.env.IMJS_URL_PREFIX ?? "";
   const serverEnvironmentPrefix = toServerEnvironmentPrefix(urlPrefix);
   return {
     appClientId: import.meta.env.IMJS_APP_CLIENT_ID as string,

diff --git a/apps/test-app/src/main.tsx b/apps/test-app/src/main.tsx
@@ -12,6 +12,7 @@ import { routeTree } from "./routeTree.gen";
 const router = createRouter({
   routeTree,
   context: {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     auth: undefined!,
   },
 });
@@ -24,6 +25,7 @@ declare module "@tanstack/react-router" {
 }
 
 // Render the app
+// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const rootElement = document.getElementById("root")!;
 if (!rootElement.innerHTML) {
   const root = ReactDOM.createRoot(rootElement);

diff --git a/apps/test-app/src/routeTree.gen.ts b/apps/test-app/src/routeTree.gen.ts
@@ -1,12 +1,12 @@
-/* prettier-ignore-start */
-
 /* eslint-disable */
 
 // @ts-nocheck
 
 // noinspection JSUnusedGlobalSymbols
 
-// This file is auto-generated by TanStack Router
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
 import { createFileRoute } from '@tanstack/react-router'
 
@@ -30,52 +30,62 @@ const IndexLazyImport = createFileRoute('/')()
 // Create/Update Routes
 
 const SigninCallbackRoute = SigninCallbackImport.update({
+  id: '/signin-callback',
   path: '/signin-callback',
   getParentRoute: () => rootRoute,
 } as any)
 
 const SettingsRoute = SettingsImport.update({
+  id: '/settings',
   path: '/settings',
   getParentRoute: () => rootRoute,
 } as any)
 
 const LocalRoute = LocalImport.update({
+  id: '/local',
   path: '/local',
   getParentRoute: () => rootRoute,
 } as any).lazy(() => import('./routes/local.lazy').then((d) => d.Route))
 
 const ITwinsRoute = ITwinsImport.update({
+  id: '/iTwins',
   path: '/iTwins',
   getParentRoute: () => rootRoute,
 } as any)
 
 const BriefcaseRoute = BriefcaseImport.update({
+  id: '/briefcase',
   path: '/briefcase',
   getParentRoute: () => rootRoute,
 } as any).lazy(() => import('./routes/briefcase.lazy').then((d) => d.Route))
 
 const BlankRoute = BlankImport.update({
+  id: '/blank',
   path: '/blank',
   getParentRoute: () => rootRoute,
 } as any).lazy(() => import('./routes/blank.lazy').then((d) => d.Route))
 
 const IndexLazyRoute = IndexLazyImport.update({
+  id: '/',
   path: '/',
   getParentRoute: () => rootRoute,
 } as any).lazy(() => import('./routes/index.lazy').then((d) => d.Route))
 
 const LocalFileNameRoute = LocalFileNameImport.update({
+  id: '/local_/$fileName',
   path: '/local/$fileName',
   getParentRoute: () => rootRoute,
 } as any)
 
 const ITwinITwinIdRoute = ITwinITwinIdImport.update({
+  id: '/iTwin_/$iTwinId',
   path: '/iTwin/$iTwinId',
   getParentRoute: () => rootRoute,
 } as any)
 
 const ITwinITwinIdIModelIModelIdRoute = ITwinITwinIdIModelIModelIdImport.update(
   {
+    id: '/iTwin/$iTwinId/iModel/$iModelId',
     path: '/iTwin/$iTwinId/iModel/$iModelId',
     getParentRoute: () => rootRoute,
   } as any,
@@ -134,15 +144,15 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof SigninCallbackImport
       parentRoute: typeof rootRoute
     }
-    '/iTwin/$iTwinId': {
-      id: '/iTwin/$iTwinId'
+    '/iTwin_/$iTwinId': {
+      id: '/iTwin_/$iTwinId'
       path: '/iTwin/$iTwinId'
       fullPath: '/iTwin/$iTwinId'
       preLoaderRoute: typeof ITwinITwinIdImport
       parentRoute: typeof rootRoute
     }
-    '/local/$fileName': {
-      id: '/local/$fileName'
+    '/local_/$fileName': {
+      id: '/local_/$fileName'
       path: '/local/$fileName'
       fullPath: '/local/$fileName'
       preLoaderRoute: typeof LocalFileNameImport
@@ -160,20 +170,115 @@ declare module '@tanstack/react-router' {
 
 // Create and export the route tree
 
-export const routeTree = rootRoute.addChildren({
-  IndexLazyRoute,
-  BlankRoute,
-  BriefcaseRoute,
-  ITwinsRoute,
-  LocalRoute,
-  SettingsRoute,
-  SigninCallbackRoute,
-  ITwinITwinIdRoute,
-  LocalFileNameRoute,
-  ITwinITwinIdIModelIModelIdRoute,
-})
-
-/* prettier-ignore-end */
+export interface FileRoutesByFullPath {
+  '/': typeof IndexLazyRoute
+  '/blank': typeof BlankRoute
+  '/briefcase': typeof BriefcaseRoute
+  '/iTwins': typeof ITwinsRoute
+  '/local': typeof LocalRoute
+  '/settings': typeof SettingsRoute
+  '/signin-callback': typeof SigninCallbackRoute
+  '/iTwin/$iTwinId': typeof ITwinITwinIdRoute
+  '/local/$fileName': typeof LocalFileNameRoute
+  '/iTwin/$iTwinId/iModel/$iModelId': typeof ITwinITwinIdIModelIModelIdRoute
+}
+
+export interface FileRoutesByTo {
+  '/': typeof IndexLazyRoute
+  '/blank': typeof BlankRoute
+  '/briefcase': typeof BriefcaseRoute
+  '/iTwins': typeof ITwinsRoute
+  '/local': typeof LocalRoute
+  '/settings': typeof SettingsRoute
+  '/signin-callback': typeof SigninCallbackRoute
+  '/iTwin/$iTwinId': typeof ITwinITwinIdRoute
+  '/local/$fileName': typeof LocalFileNameRoute
+  '/iTwin/$iTwinId/iModel/$iModelId': typeof ITwinITwinIdIModelIModelIdRoute
+}
+
+export interface FileRoutesById {
+  __root__: typeof rootRoute
+  '/': typeof IndexLazyRoute
+  '/blank': typeof BlankRoute
+  '/briefcase': typeof BriefcaseRoute
+  '/iTwins': typeof ITwinsRoute
+  '/local': typeof LocalRoute
+  '/settings': typeof SettingsRoute
+  '/signin-callback': typeof SigninCallbackRoute
+  '/iTwin_/$iTwinId': typeof ITwinITwinIdRoute
+  '/local_/$fileName': typeof LocalFileNameRoute
+  '/iTwin/$iTwinId/iModel/$iModelId': typeof ITwinITwinIdIModelIModelIdRoute
+}
+
+export interface FileRouteTypes {
+  fileRoutesByFullPath: FileRoutesByFullPath
+  fullPaths:
+    | '/'
+    | '/blank'
+    | '/briefcase'
+    | '/iTwins'
+    | '/local'
+    | '/settings'
+    | '/signin-callback'
+    | '/iTwin/$iTwinId'
+    | '/local/$fileName'
+    | '/iTwin/$iTwinId/iModel/$iModelId'
+  fileRoutesByTo: FileRoutesByTo
+  to:
+    | '/'
+    | '/blank'
+    | '/briefcase'
+    | '/iTwins'
+    | '/local'
+    | '/settings'
+    | '/signin-callback'
+    | '/iTwin/$iTwinId'
+    | '/local/$fileName'
+    | '/iTwin/$iTwinId/iModel/$iModelId'
+  id:
+    | '__root__'
+    | '/'
+    | '/blank'
+    | '/briefcase'
+    | '/iTwins'
+    | '/local'
+    | '/settings'
+    | '/signin-callback'
+    | '/iTwin_/$iTwinId'
+    | '/local_/$fileName'
+    | '/iTwin/$iTwinId/iModel/$iModelId'
+  fileRoutesById: FileRoutesById
+}
+
+export interface RootRouteChildren {
+  IndexLazyRoute: typeof IndexLazyRoute
+  BlankRoute: typeof BlankRoute
+  BriefcaseRoute: typeof BriefcaseRoute
+  ITwinsRoute: typeof ITwinsRoute
+  LocalRoute: typeof LocalRoute
+  SettingsRoute: typeof SettingsRoute
+  SigninCallbackRoute: typeof SigninCallbackRoute
+  ITwinITwinIdRoute: typeof ITwinITwinIdRoute
+  LocalFileNameRoute: typeof LocalFileNameRoute
+  ITwinITwinIdIModelIModelIdRoute: typeof ITwinITwinIdIModelIModelIdRoute
+}
+
+const rootRouteChildren: RootRouteChildren = {
+  IndexLazyRoute: IndexLazyRoute,
+  BlankRoute: BlankRoute,
+  BriefcaseRoute: BriefcaseRoute,
+  ITwinsRoute: ITwinsRoute,
+  LocalRoute: LocalRoute,
+  SettingsRoute: SettingsRoute,
+  SigninCallbackRoute: SigninCallbackRoute,
+  ITwinITwinIdRoute: ITwinITwinIdRoute,
+  LocalFileNameRoute: LocalFileNameRoute,
+  ITwinITwinIdIModelIModelIdRoute: ITwinITwinIdIModelIModelIdRoute,
+}
+
+export const routeTree = rootRoute
+  ._addFileChildren(rootRouteChildren)
+  ._addFileTypes<FileRouteTypes>()
 
 /* ROUTE_MANIFEST_START
 {
@@ -188,8 +293,8 @@ export const routeTree = rootRoute.addChildren({
         "/local",
         "/settings",
         "/signin-callback",
-        "/iTwin/$iTwinId",
-        "/local/$fileName",
+        "/iTwin_/$iTwinId",
+        "/local_/$fileName",
         "/iTwin/$iTwinId/iModel/$iModelId"
       ]
     },
@@ -214,10 +319,10 @@ export const routeTree = rootRoute.addChildren({
     "/signin-callback": {
       "filePath": "signin-callback.tsx"
     },
-    "/iTwin/$iTwinId": {
+    "/iTwin_/$iTwinId": {
       "filePath": "iTwin_.$iTwinId.tsx"
     },
-    "/local/$fileName": {
+    "/local_/$fileName": {
       "filePath": "local_.$fileName.tsx"
     },
     "/iTwin/$iTwinId/iModel/$iModelId": {

diff --git a/apps/test-app/src/routes/iTwin_.$iTwinId.tsx b/apps/test-app/src/routes/iTwin_.$iTwinId.tsx
@@ -10,7 +10,7 @@ import { useAuth } from "../frontend/Auth";
 import { PageLayout } from "@itwin/itwinui-layouts-react";
 import { SignInPage } from "../frontend/SignInPage";
 
-export const Route = createFileRoute("/iTwin/$iTwinId")({
+export const Route = createFileRoute("/iTwin_/$iTwinId")({
   component: ITwin,
 });
 

diff --git a/apps/test-app/src/routes/local_.$fileName.tsx b/apps/test-app/src/routes/local_.$fileName.tsx
@@ -18,7 +18,7 @@ import {
 } from "../frontend/SearchParams";
 import { registerFrontstages } from "../frontend/registerFrontstages";
 
-export const Route = createFileRoute("/local/$fileName")({
+export const Route = createFileRoute("/local_/$fileName")({
   component: Local,
   loader: async (ctx) => {
     await appInitializer.initialize();
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ module.exports = [ @@
             },
           ],
           "@typescript-eslint/unbound-method": "off",
+          "@typescript-eslint/no-non-null-assertion": "off",
         },
       },
     ];