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

Merge pull request #743 from ONLYOFFICE/bugfix/doceditor-build-fix

Browse Source 
Bugfix/doceditor build fix
This commit is contained in:
Alexey Safronov 2022-07-28 18:30:05 +03:00 committed by GitHub
commit 4c26d1301a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/run/Editors.xml
View File

@ -3,7 +3,7 @@
<name>ONLYOFFICE Editors SSR</name>
<startmode>manual</startmode>
<executable>node</executable>
<arguments>../../build/deploy/products/ASC.Files/editor/server.js</arguments>
<arguments>../../build/deploy/editor/server.js</arguments>
<log mode="none"/>
<delayedAutoStart>true</delayedAutoStart>
<onfailure action="none" />

6
web/ASC.Web.Editor/package.json
View File

@ -23,7 +23,7 @@
"start-personal:client": "webpack --env personal=true --config webpack/webpack.client.js --watch --no-cache",
"start-personal:server": "webpack --env personal=true --config webpack/webpack.server.js --watch --no-cache",
"start-personal:common": "yarn build:dev-client-personal && yarn build:dev-server-personal && nodemon --watch dist/server.js dist/server.js",
"deploy": "shx --silent mkdir -p ../../build/deploy/products/ASC.Files/editor && shx cp -r dist/* ../../build/deploy/products/ASC.Files/editor"
"deploy": "shx --silent mkdir -p ../../build/deploy/editor && shx cp -r dist/* ../../build/deploy/editor"
},
"devDependencies": {
"@babel/core": "^7.18.6",
@ -44,7 +44,6 @@
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
"css-loader": "^6.7.1",
"dotenv": "^16.0.1",
"external-remotes-plugin": "^1.0.0",
"file-loader": "^6.2.0",
"html-webpack-plugin": "5.3.2",
@ -64,18 +63,19 @@
"webpack-hot-middleware": "^2.25.0",
"webpack-manifest-plugin": "^5.0.0",
"webpack-merge": "^5.7.3",
"webpack-node-externals": "^3.0.0",
"ws": "^8.8.0"
},
"id": "e67be73d-f9ae-4ce1-8fec-1880cb518cb4",
"title": "ONLYOFFICE",
"socketPath": "/products/files/doceditor/ws",
"dependencies": {
"bufferutil": "^4.0.6",
"compression": "^1.7.4",
"express": "^4.18.1",
"i18next-express-middleware": "^2.0.0",
"i18next-fs-backend": "^1.1.4",
"morgan": "^1.10.0",
"utf-8-validate": "^5.0.9",
"winston": "^3.8.1",
"winston-daily-rotate-file": "^4.7.1"
}

3
web/ASC.Web.Editor/src/server/config/config.json Normal file
View File

@ -0,0 +1,3 @@
{
"PORT": "5013"
}

9
web/ASC.Web.Editor/src/server/index.js
View File

@ -20,8 +20,15 @@ import { ServerStyleSheet } from "styled-components";
const sheet = new ServerStyleSheet();
const fallbackLng = "en";
const port = PORT || 5013;
let port = PORT;
const config = fs.readFileSync(path.join(__dirname, "config.json"), "utf-8");
const parsedCOnfig = JSON.parse(config);
if (parsedCOnfig?.PORT) {
port = parsedCOnfig.PORT;
}
const renderApp = (i18n, initialEditorState) => {
return renderToString(
sheet.collectStyles(

13
web/ASC.Web.Editor/src/server/lib/logger.js
View File

@ -11,20 +11,11 @@ if (logpath != null) {
}
}
const fileName = !IS_DEVELOPMENT
const fileName = IS_DEVELOPMENT
? path.join(__dirname, "..", "..", "..", "Logs", "editor.%DATE%.log")
: logpath
? path.join(logpath, "editor.%DATE%.log")
: path.join(
__dirname,
"..",
"..",
"..",
"..",
"..",
"Logs",
"editor.%DATE%.log"
);
: path.join(__dirname, "..", "..", "..", "Logs", "editor.%DATE%.log");
const dirName = path.dirname(fileName);
if (!fs.existsSync(dirName)) {

17
web/ASC.Web.Editor/webpack/webpack.server.js
View File

@ -1,13 +1,12 @@
const { merge } = require("webpack-merge");
const baseConfig = require("./webpack.base.js");
const webpackNodeExternals = require("webpack-node-externals");
const path = require("path");
const DefinePlugin = require("webpack").DefinePlugin;
const TerserPlugin = require("terser-webpack-plugin");
const CopyPlugin = require("copy-webpack-plugin");
const serverConfig = {
target: "node",
//mode: "development",
name: "server",
entry: {
server: "./src/server/index.js",
@ -19,7 +18,16 @@ const serverConfig = {
libraryTarget: "commonjs2",
chunkFilename: "chunks/[name].js",
},
externals: [webpackNodeExternals(), { express: "express" }],
plugins: [
new CopyPlugin({
patterns: [
{
//context: path.resolve(process.cwd(), "src/server"),
from: "src/server/config/",
},
],
}),
],
};
module.exports = (env, argv) => {
@ -33,9 +41,10 @@ module.exports = (env, argv) => {
serverConfig.mode = "development";
}
serverConfig.plugins = [
...serverConfig.plugins,
new DefinePlugin({
IS_DEVELOPMENT: argv.mode !== "production",
PORT: process.env.PORT || 5013,
PORT: 5013,
IS_PERSONAL: env.personal || false,
}),
];

29
yarn.lock
View File

@ -6894,6 +6894,13 @@ buffer@^5.5.0:
base64-js "^1.3.1"
ieee754 "^1.1.13"
bufferutil@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.6.tgz#ebd6c67c7922a0e902f053e5d8be5ec850e48433"
integrity sha512-jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw==
dependencies:
node-gyp-build "^4.3.0"
builtin-modules@^3.1.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
@ -9129,11 +9136,6 @@ dotenv-webpack@^1.8.0:
dependencies:
dotenv-defaults "^1.0.2"
dotenv@^16.0.1:
version "16.0.1"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
dotenv@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
@ -15114,6 +15116,11 @@ node-forge@^0.10.0:
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
node-gyp-build@^4.3.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
node-gyp@^5.0.2:
version "5.1.1"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
@ -20696,6 +20703,13 @@ use@^3.1.0:
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
utf-8-validate@^5.0.9:
version "5.0.9"
resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.9.tgz#ba16a822fbeedff1a58918f2a6a6b36387493ea3"
integrity sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q==
dependencies:
node-gyp-build "^4.3.0"
util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@ -21098,11 +21112,6 @@ webpack-merge@^5.7.3:
clone-deep "^4.0.1"
wildcard "^2.0.0"
webpack-node-externals@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917"
integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==
webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"