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

Web: Upgrade yarn to v3.2.2

Browse Source
This commit is contained in:
Alexey Safronov 2022-07-29 18:20:57 +03:00
parent f068d41b4f
commit 995d07deae
19 changed files with 27794 additions and 22017 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -39,3 +39,10 @@ TestsResults/
/build/install/RadicalePlugins/app_store_plugin/build/lib/app_store_plugin/log.py
/build/install/RadicalePlugins/app_store_plugin/build/lib/app_store_plugin/sync.py
/build/install/RadicalePlugins/app_store_plugin/build/lib/app_store_plugin/upload.py
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

35
.vscode/settings.json vendored
View File

@ -2,22 +2,21 @@
"files.exclude": {
"**/packages": true,
"**/.nuget": true,
"**/build": true,
"**/common": true,
"**/Data": true,
"**/i18next": true,
"**/node_modules": true,
"**/migrations": true,
"**/products": true,
"**/Logs": true,
"**/thirdparty": true,
"**/web": true,
"**/*.sln": true,
"**/*.slnf": true,
"**/NuGet.Config": true,
"**/.gitignore": true,
"**/.gitmodules": true,
"**/.editorconfig": true,
"**/LICENSE": true,
"**/common": true,
"**/Data": true,
"**/i18next": true,
//"**/node_modules": true,
"**/migrations": true,
"**/products": true,
"**/Logs": true,
"**/thirdparty": true,
"**/web": true,
"**/*.sln": true,
"**/*.slnf": true,
"**/NuGet.Config": true,
"**/.gitignore": true,
"**/.gitmodules": true,
"**/.editorconfig": true,
"**/LICENSE": true
}
}
}

541
.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs vendored Normal file
View File

File diff suppressed because one or more lines are too long

550
.yarn/plugins/@yarnpkg/plugin-version.cjs vendored Normal file
View File

File diff suppressed because one or more lines are too long

28
.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs vendored Normal file
View File

File diff suppressed because one or more lines are too long

783
.yarn/releases/yarn-3.2.2.cjs vendored Normal file
View File

File diff suppressed because one or more lines are too long

11
.yarnrc.yml Normal file
View File

@ -0,0 +1,11 @@
nodeLinker: node-modules
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
spec: "@yarnpkg/plugin-version"
yarnPath: .yarn/releases/yarn-3.2.2.cjs

2
build/scripts/minify-common-locales.js
View File

@ -1,6 +1,6 @@
const { join } = require("path");
const { readdirSync, readFileSync, writeFileSync } = require("fs");
const minifyJson = require("../../packages/asc-web-common/utils/minifyJson.js");
const minifyJson = require("../../packages/common/utils/minifyJson.js");
const localesDir = join(
__dirname,

7
config/workbox-config.js
View File

@ -1,7 +0,0 @@
module.exports = {
globDirectory: "build/deploy/",
globPatterns: ["**/*.{js,css,woff2,svg}"],
globIgnores: ["**/remoteEntry.js"],
swSrc: "packages/asc-web-common/sw/template.js",
swDest: "build/deploy/public/sw.js",
};

11
config/workbox-dev-config.js
View File

@ -1,11 +0,0 @@
module.exports = {
globDirectory: 'build/deploy/',
globPatterns: [
'**/*.{ico,woff2,svg,html,json,js,png}'
],
ignoreURLParametersMatching: [
/^utm_/,
/^fbclid$/
],
swDest: 'build/deploy/public/sw.js'
};

9
lerna.json
View File

@ -1,9 +0,0 @@
{
"version": "1.2.0",
"npmClient": "yarn",
"packages": [
"packages/*",
"public"
],
"useWorkspaces": true
}

64
package.json
View File

@ -2,53 +2,39 @@
"name": "docspace",
"version": "1.2.0",
"private": true,
"workspaces": [
"packages/*",
"public"
],
"workspaces": {
"packages": [
"packages/*"
]
},
"engines": {
"node": ">=14",
"yarn": ">=3"
},
"scripts": {
"build": "lerna run build --parallel --ignore @docspace/common --ignore @docspace/components --ignore @docspace/browserslist-config-asc",
"build:personal": "lerna run build:personal --parallel --scope {@docspace/client,@docspace/people,@docspace/files,@docspace/editor}",
"build:test": "lerna run build:test --parallel --ignore @docspace/common --ignore @docspace/components --ignore @docspace/browserslist-config-asc --ignore @docspace/debug-info",
"build:test.translation": "lerna run build:test.translation --parallel --ignore @docspace/common --ignore @docspace/components --ignore @docspace/browserslist-config-asc --ignore @docspace/debug-info",
"build:test.translation:personal": "lerna run build:test.translation:personal --parallel --ignore @docspace/common --ignore @docspace/components --ignore @docspace/browserslist-config-asc --ignore @docspace/debug-info",
"bump": "lerna version --no-push --no-git-tag-version",
"clean": "lerna run clean --parallel",
"deploy": "shx rm -rf build/deploy/products && shx rm -rf build/deploy/public && shx rm -rf build/deploy/client && lerna run deploy --parallel --ignore @docspace/common --ignore @docspace/components --ignore @docspace/browserslist-config-asc && shx cp -r public build/deploy && node build/scripts/minify-common-locales.js",
"deploy:personal": "shx rm -rf build/deploy/products && shx rm -rf build/deploy/public && shx rm -rf build/deploy/client && lerna run deploy --parallel --scope {@docspace/client,@docspace/people,@docspace/files,@docspace/editor} && shx cp -r public build/deploy && node build/scripts/minify-common-locales.js",
"serve": "lerna run serve --parallel --ignore @docspace/common --ignore @docspace/components --ignore @docspace/browserslist-config-asc",
"start": "lerna run start --parallel --ignore @docspace/common --ignore @docspace/components --ignore @docspace/browserslist-config-asc",
"start:personal": "lerna run start:personal --parallel --scope {@docspace/client,@docspace/people,@docspace/files,@docspace/editor}",
"start-prod": "lerna run start-prod --parallel --ignore @docspace/common --ignore @docspace/components --ignore @docspace/browserslist-config-asc",
"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",
"sw-build": "workbox injectManifest config/workbox-config.js && yarn sw-modify && yarn sw-minimize",
"sw-build:personal": "workbox injectManifest config/workbox-config.js && yarn sw-modify:personal && yarn sw-minimize",
"sw-files-editor-replace": "replace-in-files --string='products/ASC.Files/editor/' --replacement='products/files/doceditor/' build/deploy/public/sw.js",
"sw-files-replace": "replace-in-files --string='products/ASC.Files/client/' --replacement='products/files/' build/deploy/public/sw.js",
"sw-minimize": "yarn terser --compress --mangle -- build/deploy/public/sw.js --output build/deploy/public/sw.js",
"sw-modify": "yarn sw-files-replace && yarn sw-files-editor-replace && yarn sw-people-replace && yarn sw-studio-replace && yarn sw-studio-login-replace && yarn sw-public-replace",
"sw-modify:personal": "yarn sw-files-replace && yarn sw-files-editor-replace && yarn sw-people-replace && yarn sw-studio-replace && yarn sw-public-replace",
"sw-people-replace": "replace-in-files --string='products/ASC.People/client/' --replacement='products/people/' build/deploy/public/sw.js",
"sw-public-replace": "replace-in-files --string='public/' --replacement='static/' build/deploy/public/sw.js",
"sw-studio-login-replace": "replace-in-files --string='studio/login/' --replacement='login/' build/deploy/public/sw.js",
"sw-studio-replace": "replace-in-files --string='studio/client/' --replacement='/' build/deploy/public/sw.js",
"test": "yarn workspace @docspace/components test",
"wipe": "shx rm -rf node_modules yarn.lock web/**/node_modules products/**/node_modules",
"wipe": "shx rm -rf node_modules yarn.lock packages/**/node_modules",
"debug-info": "auto-changelog --unreleased-only --template debuginfo --output public/debuginfo.md",
"e2e.test": "lerna run test:sequential --parallel --scope {@docspace/people,@docspace/files,@docspace/login}",
"e2e.test:sequential": "yarn workspace @docspace/people test:sequential && yarn workspace @docspace/files test:sequential && yarn workspace @docspace/login test:sequential",
"e2e.test:model": "yarn workspace @docspace/people test:model && yarn workspace @docspace/files test:model && yarn workspace @docspace/login test:model",
"e2e.test:translation": "lerna run test:translation:model --parallel --scope {@docspace/people,@docspace/files} && lerna run test:translation --parallel --scope {@docspace/people,@docspace/files}",
"e2e.test:translation:personal": "lerna run test:translation:model:personal --parallel --scope {@docspace/people,@docspace/files} && lerna run test:translation:personal --parallel --scope {@docspace/people,@docspace/files}"
"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",
"e2e.test:translation": "yarn workspaces foreach -vptiR --from '{@docspace/client,@docspace/login}' run test:translation:model"
},
"devDependencies": {
"auto-changelog": "https://github.com/ONLYOFFICE/auto-changelog.git#master",
"lerna": "3.22.1",
"replace-in-files-cli": "^1.0.0",
"shx": "^0.3.3",
"terser": "^5.8.0",
"workbox-cli": "^6.3.0"
"terser": "^5.8.0"
},
"dependencies": {}
"packageManager": "yarn@3.2.2"
}

6
packages/browserslist-config-asc/package.json
View File

@ -1,13 +1,13 @@
{
"name": "@appserver/browserslist-config-asc",
"name": "@docspace/browserslist-config-asc",
"version": "1.2.0",
"description": "Shared browserslist for AppServer libraries and apps",
"description": "Shared browserslist for DocSpace libraries and apps",
"main": "browserlist.config.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [
"appserver",
"docspace",
"browserslist"
]
}

12
packages/client/package.json
View File

@ -5,7 +5,6 @@
"homepage": "",
"scripts": {
"build": "webpack --mode production",
"build:personal": "webpack --mode production --env personal=true",
"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",
@ -13,7 +12,6 @@
"deploy": "shx --silent mkdir -p ../../build/deploy/studio/client && shx cp -r dist/* ../../build/deploy/studio/client",
"serve": "serve dist -p 5001",
"start": "webpack-cli serve",
"start:personal": "webpack-cli serve --env personal=true",
"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",
@ -41,13 +39,13 @@
"test:ui:mobile": "cross-env DEVICE_TYPE=mobile npx codecept-ui"
},
"dependencies": {
"firebase": "^8.10.0",
"react-markdown": "^7.0.1",
"react-smartbanner": "^5.1.4",
"react-string-format": "^0.1.4",
"copy-to-clipboard": "^3.3.1",
"file-saver": "^2.0.5",
"react-hotkeys-hook": "^3.4.4"
"firebase": "^8.10.0",
"react-hotkeys-hook": "^3.4.4",
"react-markdown": "^7.0.1",
"react-smartbanner": "^5.1.4",
"react-string-format": "^0.1.4"
},
"devDependencies": {
"@babel/core": "^7.15.5",

1
packages/common/api/rooms/filter.js
View File

@ -1,5 +1,4 @@
import { getObjectByLocation, toUrlParams } from "../../utils";
import queryString from "query-string";
import { RoomSearchArea } from "../../constants";
const PAGE = "page";

4
packages/common/constants/sharedDependencies.js
View File

@ -158,4 +158,8 @@ module.exports = {
singleton: true,
requiredVersion: deps["sjcl"],
},
"query-string": {
singleton: true,
requiredVersion: deps["query-string"],
},
};

1
packages/common/package.json
View File

@ -20,6 +20,7 @@
"mobx-react": "^7.2.0",
"moment": "^2.29.1",
"prop-types": "^15.7.2",
"query-string": "7.1.1",
"re-resizable": "^6.9.0",
"react": "^17.0.2",
"react-autosize-textarea": "^7.1.0",

11
packages/editor/package.json
View File

@ -5,24 +5,15 @@
"homepage": "/doceditor",
"scripts": {
"build": "yarn clean && yarn build:client && yarn build:server",
"build:personal": "yarn clean && yarn build:client-personal && yarn build:server-personal",
"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-personal": "webpack --mode production --env personal=true --config webpack/webpack.server.js",
"build:client-personal": "webpack --mode production --env personal=true --config webpack/webpack.client.js",
"build:dev-server-personal": "webpack --env personal=true --config webpack/webpack.server.js",
"build:dev-client-personal": "webpack --env personal=true --config webpack/webpack.client.js",
"clean": "shx rm -rf dist",
"start": "yarn clean && npm-run-all --parallel start:*",
"start-personal": "yarn clean && npm-run-all --parallel start-personal:* ",
"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-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/editor && shx cp -r dist/* ../../build/deploy/editor"
},
"devDependencies": {

47728
yarn.lock
View File

File diff suppressed because it is too large Load Diff