Merge pull request #1026 from ONLYOFFICE/feature/node-v18

Feature/node v18
2022-11-11 15:59:18 +03:00 · 2022-11-11 15:59:18 +03:00 · e58ade423f
commit e58ade423f
parent 8bd32842f4 518e10f4ee
13 changed files with 2380 additions and 4452 deletions
--- a/.yarn/releases/yarn-3.2.2.cjs
+++ b/.yarn/releases/yarn-3.2.2.cjs
--- a/.yarn/releases/yarn-3.2.4.cjs
+++ b/.yarn/releases/yarn-3.2.4.cjs
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@ -8,4 +8,4 @@ plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
    spec: "@yarnpkg/plugin-version"

-yarnPath: .yarn/releases/yarn-3.2.2.cjs
+yarnPath: .yarn/releases/yarn-3.2.4.cjs
--- a/build/install/docker/Dockerfile.app
+++ b/build/install/docker/Dockerfile.app
@ -30,7 +30,7 @@ RUN apt-get -y update && \
        npm  && \
    locale-gen en_US.UTF-8 && \
    npm install --global yarn && \
-    curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - && \
+    curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - && \
    apt-get install -y nodejs && \
    rm -rf /var/lib/apt/lists/*

@ -93,7 +93,7 @@ COPY --from=base --chown=onlyoffice:onlyoffice /app/onlyoffice/config/* /app/onl
 EXPOSE 5050
 ENTRYPOINT ["python3", "docker-entrypoint.py"]

-FROM node:16.16-slim as noderun
+FROM node:18.12.1-slim as noderun
 ARG BUILD_PATH
 ARG SRC_PATH 
 ENV BUILD_PATH=${BUILD_PATH}
--- a/build/install/docker/Dockerfile.dev
+++ b/build/install/docker/Dockerfile.dev
@ -30,7 +30,7 @@ RUN apt-get -y update && \
    npm  && \
    locale-gen en_US.UTF-8 && \
    npm install --global yarn && \
-    curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - && \
+    curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - && \
    apt-get install -y nodejs && \
    rm -rf /var/lib/apt/lists/*

@ -91,7 +91,7 @@ COPY --from=base --chown=onlyoffice:onlyoffice /app/onlyoffice/config/* /app/onl
 EXPOSE 5050
 ENTRYPOINT ["python3", "docker-entrypoint.py"]

-FROM node:16.16-slim as noderun
+FROM node:18.12.1-slim as noderun
 ARG BUILD_PATH
 ARG SRC_PATH 
 ENV BUILD_PATH=${BUILD_PATH}
--- a/common/ASC.WebPlugins/yarn.lock
+++ b/common/ASC.WebPlugins/yarn.lock
@ -8204,7 +8204,7 @@ __metadata:

 "typescript@patch:typescript@4.7.4#~builtin<compat/typescript>, typescript@patch:typescript@^4.3.5#~builtin<compat/typescript>":
  version: 4.7.4
-  resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=f456af"
+  resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=701156"
  bin:
    tsc: bin/tsc
    tsserver: bin/tsserver
--- a/package.json
+++ b/package.json
@ -13,19 +13,21 @@
  },
  "scripts": {
    "build": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run build",
-    "build:test": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run build:test",
-    "build:test.translation": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run build:test.translation",
    "bump": "yarn version apply --all",
    "clean": "yarn workspaces foreach -vptiR run clean",
    "deploy": "shx rm -rf build/deploy/products && shx rm -rf build/deploy/public && shx rm -rf build/deploy/client && yarn workspaces foreach -ptR --from '{@docspace/client,@docspace/login,@docspace/editor}' run deploy && shx cp -r public build/deploy && node build/scripts/minify-common-locales.js",
-    "serve": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run serve",
    "start": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run start",
    "start-prod": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run start-prod",
    "storybook": "yarn workspace @docspace/components storybook",
    "storybook-build": "yarn workspace @docspace/components run storybook-build",
+    "storybook-serve": "yarn workspace @docspace/components run storybook-serve",
    "test": "yarn workspace @docspace/components test",
    "wipe": "shx rm -rf node_modules yarn.lock packages/**/node_modules",
-    "debug-info": "auto-changelog --unreleased-only --template debuginfo --output public/debuginfo.md",
+    "debug-info": "auto-changelog --unreleased-only --template debuginfo --output public/debuginfo.md"
+  },
+  "old-scripts": {
+    "build:test": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run build:test",
+    "build:test.translation": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run build:test.translation",
    "e2e.test": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login}' run test:sequential",
    "e2e.test:sequential": "yarn workspace @docspace/client test:sequential && yarn workspace @docspace/login test:sequential",
    "e2e.test:model": "yarn workspace @docspace/client test:model && yarn workspace @docspace/login test:model",
@ -36,5 +38,5 @@
    "shx": "^0.3.3",
    "terser": "^5.8.0"
  },
-  "packageManager": "yarn@3.2.2"
+  "packageManager": "yarn@3.2.4"
 }
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -4,15 +4,16 @@
  "private": true,
  "homepage": "",
  "scripts": {
-    "build": "webpack --mode production",
+    "build": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production",
+    "clean": "shx rm -rf dist",
+    "deploy": "shx --silent mkdir -p ../../build/deploy/client && shx cp -r dist/* ../../build/deploy/client",
+    "start": "NODE_OPTIONS=--openssl-legacy-provider webpack-cli serve",
+    "start-prod": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production && serve dist -p 5001"
+  },
+  "old-scripts": {
    "build:test": "webpack --env minimize=false --mode production",
    "build:test.translation": "webpack --env minimize=false hideText=true --mode production",
    "build:test.translation:personal": "webpack --env minimize=false hideText=true personal=true --mode production",
-    "clean": "shx rm -rf dist",
-    "deploy": "shx --silent mkdir -p ../../build/deploy/client && shx cp -r dist/* ../../build/deploy/client",
-    "serve": "serve dist -p 5001",
-    "start": "webpack-cli serve",
-    "start-prod": "webpack --mode production && serve dist -p 5001",
    "test:codeceptjs": "npx codeceptjs run --reporter mocha-multi",
    "test:mobile": "cross-env DEVICE_TYPE=mobile yarn test:codeceptjs",
    "test:smallTablet": "cross-env DEVICE_TYPE=smallTablet yarn test:codeceptjs",
@ -40,6 +41,7 @@
  },
  "dependencies": {
    "copy-to-clipboard": "^3.3.1",
+    "element-resize-detector": "^1.2.4",
    "file-saver": "^2.0.5",
    "firebase": "^8.10.0",
    "react-avatar-editor": "^13.0.0",
@ -57,13 +59,9 @@
    "@babel/preset-env": "^7.15.6",
    "@babel/preset-react": "^7.14.5",
    "@babel/preset-typescript": "^7.18.6",
-    "@codeceptjs/configure": "^0.8.0",
-    "@codeceptjs/examples": "^1.2.1",
-    "@codeceptjs/ui": "^0.4.6",
    "@svgr/webpack": "^5.5.0",
    "babel-loader": "^8.2.2",
    "clean-webpack-plugin": "^4.0.0",
-    "codeceptjs": "^3.3.0",
    "copy-webpack-plugin": "^9.0.1",
    "css-loader": "^6.2.0",
    "external-remotes-plugin": "^1.0.0",
--- a/packages/components/.eslintrc.js
+++ b/packages/components/.eslintrc.js
@ -1,17 +1,17 @@
 module.exports = {
  parser: "babel-eslint",
-  extends: ["eslint:recommended", "plugin:react/recommended"],
+  extends: ["eslint:recommended", "plugin:react/recommended", "plugin:storybook/recommended"],
  settings: {
    react: {
-      version: "detect",
-    },
+      version: "detect"
+    }
  },
  env: {
    browser: true,
-    node: true,
+    node: true
  },
  plugins: ["jest"],
  env: {
-    "jest/globals": true,
-  },
-};
+    "jest/globals": true
+  }
+};
--- a/packages/components/package.json
+++ b/packages/components/package.json
@ -8,8 +8,8 @@
    "deploy": "echo 'skip it'",
    "start": "echo 'skip it'",
    "start-prod": "echo 'skip it'",
-    "storybook": "start-storybook -p 8082 -s public",
-    "storybook-build": "build-storybook",
+    "storybook": "NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 8082 -s public",
+    "storybook-build": "NODE_OPTIONS=--openssl-legacy-provider build-storybook",
    "storybook-serve": "serve storybook-static -p 8082",
    "test": "jest",
    "test:coverage": "jest --coverage",
@ -53,14 +53,14 @@
    "@babel/preset-react": "^7.14.5",
    "@emotion/babel-preset-css-prop": "^10.2.1",
    "@emotion/styled": "^10.0.27",
-    "@storybook/addon-actions": "6.3.0",
+    "@storybook/addon-actions": "6.5.13",
    "@storybook/addon-contexts": "^5.3.21",
-    "@storybook/addon-controls": "6.3.0",
-    "@storybook/addon-docs": "6.3.0",
-    "@storybook/addon-essentials": "6.3.0",
-    "@storybook/addon-links": "6.3.0",
-    "@storybook/addon-viewport": "6.3.0",
-    "@storybook/react": "6.3.0",
+    "@storybook/addon-controls": "6.5.13",
+    "@storybook/addon-docs": "6.5.13",
+    "@storybook/addon-essentials": "6.5.13",
+    "@storybook/addon-links": "6.5.13",
+    "@storybook/addon-viewport": "6.5.13",
+    "@storybook/react": "6.5.13",
    "@svgr/rollup": "^5.5.0",
    "@svgr/webpack": "^5.5.0",
    "@testing-library/react": "^9.5.0",
@ -81,6 +81,7 @@
    "eslint": "^8.11.0",
    "eslint-plugin-jest": "^26.1.1",
    "eslint-plugin-react": "^7.17.0",
+    "eslint-plugin-storybook": "^0.6.7",
    "jest": "^24.9.0",
    "jest-enzyme": "^7.1.2",
    "jest-junit": "^10.0.0",
@ -91,6 +92,7 @@
    "react-dom": "^17.0.2",
    "react-json-pretty": "^2.2.0",
    "react-values": "^0.3.3",
+    "serve": "^14.1.1",
    "styled-components": "^5.3.1",
    "svg-inline-loader": "^0.8.2"
  }
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@ -5,15 +5,16 @@
  "homepage": "/doceditor",
  "scripts": {
    "build": "yarn clean && yarn build:client && yarn build:server",
-    "build:server": "webpack --mode production --config webpack/webpack.server.js",
-    "build:client": "webpack --mode production --config webpack/webpack.client.js",
-    "build:dev-server": "webpack --config webpack/webpack.server.js",
-    "build:dev-client": "webpack --config webpack/webpack.client.js",
+    "build:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --config webpack/webpack.server.js",
+    "build:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --config webpack/webpack.client.js",
+    "build:dev-server": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.server.js",
+    "build:dev-client": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.client.js",
    "clean": "shx rm -rf dist",
    "start": "yarn clean && npm-run-all --parallel start:client start:server start:common",
-    "start:client": "webpack --config webpack/webpack.client.js --watch --no-cache",
-    "start:server": "webpack --config webpack/webpack.server.js --watch --no-cache",
-    "start:common": "yarn build:dev-client && yarn build:dev-server && nodemon --watch dist/server.js dist/server.js",
+    "start:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.client.js --watch --no-cache",
+    "start:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.server.js --watch --no-cache",
+    "start:common": "yarn build:dev-client && yarn build:dev-server && NODE_OPTIONS=--openssl-legacy-provider nodemon --watch dist/server.js dist/server.js",
+    "start-prod": "NODE_OPTIONS=--openssl-legacy-provider node dist/server.js",
    "deploy": "shx --silent mkdir -p ../../build/deploy/editor && shx cp -r dist/* ../../build/deploy/editor"
  },
  "devDependencies": {
--- a/packages/login/package.json
+++ b/packages/login/package.json
@ -5,28 +5,30 @@
  "homepage": "/login",
  "scripts": {
    "build": "yarn clean && yarn build:client && yarn build:server",
-    "build:client": "webpack --mode production --config webpack/webpack.client.js",
-    "build:server": "webpack --mode production --config webpack/webpack.server.js",
-    "build:dev-server": "webpack --config webpack/webpack.server.js",
-    "build:dev-client": "webpack --config webpack/webpack.client.js",
+    "build:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --config webpack/webpack.client.js",
+    "build:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --config webpack/webpack.server.js",
+    "build:dev-server": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.server.js",
+    "build:dev-client": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.client.js",
    "build-rooms": "yarn clean && yarn build-rooms:client && yarn build-rooms-server",
-    "build-rooms:client": "webpack --mode production --env rooms=true --config webpack/webpack.client.js",
-    "build-rooms:server": "webpack --mode production --env rooms=true --config webpack/webpack.server.js",
-    "build-rooms:dev-server": "webpack --env rooms=true --config webpack/webpack.server.js",
-    "build-rooms:dev-client": "webpack --env rooms=true --config webpack/webpack.client.js",
-    "build:test": "webpack --env minimize=false --mode production",
-    "build:test.translation": "webpack --env minimize=false hideText=true --mode production",
+    "build-rooms:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --env rooms=true --config webpack/webpack.client.js",
+    "build-rooms:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --mode production --env rooms=true --config webpack/webpack.server.js",
+    "build-rooms:dev-server": "NODE_OPTIONS=--openssl-legacy-provider webpack --env rooms=true --config webpack/webpack.server.js",
+    "build-rooms:dev-client": "NODE_OPTIONS=--openssl-legacy-provider webpack --env rooms=true --config webpack/webpack.client.js",
    "clean": "shx rm -rf dist",
    "start": "yarn clean && npm-run-all --parallel start:client start:server start:common",
-    "start:client": "webpack --config webpack/webpack.client.js --watch --no-cache",
-    "start:server": "webpack --config webpack/webpack.server.js --watch --no-cache",
-    "start:common": "yarn build:dev-client && yarn build:dev-server && nodemon --watch dist/server.js dist/server.js",
+    "start:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.client.js --watch --no-cache",
+    "start:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack/webpack.server.js --watch --no-cache",
+    "start:common": "yarn build:dev-client && yarn build:dev-server && NODE_OPTIONS=--openssl-legacy-provider nodemon --watch dist/server.js dist/server.js",
    "start-rooms": "yarn clean && npm-run-all --parallel start-rooms:client start-rooms:server start-rooms:common",
-    "start-rooms:client": "webpack --env rooms=true --config webpack/webpack.client.js --watch --no-cache",
-    "start-rooms:server": "webpack --env rooms=true --config webpack/webpack.server.js --watch --no-cache",
+    "start-rooms:client": "NODE_OPTIONS=--openssl-legacy-provider webpack --env rooms=true --config webpack/webpack.client.js --watch --no-cache",
+    "start-rooms:server": "NODE_OPTIONS=--openssl-legacy-provider webpack --env rooms=true --config webpack/webpack.server.js --watch --no-cache",
    "start-rooms:common": "yarn build-rooms:dev-client && yarn build-rooms:dev-server && nodemon --watch dist/server.js dist/server.js",
-    "start-prod": "webpack --mode production && serve dist -p 5011",
-    "deploy": "shx --silent mkdir -p ../../build/deploy/login && shx cp -r dist/* ../../build/deploy/login",
+    "start-prod": "NODE_OPTIONS=--openssl-legacy-provider node dist/server.js",
+    "deploy": "shx --silent mkdir -p ../../build/deploy/login && shx cp -r dist/* ../../build/deploy/login"
+  },
+  "old-scripts": {
+    "build:test": "NODE_OPTIONS=--openssl-legacy-provider webpack --env minimize=false --mode production",
+    "build:test.translation": "NODE_OPTIONS=--openssl-legacy-provider webpack --env minimize=false hideText=true --mode production",
    "test:codeceptjs": "npx codeceptjs run --reporter mocha-multi",
    "test:mobile": "cross-env DEVICE_TYPE=mobile yarn test:codeceptjs",
    "test:smallTablet": "cross-env DEVICE_TYPE=smallTablet yarn test:codeceptjs",
@ -58,9 +60,6 @@
    "@babel/preset-env": "^7.15.6",
    "@babel/preset-react": "^7.14.5",
    "@babel/preset-typescript": "^7.18.6",
-    "@codeceptjs/configure": "^0.7.0",
-    "@codeceptjs/examples": "^1.2.1",
-    "@codeceptjs/ui": "^0.4.6",
    "@svgr/webpack": "^5.5.0",
    "@types/accept-language-parser": "^1.5.3",
    "@types/compression": "^1.7.2",
@ -75,8 +74,6 @@
    "@types/winston": "^2.4.4",
    "babel-loader": "^8.2.2",
    "clean-webpack-plugin": "^4.0.0",
-    "codeceptjs": "^3.2.2",
-    "codeceptjs-resemblehelper": "^1.9.5",
    "copy-webpack-plugin": "^9.0.1",
    "css-loader": "^6.2.0",
    "external-remotes-plugin": "^1.0.0",
--- a/yarn.lock
+++ b/yarn.lock