Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows update #6763

Merged
merged 12 commits into from
Sep 16, 2024
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions designer/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion designer/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@mui/lab": "5.0.0-alpha.165",
"@mui/material": "5.15.7",
"@touk/federated-component": "1.0.0",
"@touk/window-manager": "1.9.0-beta.8",
"@touk/window-manager": "1.9.0",
"ace-builds": "1.34.2",
"axios": "1.7.4",
"d3-transition": "3.0.1",
Expand Down
54 changes: 26 additions & 28 deletions designer/client/src/bootstrap.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { css } from "@emotion/css";
import React from "react";
import { createRoot } from "react-dom/client";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { ErrorBoundary } from "./components/common/error-boundary";
import { GlideGridPortal } from "./components/graph/node-modal/editors/expression/Table/glideGridPortal";
import { BASE_PATH } from "./config";
import { BuildInfoProvider } from "./containers/BuildInfoProvider";
import NussknackerInitializer from "./containers/NussknackerInitializer";
import rootRoutes from "./containers/RootRoutes";
import { SettingsProvider } from "./containers/SettingsInitializer";
import "./i18n";
import { StoreProvider } from "./store/provider";
import rootRoutes from "./containers/RootRoutes";
import { BASE_PATH } from "./config";
import { css } from "@emotion/css";
import { NuThemeProvider } from "./containers/theme/nuThemeProvider";
import { GlideGridPortal } from "./components/graph/node-modal/editors/expression/Table/glideGridPortal";
import { createRoot } from "react-dom/client";
import { BuildInfoProvider } from "./containers/BuildInfoProvider";
import { ErrorBoundary } from "./components/common/error-boundary";
import { StoreProvider } from "./store/provider";

const rootContainer = document.createElement(`div`);
rootContainer.id = "root";
Expand All @@ -25,25 +25,23 @@ const router = createBrowserRouter(rootRoutes, { basename: BASE_PATH.replace(/\/

const root = createRoot(rootContainer);

const Root = () => {
return (
<>
<NuThemeProvider>
<ErrorBoundary>
<StoreProvider>
<SettingsProvider>
<NussknackerInitializer>
<BuildInfoProvider>
<RouterProvider router={router} />
</BuildInfoProvider>
</NussknackerInitializer>
</SettingsProvider>
</StoreProvider>
</ErrorBoundary>
</NuThemeProvider>
<GlideGridPortal />
</>
);
};
const Root = () => (
<>
<NuThemeProvider>
<ErrorBoundary>
<StoreProvider>
<SettingsProvider>
<NussknackerInitializer>
<BuildInfoProvider>
<RouterProvider router={router} />
</BuildInfoProvider>
</NussknackerInitializer>
</SettingsProvider>
</StoreProvider>
</ErrorBoundary>
</NuThemeProvider>
<GlideGridPortal />
</>
);

root.render(<Root />);
Loading