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

Web: Doceditor: refactoring

Browse Source
This commit is contained in:
Artem Tarasov 2022-03-14 14:08:53 +03:00
parent 642cae8e50
commit d61c92d357
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ASC.Web.Editor/src/client/index.js
View File

@ -16,13 +16,11 @@ delete window.initialLanguage;
const stateJS = document.getElementById("__ASC_INITIAL_STATE__");
stateJS.parentNode.removeChild(stateJS);
const { props } = propsObj;
const AppWrapper = () => {
useSSR(initialI18nStore, initialLanguage);
return (
<Suspense fallback={<div />}>
<App {...props} />
<App {...propsObj} />
</Suspense>
);
};

2
web/ASC.Web.Editor/src/server/render.js
View File

@ -23,5 +23,5 @@ export default async (req) => {
);
const styleTags = sheet.getStyleTags();
return { props, content, styleTags, scriptTags };
return { ...props, content, styleTags, scriptTags };
};

2
web/ASC.Web.Editor/src/server/template.js
View File

@ -7,7 +7,7 @@ export default function template(
initialI18nStore,
initialLanguage
) {
const { docApiUrl } = initialState.props;
const { docApiUrl } = initialState;
const scripts = `
<script id="__ASC_INITIAL_STATE__">

13
web/ASC.Web.Editor/webpack.config.js
View File

@ -1,13 +0,0 @@
// const serverConfig = require("./webpack.server");
// const clientConfig = require("./webpack.client");
module.exports = (env, argv) => {
// if (argv.mode === "production") {
// process.env.NODE_ENV = "production";
// } else {
// process.env.NODE_ENV = "development";
// }
console.log([require("./webpack.client"), require("./webpack.server")]);
//return [require("./webpack.client"), require("./webpack.server")];
return [require("./webpack.client"), require("./webpack.server")];
};