wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-05 06:49:30 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix merge

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2025-03-11 21:22:57 +07:00
parent 7ff824a058
commit d1a45c0fe6
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
1 changed files with 44 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
common/config/rush/pnpm-lock.yaml
View File

@ -1526,8 +1526,8 @@ importers:
specifier: ^1.6.51
version: 1.6.52
body-parser:
specifier: ^1.20.2
version: 1.20.2
specifier: ^1.20.3
version: 1.20.3
browserslist:
specifier: ^4.24.4
version: 4.24.4
@ -1682,8 +1682,8 @@ importers:
specifier: ^2.0.22
version: 2.0.23
express-static-gzip:
specifier: ^2.1.7
version: 2.1.7
specifier: ^2.2.0
version: 2.2.0
fast-copy:
specifier: ^3.0.2
version: 3.0.2
@ -4145,7 +4145,7 @@ packages:
version: 0.0.0
'@rush-temp/collaborator@file:projects/collaborator.tgz':
resolution: {integrity: sha512-58uWn3sX/3Q8iYkKKwysct13g+bT9rfTw8JaLFLH5rJFfSorpRjtypQ29SVTUwSO+e7xm8BkH5XVOaqk5b1OBQ==, tarball: file:projects/collaborator.tgz}
resolution: {integrity: sha512-DAobq7zacOGPkImlSNuvMCcyPPlTOwIbq3cUqBctpCdW5eMnFNQ4CnT9esY6cukmwTide6BD6yCaaQjZa29B1w==, tarball: file:projects/collaborator.tgz}
version: 0.0.0
'@rush-temp/contact-assets@file:projects/contact-assets.tgz':
@ -4249,7 +4249,7 @@ packages:
version: 0.0.0
'@rush-temp/front@file:projects/front.tgz':
resolution: {integrity: sha512-nZ678oTwK/1srj53UHe1oNdkBUp3MrZdjxt0ptqXNkNWdPyFpQwe1PMinygBjU2+EmmygnCgvJTnQ+HtyWXtiQ==, tarball: file:projects/front.tgz}
resolution: {integrity: sha512-t6oP1muD7Iak/twk/CA8ZjclTWr5UVtTQRfUW5IE+r+WF0sthZtTrLpMHrCHhInaSMx+tp2UAGM6k1SWwNv3dQ==, tarball: file:projects/front.tgz}
version: 0.0.0
'@rush-temp/github-assets@file:projects/github-assets.tgz':
@ -4813,7 +4813,7 @@ packages:
version: 0.0.0
'@rush-temp/pod-front@file:projects/pod-front.tgz':
resolution: {integrity: sha512-XJIJr89EKyo2BNEgx6vOpEelpSHnUlNA3EfFDfN2rjS36akL7FPNYksmJ5XpDmyXWyNDkzt54f905X79RwTitw==, tarball: file:projects/pod-front.tgz}
resolution: {integrity: sha512-QqOjSuA/TCsyJ2dcUngqeocZvZq5cpE1y+3mttFGjhSsFNMLmNDnmHN5a7Bs357ctxk9ytvxw0fxSeed3Yem5w==, tarball: file:projects/pod-front.tgz}
version: 0.0.0
'@rush-temp/pod-fulltext@file:projects/pod-fulltext.tgz':
@ -4821,7 +4821,7 @@ packages:
version: 0.0.0
'@rush-temp/pod-github@file:projects/pod-github.tgz':
resolution: {integrity: sha512-fzeprH8VrdbEOKPKWmNQ2uzdSVDwhiOxaQEbx3A6WqmAiv0ftltnkBJsegz5Pa80BpG7rFi7nVUj3HTU+iSc+Q==, tarball: file:projects/pod-github.tgz}
resolution: {integrity: sha512-C7LDyem/l//iprtV9qcTrCXHgo0X2PHCE9GRLVOIigdOUqutRqcNlZ5EO1bJZOfUaaIgWGkiqGUhFwYgtvL64w==, tarball: file:projects/pod-github.tgz}
version: 0.0.0
'@rush-temp/pod-gmail@file:projects/pod-gmail.tgz':
@ -4977,7 +4977,7 @@ packages:
version: 0.0.0
'@rush-temp/rekoni-service@file:projects/rekoni-service.tgz':
resolution: {integrity: sha512-B36vBrx2VBzD93psOJ3qPhyolM81Fz9OnzhcbhGiDal1XCEIoXpICMpYXXgO1phsr1nsXyQkQ3f9EnGATJAWGA==, tarball: file:projects/rekoni-service.tgz}
resolution: {integrity: sha512-drU6icafREaUYcSZfNn/CEYQLJC1ha6FkF7QrRcQ/TsuFaruapqmET0Ttqcr/vQaYemKF6SnshiKRGmeg+tcDA==, tarball: file:projects/rekoni-service.tgz}
version: 0.0.0
'@rush-temp/rekoni@file:projects/rekoni.tgz':
@ -5301,7 +5301,7 @@ packages:
version: 0.0.0
'@rush-temp/server-ws@file:projects/server-ws.tgz':
resolution: {integrity: sha512-0Jjc3+GOrp80rAP/J2kmp3AXBYF9fHOmISUbnmAorBQaj/I+H2vLmUSGBOunFFmRoU4RBfF2pWNjw3PvVjE9oA==, tarball: file:projects/server-ws.tgz}
resolution: {integrity: sha512-HVC0aZUzHRCMfCdm5FrR8FOY4tEktiQuLuJvQaf7t5WrJKACF3etsJhYaLqQKqumlSXQSS8d9OYka3HZC9C+8w==, tarball: file:projects/server-ws.tgz}
version: 0.0.0
'@rush-temp/server@file:projects/server.tgz':
@ -7218,10 +7218,6 @@ packages:
bn.js@4.12.0:
resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
body-parser@1.20.2:
resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
body-parser@1.20.3:
resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
@ -8865,8 +8861,8 @@ packages:
resolution: {integrity: sha512-Efm2t+xL6vEqUPs4kAyBY9xG/8LGpbSVnnFLZw6HgdxHzSRlg2/sNlA2UdMlcIKMH+LDOn7NKXUDGJK125F4rw==}
engines: {node: '>=10.7.0'}
express-static-gzip@2.1.7:
resolution: {integrity: sha512-QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw==}
express-static-gzip@2.2.0:
resolution: {integrity: sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==}
express@4.21.2:
resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==}
@ -11825,10 +11821,6 @@ packages:
pure-rand@6.0.4:
resolution: {integrity: sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==}
qs@6.11.0:
resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
engines: {node: '>=0.6'}
qs@6.11.2:
resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
engines: {node: '>=0.6'}
@ -12195,10 +12187,6 @@ packages:
engines: {node: '>=10'}
hasBin: true
send@0.18.0:
resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
engines: {node: '>= 0.8.0'}
send@0.19.0:
resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
engines: {node: '>= 0.8.0'}
@ -12214,10 +12202,6 @@ packages:
resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==}
engines: {node: '>= 0.8.0'}
serve-static@1.15.0:
resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
engines: {node: '>= 0.8.0'}
serve-static@1.16.2:
resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
engines: {node: '>= 0.8.0'}
@ -14232,7 +14216,7 @@ snapshots:
'@babel/traverse': 7.23.9
'@babel/types': 7.23.9
convert-source-map: 2.0.0
debug: 4.3.5
debug: 4.4.0
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@ -14515,7 +14499,7 @@ snapshots:
'@electron/notarize@2.5.0':
dependencies:
debug: 4.3.5
debug: 4.4.0
fs-extra: 9.1.0
promise-retry: 2.0.1
transitivePeerDependencies:
@ -14524,7 +14508,7 @@ snapshots:
'@electron/osx-sign@1.3.1':
dependencies:
compare-version: 0.1.2
debug: 4.3.5
debug: 4.4.0
fs-extra: 10.1.0
isbinaryfile: 4.0.10
minimist: 1.2.8
@ -14536,7 +14520,7 @@ snapshots:
dependencies:
'@malept/cross-spawn-promise': 2.0.0
chalk: 4.1.2
debug: 4.3.5
debug: 4.4.0
detect-libc: 2.0.2
fs-extra: 10.1.0
got: 11.8.6
@ -14555,7 +14539,7 @@ snapshots:
dependencies:
'@electron/asar': 3.2.10
'@malept/cross-spawn-promise': 2.0.0
debug: 4.3.5
debug: 4.4.0
dir-compare: 4.2.0
fs-extra: 11.2.0
minimatch: 9.0.5
@ -15478,7 +15462,7 @@ snapshots:
'@malept/flatpak-bundler@0.4.0':
dependencies:
debug: 4.3.5
debug: 4.4.0
fs-extra: 9.1.0
lodash: 4.17.21
tmp-promise: 3.0.3
@ -16052,7 +16036,7 @@ snapshots:
'@puppeteer/browsers@2.3.0':
dependencies:
debug: 4.3.5
debug: 4.4.0
extract-zip: 2.0.1
progress: 2.0.3
proxy-agent: 6.4.0
@ -17366,7 +17350,7 @@ snapshots:
'@types/ws': 8.5.11
'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
'@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
body-parser: 1.20.2
body-parser: 1.20.3
cors: 2.8.5
cross-env: 7.0.3
esbuild: 0.24.2
@ -18223,7 +18207,7 @@ snapshots:
'@types/uuid': 8.3.4
'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
'@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
body-parser: 1.20.2
body-parser: 1.20.3
cors: 2.8.5
cross-env: 7.0.3
eslint: 8.56.0
@ -18233,7 +18217,7 @@ snapshots:
eslint-plugin-promise: 6.1.1(eslint@8.56.0)
express: 4.21.2
express-fileupload: 1.5.1
express-static-gzip: 2.1.7
express-static-gzip: 2.2.0
jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))
morgan: 1.10.0
prettier: 3.2.5
@ -21324,7 +21308,7 @@ snapshots:
'@types/uuid': 8.3.4
'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
'@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
body-parser: 1.20.2
body-parser: 1.20.3
cors: 2.8.5
cross-env: 7.0.3
esbuild: 0.24.2
@ -21429,7 +21413,7 @@ snapshots:
'@types/ws': 8.5.11
'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
'@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
body-parser: 1.20.2
body-parser: 1.20.3
cors: 2.8.5
cross-env: 7.0.3
dotenv: 16.0.3
@ -22822,7 +22806,7 @@ snapshots:
'@types/sharp': 0.32.0
'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
'@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
body-parser: 1.20.2
body-parser: 1.20.3
cors: 2.8.5
dotenv: 16.0.3
email-addresses: 5.0.0
@ -24911,7 +24895,7 @@ snapshots:
'@types/ws': 8.5.11
'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
'@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
body-parser: 1.20.2
body-parser: 1.20.3
bufferutil: 4.0.8
cors: 2.8.5
eslint: 8.56.0
@ -28149,7 +28133,7 @@ snapshots:
'@typescript-eslint/scope-manager': 5.62.0
'@typescript-eslint/type-utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3)
'@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3)
debug: 4.3.5
debug: 4.4.0
eslint: 8.56.0
graphemer: 1.4.0
ignore: 5.3.1
@ -28226,7 +28210,7 @@ snapshots:
'@typescript-eslint/scope-manager': 5.62.0
'@typescript-eslint/types': 5.62.0
'@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
debug: 4.3.5
debug: 4.4.0
eslint: 8.56.0
optionalDependencies:
typescript: 5.3.3
@ -28286,7 +28270,7 @@ snapshots:
dependencies:
'@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
'@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3)
debug: 4.3.5
debug: 4.4.0
eslint: 8.56.0
tsutils: 3.21.0(typescript@5.3.3)
optionalDependencies:
@ -28338,7 +28322,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 5.62.0
'@typescript-eslint/visitor-keys': 5.62.0
debug: 4.3.5
debug: 4.4.0
globby: 11.1.0
is-glob: 4.0.3
semver: 7.6.3
@ -28630,13 +28614,13 @@ snapshots:
agent-base@6.0.2:
dependencies:
debug: 4.3.5
debug: 4.4.0
transitivePeerDependencies:
- supports-color
agent-base@7.1.1:
dependencies:
debug: 4.3.5
debug: 4.4.0
transitivePeerDependencies:
- supports-color
@ -29075,21 +29059,6 @@ snapshots:
bn.js@4.12.0: {}
body-parser@1.20.2:
dependencies:
bytes: 3.1.2
content-type: 1.0.5
debug: 2.6.9
depd: 2.0.0
destroy: 1.2.0
http-errors: 2.0.0
iconv-lite: 0.4.24
on-finished: 2.4.1
qs: 6.11.0
raw-body: 2.5.2
type-is: 1.6.18
unpipe: 1.0.0
body-parser@1.20.3:
dependencies:
bytes: 3.1.2
@ -31136,9 +31105,10 @@ snapshots:
fs-extra: 9.1.0
signal-exit: 3.0.7
express-static-gzip@2.1.7:
express-static-gzip@2.2.0:
dependencies:
serve-static: 1.15.0
parseurl: 1.3.3
serve-static: 1.16.2
express@4.21.2:
dependencies:
@ -31922,14 +31892,14 @@ snapshots:
dependencies:
'@tootallnate/once': 2.0.0
agent-base: 6.0.2
debug: 4.3.5
debug: 4.4.0
transitivePeerDependencies:
- supports-color
http-proxy-agent@7.0.2:
dependencies:
agent-base: 7.1.1
debug: 4.3.5
debug: 4.4.0
transitivePeerDependencies:
- supports-color
@ -31970,7 +31940,7 @@ snapshots:
https-proxy-agent@7.0.5:
dependencies:
agent-base: 7.1.1
debug: 4.3.5
debug: 4.4.0
transitivePeerDependencies:
- supports-color
@ -32306,7 +32276,7 @@ snapshots:
istanbul-lib-source-maps@4.0.1:
dependencies:
debug: 4.3.5
debug: 4.4.0
istanbul-lib-coverage: 3.2.2
source-map: 0.6.1
transitivePeerDependencies:
@ -34528,7 +34498,7 @@ snapshots:
proxy-agent@6.4.0:
dependencies:
agent-base: 7.1.1
debug: 4.3.5
debug: 4.4.0
http-proxy-agent: 7.0.2
https-proxy-agent: 7.0.5
lru-cache: 7.18.3
@ -34562,7 +34532,7 @@ snapshots:
dependencies:
'@puppeteer/browsers': 2.3.0
chromium-bidi: 0.6.2(devtools-protocol@0.0.1312386)
debug: 4.3.5
debug: 4.4.0
devtools-protocol: 0.0.1312386
ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
transitivePeerDependencies:
@ -34584,10 +34554,6 @@ snapshots:
pure-rand@6.0.4: {}
qs@6.11.0:
dependencies:
side-channel: 1.0.6
qs@6.11.2:
dependencies:
side-channel: 1.0.5
@ -34649,7 +34615,7 @@ snapshots:
read-binary-file-arch@1.0.6:
dependencies:
debug: 4.3.5
debug: 4.4.0
transitivePeerDependencies:
- supports-color
@ -34960,22 +34926,6 @@ snapshots:
semver@7.6.3: {}
send@0.18.0:
dependencies:
debug: 2.6.9
depd: 2.0.0
destroy: 1.2.0
encodeurl: 1.0.2
escape-html: 1.0.3
etag: 1.8.1
fresh: 0.5.2
http-errors: 2.0.0
mime: 1.6.0
ms: 2.1.3
on-finished: 2.4.1
range-parser: 1.2.1
statuses: 2.0.1
send@0.19.0:
dependencies:
debug: 2.6.9
@ -35011,13 +34961,6 @@ snapshots:
mime-types: 2.1.35
parseurl: 1.3.3
serve-static@1.15.0:
dependencies:
encodeurl: 1.0.2
escape-html: 1.0.3
parseurl: 1.3.3
send: 0.18.0
serve-static@1.16.2:
dependencies:
encodeurl: 2.0.0
@ -35290,7 +35233,7 @@ snapshots:
spdy@4.0.2:
dependencies:
debug: 4.3.5
debug: 4.4.0
handle-thing: 2.0.1
http-deceiver: 1.2.7
select-hose: 2.0.0
@ -35518,7 +35461,7 @@ snapshots:
dependencies:
component-emitter: 1.3.1
cookiejar: 2.1.4
debug: 4.3.5
debug: 4.4.0
fast-safe-stringify: 2.1.1
form-data: 4.0.0
formidable: 2.1.2