IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Applied changes to new React v18

Browse Source
This commit is contained in:
Alexey Safronov 2023-03-23 19:56:23 +04:00
parent 4390389163
commit a0810ad718
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/client/src/bootstrap.js vendored
View File

@ -1,9 +1,10 @@
import React from "react"; import React from "react";
import ReactDOM from "react-dom"; import { createRoot } from "react-dom/client";
import App from "./App"; import App from "./App";
//import { registerSW } from "@docspace/common/sw/helper"; //import { registerSW } from "@docspace/common/sw/helper";
const root = document.getElementById("root");
if (root) ReactDOM.render(<App />, root); const container = document.getElementById("root");
const root = createRoot(container);
if (root) root.render(<App />);
//registerSW(); //registerSW();

26
packages/editor/src/client/bootstrap.js vendored
View File

@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { hydrate } from "react-dom"; import { hydrateRoot } from "react-dom/client";
// import { registerSW } from "@docspace/common/sw/helper"; // import { registerSW } from "@docspace/common/sw/helper";
import App from "./App.js"; import App from "./App.js";
import pkg from "../../package.json"; import pkg from "../../package.json";
@ -11,17 +11,19 @@ const initialLanguage = window.initialLanguage;
initI18n(initialI18nStoreASC); initI18n(initialI18nStoreASC);
hydrate( const container = document.getElementById("root");
<React.Suspense fallback={<div></div>}> if (container) {
<App hydrateRoot(
initialLanguage={initialLanguage} container,
initialI18nStoreASC={initialI18nStoreASC} <React.Suspense fallback={<div></div>}>
{...propsObj} <App
/> initialLanguage={initialLanguage}
</React.Suspense>, initialI18nStoreASC={initialI18nStoreASC}
document.getElementById("root") {...propsObj}
); />
</React.Suspense>
);
}
if (IS_DEVELOPMENT) { if (IS_DEVELOPMENT) {
const port = PORT || 5013; const port = PORT || 5013;
const socketPath = pkg.socketPath; const socketPath = pkg.socketPath;

23
packages/login/src/client/bootstrap.tsx
View File

@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { hydrate } from "react-dom"; import { hydrateRoot } from "react-dom/client";
// import { registerSW } from "@docspace/common/sw/helper"; // import { registerSW } from "@docspace/common/sw/helper";
import pkg from "../../package.json"; import pkg from "../../package.json";
import { initI18n } from "./helpers/utils"; import { initI18n } from "./helpers/utils";
@ -14,15 +14,18 @@ if (isDesktopEditor) typeof window["AscDesktopEditor"];
initI18n(initialI18nStoreASC); initI18n(initialI18nStoreASC);
hydrate( const container = document.getElementById("root");
<ClientApp if (container) {
initialLanguage={initialLanguage} hydrateRoot(
initialI18nStoreASC={initialI18nStoreASC} container,
isDesktopEditor={isDesktopEditor} <ClientApp
{...propsObj} initialLanguage={initialLanguage}
/>, initialI18nStoreASC={initialI18nStoreASC}
document.getElementById("root") isDesktopEditor={isDesktopEditor}
); {...propsObj}
/>
);
}
if (IS_DEVELOPMENT) { if (IS_DEVELOPMENT) {
const port = PORT || 5011; const port = PORT || 5011;