Update pnpm-lock.yaml

# Conflicts:
#	yarn.lock

.npmrc

@@ -0,0 +1,3 @@
+auto-install-peers=true
+resolve-peers-from-workspace-root=true
+dedupe-peer-dependents=true

package.json

@@ -2,23 +2,17 @@
   "name": "docspace",
   "version": "2.0.0",
   "private": true,
-  "workspaces": {
-    "packages": [
-      "packages/*"
-    ]
-  },
   "engines": {
     "node": ">=18",
     "yarn": ">=3"
   },
   "scripts": {
-    "build": "node ./common/scripts/before-build.js && yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login,@docspace/editor}' run build",
-    "bump": "yarn version apply --all",
-    "clean": "yarn workspaces foreach -vptiR run clean",
-    "deploy": "shx rm -rf ../publish/web && yarn workspaces foreach -ptR --from '{@docspace/client,@docspace/login,@docspace/editor}' run deploy && shx cp -r public ../publish/web/ && node common/scripts/minify-common-locales.js",
-    "start": "node ./common/scripts/before-build.js && 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",
+    "build": "node ./common/scripts/before-build.js && pnpm --filter '@docspace/client' run build",
+    "clean": "pnpm run clean",
+    "deploy": "shx rm -rf ../publish/web && pnpm run deploy --filter @docspace/client,@docspace/login,@docspace/editor && shx cp -r public ../publish/web/ && node common/scripts/minify-common-locales.js",
+    "start": "node ./common/scripts/before-build.js && pnpm run start --filter @docspace/client,@docspace/login,@docspace/editor",
+    "start-prod": "pnpm run start-prod --filter @docspace/client,@docspace/login,@docspace/editor",
+    "storybook": "pnpm --filter '@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",
@@ -39,7 +33,7 @@
     "he": "^1.2.0",
     "madge": "^6.1.0",
     "shx": "^0.3.4",
-    "terser": "^5.16.6"
+    "terser": "^5.24.0"
   },
   "packageManager": "yarn@3.2.4"
 }

packages/client/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "homepage": "",
   "scripts": {
-    "build": "yarn build:translations && NODE_OPTIONS=--openssl-legacy-provider webpack --mode production",
+    "build": "pnpm build:translations && NODE_OPTIONS=--openssl-legacy-provider webpack --mode production",
     "build:translations": "node scripts/buildTranslations.js",
     "clean": "shx rm -rf dist",
     "deploy": "shx --silent mkdir -p ../../../publish/web/client && shx cp -r dist/* ../../../publish/web/client",
@@ -42,6 +42,8 @@
     "test:ui:mobile": "cross-env DEVICE_TYPE=mobile npx codecept-ui"
   },
   "dependencies": {
+    "@docspace/common": "workspace:^",
+    "@docspace/components": "workspace:^",
     "copy-to-clipboard": "^3.3.3",
     "element-resize-detector": "^1.2.4",
     "file-saver": "^2.0.5",
@@ -90,5 +92,64 @@
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.13.1"
   },
+  "peerDependencies": {
+    "@react-spring/web": "^9.7.1",
+    "@use-gesture/react": "^10.2.24",
+    "attr-accept": "^2.2.2",
+    "csvjson-json_beautifier": "^5.0.4",
+    "email-addresses": "^3.1.0",
+    "fast-deep-equal": "^3.1.3",
+    "framer-motion": "^4.1.17",
+    "html-to-react": "^1.5.0",
+    "lodash": "4.17.21",
+    "luxon": "^3.4.0",
+    "moment": "^2.29.4",
+    "prop-types": "^15.8.1",
+    "punycode": "^2.3.0",
+    "rc-tree": "^5.7.3",
+    "react-autosize-textarea": "^7.1.0",
+    "react-countdown": "2.3.5",
+    "react-custom-scrollbars": "^4.2.1",
+    "react-device-detect": "^1.17.0",
+    "react-dropzone": "^11.7.1",
+    "react-lifecycles-compat": "^3.0.4",
+    "react-onclickoutside": "^6.13.0",
+    "react-scrollbars-custom": "^4.1.1",
+    "react-svg": "^12.1.0",
+    "react-text-mask": "^5.5.0",
+    "react-toastify": "^7.0.4",
+    "react-tooltip": "^5.21.1",
+    "react-transition-group": "^4.4.5",
+    "react-virtualized": "^9.22.3",
+    "react-window": "^1.8.8",
+    "resize-image": "^0.1.0",
+    "@babel/runtime": "^7.21.0",
+    "@docspace/components": "workspace:^",
+    "@loadable/component": "^5.15.3",
+    "axios": "^0.22.0",
+    "cross-fetch": "3.1.5",
+    "global": "^4.4.0",
+    "i18next": "^20.6.1",
+    "mobx": "^6.8.0",
+    "mobx-react": "^7.6.0",
+    "query-string": "7.1.3",
+    "re-resizable": "^6.9.9",
+    "react": "^18.2.0",
+    "react-content-loader": "^5.1.4",
+    "react-dom": "^18.2.0",
+    "react-hammerjs": "^1.0.1",
+    "react-i18next": "^13.2.1",
+    "react-player": "^1.15.3",
+    "react-router": "^6.10.0",
+    "react-router-dom": "^6.10.0",
+    "react-viewer": "^3.2.2",
+    "react-virtualized-auto-sizer": "^1.0.7",
+    "react-window-infinite-loader": "^1.0.8",
+    "screenfull": "^5.2.0",
+    "sjcl": "^1.0.8",
+    "socket.io-client": "^4.6.1",
+    "styled-components": "^5.3.9",
+    "workbox-window": "^6.5.4"
+  },
   "title": "ONLYOFFICE"
 }

packages/common/package.json

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.21.0",
+    "@docspace/components": "workspace:^",
     "@loadable/component": "^5.15.3",
     "axios": "^0.22.0",
     "cross-fetch": "3.1.5",
@@ -45,5 +46,37 @@
   },
   "devDependencies": {
     "@welldone-software/why-did-you-render": "^6.2.3"
+  },
+  "peerDependencies": {
+    "@react-spring/web": "^9.7.1",
+    "@use-gesture/react": "^10.2.24",
+    "attr-accept": "^2.2.2",
+    "csvjson-json_beautifier": "^5.0.4",
+    "email-addresses": "^3.1.0",
+    "fast-deep-equal": "^3.1.3",
+    "framer-motion": "^4.1.17",
+    "html-to-react": "^1.5.0",
+    "lodash": "4.17.21",
+    "luxon": "^3.4.0",
+    "moment": "^2.29.4",
+    "prop-types": "^15.8.1",
+    "punycode": "^2.3.0",
+    "rc-tree": "^5.7.3",
+    "react-autosize-textarea": "^7.1.0",
+    "react-countdown": "2.3.5",
+    "react-custom-scrollbars": "^4.2.1",
+    "react-device-detect": "^1.17.0",
+    "react-dropzone": "^11.7.1",
+    "react-lifecycles-compat": "^3.0.4",
+    "react-onclickoutside": "^6.13.0",
+    "react-scrollbars-custom": "^4.1.1",
+    "react-svg": "^12.1.0",
+    "react-text-mask": "^5.5.0",
+    "react-toastify": "^7.0.4",
+    "react-tooltip": "^5.21.1",
+    "react-transition-group": "^4.4.5",
+    "react-virtualized": "^9.22.3",
+    "react-window": "^1.8.8",
+    "resize-image": "^0.1.0"
   }
 }

packages/components/package.json

@@ -16,27 +16,21 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@react-spring/web": "^9.7.1",
-    "@use-gesture/react": "^10.2.24",
     "attr-accept": "^2.2.2",
     "csvjson-json_beautifier": "^5.0.4",
     "email-addresses": "^3.1.0",
     "fast-deep-equal": "^3.1.3",
     "framer-motion": "^4.1.17",
-    "html-to-react": "^1.5.0",
     "lodash": "4.17.21",
-    "luxon": "^3.4.0",
+    "luxon": "^3.4.3",
     "moment": "^2.29.4",
     "prop-types": "^15.8.1",
-    "punycode": "^2.3.0",
-    "rc-tree": "^5.7.3",
+    "rc-tree": "^5.8.2",
     "react-autosize-textarea": "^7.1.0",
     "react-content-loader": "^5.1.4",
     "react-countdown": "2.3.5",
-    "react-custom-scrollbars": "^4.2.1",
     "react-device-detect": "^1.17.0",
     "react-dropzone": "^11.7.1",
-    "react-lifecycles-compat": "^3.0.4",
     "react-onclickoutside": "^6.13.0",
     "react-scrollbars-custom": "^4.1.1",
     "react-svg": "^12.1.0",
@@ -44,42 +38,53 @@
     "react-toastify": "^7.0.4",
     "react-tooltip": "^5.23.0",
     "react-transition-group": "^4.4.5",
-    "react-virtualized": "^9.22.3",
-    "react-window": "^1.8.8",
-    "resize-image": "^0.1.0"
+    "react-virtualized": "^9.22.5",
+    "react-window": "^1.8.9",
+    "resize-image": "^0.1.0",
+    "react-i18next": "^13.3.1",
+    "@floating-ui/dom": "^1.5.3",
+    "copy-to-clipboard": "^3.3.3",
+    "lodash.throttle": "^4.1.1",
+    "react-window-infinite-loader": "^1.0.9",
+    "i18next": "^23.6.0",
+    "react-avatar-editor": "^13.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.0",
-    "@babel/core": "^7.21.3",
-    "@babel/eslint-parser": "^7.21.8",
+    "@babel/cli": "^7.23.0",
+    "@babel/core": "^7.23.3",
+    "@babel/eslint-parser": "^7.23.3",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-export-default-from": "^7.18.10",
+    "@babel/plugin-proposal-export-default-from": "^7.23.3",
     "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/plugin-transform-runtime": "^7.21.0",
-    "@babel/preset-env": "^7.21.5",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.21.5",
+    "@babel/plugin-transform-runtime": "^7.23.3",
+    "@babel/plugin-transform-destructuring": "^7.23.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
+    "@babel/preset-env": "^7.23.3",
+    "@babel/preset-react": "^7.23.3",
+    "@babel/preset-typescript": "^7.23.3",
     "@emotion/babel-preset-css-prop": "^10.2.1",
+    "@babel/plugin-transform-regenerator": "^7.23.3",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/styled": "^10.3.0",
     "@react-theming/storybook-addon": "^1.1.10",
-    "@storybook/addon-actions": "7.0.23",
+    "@storybook/addon-actions": "7.5.3",
     "@storybook/addon-contexts": "^5.3.21",
-    "@storybook/addon-controls": "7.0.23",
-    "@storybook/addon-docs": "7.0.23",
-    "@storybook/addon-essentials": "7.0.23",
-    "@storybook/addon-links": "7.0.23",
-    "@storybook/addon-mdx-gfm": "7.0.23",
-    "@storybook/addon-viewport": "7.0.23",
-    "@storybook/addons": "^7.0.23",
-    "@storybook/manager-api": "^7.0.23",
-    "@storybook/react": "7.0.23",
-    "@storybook/react-webpack5": "7.0.23",
+    "@storybook/addon-controls": "7.5.3",
+    "@storybook/addon-docs": "7.5.3",
+    "@storybook/addon-essentials": "7.5.3",
+    "@storybook/addon-links": "7.5.3",
+    "@storybook/addon-mdx-gfm": "7.5.3",
+    "@storybook/addon-viewport": "7.5.3",
+    "@storybook/addons": "^7.5.3",
+    "@storybook/manager-api": "^7.5.3",
+    "@storybook/react": "7.5.3",
+    "@storybook/react-webpack5": "7.5.3",
     "@svgr/rollup": "^5.5.0",
     "@svgr/webpack": "^5.5.0",
     "@testing-library/react": "^9.5.0",
     "@types/jest": "^24.9.1",
-    "@types/luxon": "^3.3.1",
+    "@types/luxon": "^3.3.4",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^24.9.0",
@@ -89,6 +94,8 @@
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-plugin-transform-rename-import": "^2.3.0",
     "babel-preset-react-app": "^9.1.2",
+    "babel-plugin-styled-components": "^2.1.4",
+    "babel-plugin-macros": "^3.1.0",
     "copy-webpack-plugin": "6.4.1",
     "cross-env": "^6.0.3",
     "css-loader": "^6.7.3",
@@ -110,11 +117,15 @@
     "react-values": "^0.3.3",
     "sass-loader": "^13.2.1",
     "serve": "^14.2.0",
-    "storybook": "7.0.23",
-    "storybook-addon-designs": "beta",
-    "storybook-dark-mode": "^3.0.0",
+    "storybook": "7.5.3",
+    "storybook-addon-designs": "7.0.0-beta.2",
+    "storybook-dark-mode": "^3.0.1",
     "style-loader": "^3.3.2",
     "styled-components": "^5.3.9",
-    "svg-inline-loader": "^0.8.2"
+    "svg-inline-loader": "^0.8.2",
+    "colors": "^1.4.0",
+    "babel-preset-jest": "^29.6.3",
+    "@storybook/blocks": "^7.5.3",
+    "@storybook/theming": "^7.5.3"
   }
 }

packages/editor/package.json

@@ -66,6 +66,8 @@
   "socketPath": "/doceditor/ws",
   "dependencies": {
     "@aws-sdk/client-cloudwatch-logs": "^3.297.0",
+    "@docspace/common": "workspace:^",
+    "@docspace/components": "workspace:^",
     "@onlyoffice/document-editor-react": "1.3.0",
     "aws-crt": "^1.15.13",
     "bufferutil": "^4.0.7",

packages/login/package.json

@@ -107,6 +107,8 @@
   "socketPath": "/login/ws",
   "dependencies": {
     "@aws-sdk/client-cloudwatch-logs": "^3.297.0",
+    "@docspace/common": "workspace:^",
+    "@docspace/components": "workspace:^",
     "@types/ws": "^8.5.4",
     "aws-crt": "^1.15.13",
     "bufferutil": "^4.0.7",

pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+packages:
+  # all packages in direct subdirs of packages/
+  - "packages/*"