fix: we are so back

src/Router.tsx

@@ -9,23 +9,15 @@ import {
 } from 'react-router-dom'
 
 import { App } from '@src/App'
-import { AppStateProvider } from '@src/AppState'
 import { Auth } from '@src/Auth'
 import { CommandBar } from '@src/components/CommandBar/CommandBar'
 import DownloadAppBanner from '@src/components/DownloadAppBanner'
 import { ErrorPage } from '@src/components/ErrorPage'
 import FileMachineProvider from '@src/components/FileMachineProvider'
-import LspProvider from '@src/components/LspProvider'
-import { MachineManagerProvider } from '@src/components/MachineManagerProvider'
 import ModelingMachineProvider from '@src/components/ModelingMachineProvider'
-import { OpenInDesktopAppHandler } from '@src/components/OpenInDesktopAppHandler'
-import { ProjectsContextProvider } from '@src/components/ProjectsContextProvider'
-import { SystemIOMachineLogicListener } from '@src/components/Providers/SystemIOProviderDesktop'
-import { RouteProvider } from '@src/components/RouteProvider'
 import { WasmErrBanner } from '@src/components/WasmErrBanner'
 import { NetworkContext } from '@src/hooks/useNetworkContext'
 import { useNetworkStatus } from '@src/hooks/useNetworkStatus'
-import { KclContextProvider } from '@src/lang/KclProvider'
 import { coreDump } from '@src/lang/wasm'
 import {
   ASK_TO_OPEN_QUERY_PARAM,
@@ -44,12 +36,12 @@ import {
 } from '@src/lib/singletons'
 import { reportRejection } from '@src/lib/trap'
 import { useToken } from '@src/machines/appMachine'
+import RootLayout from '@src/Root'
 import Home from '@src/routes/Home'
 import Onboarding, { onboardingRoutes } from '@src/routes/Onboarding'
 import { Settings } from '@src/routes/Settings'
 import SignIn from '@src/routes/SignIn'
 import { Telemetry } from '@src/routes/Telemetry'
-import RootLayout from "@src/Root"
 
 const createRouter = isDesktop() ? createHashRouter : createBrowserRouter
 
@@ -57,10 +49,10 @@ const router = createRouter([
   {
     id: PATHS.INDEX,
     element: <RootLayout />,
-    errorElement: <ErrorPage />,
     children: [
       {
         path: PATHS.INDEX,
+        errorElement: <ErrorPage />,
         loader: async ({ request }) => {
           const onDesktop = isDesktop()
           const url = new URL(request.url)
@@ -81,6 +73,7 @@ const router = createRouter([
         loader: fileLoader,
         id: PATHS.FILE,
         path: PATHS.FILE + '/:id',
+        errorElement: <ErrorPage />,
         element: (
           <Auth>
             <FileMachineProvider>
@@ -127,6 +120,7 @@ const router = createRouter([
       },
       {
         path: PATHS.HOME,
+        errorElement: <ErrorPage />,
         element: (
           <Auth>
             <Outlet />
@@ -155,6 +149,7 @@ const router = createRouter([
       },
       {
         path: PATHS.SIGN_IN,
+        errorElement: <ErrorPage />,
         element: <SignIn />,
       },
     ],

src/components/Providers/SystemIOProviderDesktop.tsx

@@ -3,22 +3,23 @@ import { systemIOActor } from '@src/machines/appMachine'
 import { useSelector } from '@xstate/react'
 import { useEffect } from 'react'
 import { useNavigate } from 'react-router-dom'
-import {
+export const useRequestedProjectName = () =>
-  NO_PROJECT_DIRECTORY,
+  useSelector(systemIOActor, (state) => state.context.requestedProjectName)
-  SystemIOMachineEvents
+export const useProjectDirectoryPath = () =>
-} from '@src/machines/systemIO/utils'
+  useSelector(systemIOActor, (state) => state.context.projectDirectoryPath)
-export const useRequestedProjectName = () => useSelector(systemIOActor, (state) => state.context.requestedProjectName)
-export const useProjectDirectoryPath = () => useSelector(systemIOActor, (state) => state.context.projectDirectoryPath)
-
 
 export function SystemIOMachineLogicListener() {
   const requestedProjectName = useRequestedProjectName()
   const projectDirectoryPath = useProjectDirectoryPath()
   const navigate = useNavigate()
   useEffect(() => {
-    if (!requestedProjectName.name) {return}
+    if (!requestedProjectName.name) {
+      return
+    }
     let projectPathWithoutSpecificKCLFile =
-      projectDirectoryPath + window.electron.path.sep + requestedProjectName.name
+      projectDirectoryPath +
+      window.electron.path.sep +
+      requestedProjectName.name
     const requestedPath = `${PATHS.FILE}/${encodeURIComponent(
       projectPathWithoutSpecificKCLFile
     )}`

src/machines/systemIO/systemIOMachine.ts

@@ -1,7 +1,6 @@
 import { DEFAULT_PROJECT_NAME } from '@src/lib/constants'
 import type { Project } from '@src/lib/project'
-import type {
+import type { SystemIOContext } from '@src/machines/systemIO/utils'
-  SystemIOContext} from '@src/machines/systemIO/utils'
 import {
   NO_PROJECT_DIRECTORY,
   SystemIOMachineActions,
@@ -37,7 +36,7 @@ export const systemIOMachine = setup({
       | {
           type: SystemIOMachineEvents.openProject
           data: { requestedProjectName: string }
-      }
+        },
   },
   actions: {
     [SystemIOMachineActions.setFolders]: assign({
@@ -112,8 +111,7 @@ export const systemIOMachine = setup({
         },
       },
     },
-    [SystemIOMachineStates.openingProject] : {
+    [SystemIOMachineStates.openingProject]: {},
-    }
   },
 })
 

src/machines/systemIO/systemIOMachineDesktop.ts

@@ -1,8 +1,7 @@
 import { getProjectInfo, mkdirOrNOOP } from '@src/lib/desktop'
 import type { Project } from '@src/lib/project'
 import { systemIOMachine } from '@src/machines/systemIO/systemIOMachine'
-import type {
+import type { SystemIOContext } from '@src/machines/systemIO/utils'
-  SystemIOContext} from '@src/machines/systemIO/utils'
 import {
   NO_PROJECT_DIRECTORY,
   SystemIOMachineActors,

src/machines/systemIO/systemIOMachineWeb.ts

@@ -1,10 +1,7 @@
 import type { Project } from '@src/lib/project'
 import { systemIOMachine } from '@src/machines/systemIO/systemIOMachine'
-import type {
+import type { SystemIOContext } from '@src/machines/systemIO/utils'
-  SystemIOContext} from '@src/machines/systemIO/utils'
+import { SystemIOMachineActors } from '@src/machines/systemIO/utils'
-import {
-  SystemIOMachineActors,
-} from '@src/machines/systemIO/utils'
 import { fromPromise } from 'xstate'
 
 export const systemIOMachineWeb = systemIOMachine.provide({

src/machines/systemIO/utils.ts

@@ -9,7 +9,7 @@ export enum SystemIOMachineStates {
   idle = 'idle',
   readingFolders = 'readingFolders',
   settingProjectDirectoryPath = 'settingProjectDirectoryPath',
-  openingProject = 'openingProject'
+  openingProject = 'openingProject',
 }
 
 const donePrefix = 'xstate.done.actor.'