Skip to content

Commit

Permalink
Windows update (#6763)
Browse files Browse the repository at this point in the history
* fixed mobile safari windows problems

* `npm audit fix`

* trigger build

* Revert "`npm audit fix`"

This reverts commit be4179d.

* 1.9.0

* Updated snapshots (#6871)

Co-authored-by: JulianWielga <[email protected]>

* Updated snapshots (#6873)

Co-authored-by: JulianWielga <[email protected]>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: JulianWielga <[email protected]>

(cherry picked from commit 825d320)
  • Loading branch information
JulianWielga authored and Dzuming committed Sep 17, 2024
1 parent 5016d52 commit f97d3a5
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 36 deletions.
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.5",
"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 RootErrorBoundary from "./components/common/RootErrorBoundary";
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 RootErrorBoundary from "./components/common/RootErrorBoundary";
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 { 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>
<RootErrorBoundary>
<StoreProvider>
<SettingsProvider>
<NussknackerInitializer>
<BuildInfoProvider>
<RouterProvider router={router} />
</BuildInfoProvider>
</NussknackerInitializer>
</SettingsProvider>
</StoreProvider>
</RootErrorBoundary>
</NuThemeProvider>
<GlideGridPortal />
</>
);
};
const Root = () => (
<>
<NuThemeProvider>
<RootErrorBoundary>
<StoreProvider>
<SettingsProvider>
<NussknackerInitializer>
<BuildInfoProvider>
<RouterProvider router={router} />
</BuildInfoProvider>
</NussknackerInitializer>
</SettingsProvider>
</StoreProvider>
</RootErrorBoundary>
</NuThemeProvider>
<GlideGridPortal />
</>
);

root.render(<Root />);

0 comments on commit f97d3a5

Please sign in to comment.