Skip to content

Commit 3f090e3

Browse files
committed
Merge branch 'staging-new'
Signed-off-by: Alexander Onnikov <[email protected]>
2 parents f4cab6b + 5efac2d commit 3f090e3

File tree

391 files changed

+6425
-3595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

391 files changed

+6425
-3595
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"MODEL_JSON": "${workspaceRoot}/models/all/bundle/model.json",
9898
// "SERVER_PROVIDER":"uweb"
9999
"SERVER_PROVIDER": "ws",
100-
"MODEL_VERSION": "0.7.186",
100+
"MODEL_VERSION": "0.7.230",
101101
// "VERSION": "0.6.289",
102102
"COMMUNICATION_API_ENABLED": "true",
103103
"ELASTIC_INDEX_NAME": "local_storage_index",

common/config/rush/pnpm-lock.yaml

Lines changed: 2289 additions & 2337 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/scripts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"format": "echo \"No format specified\""
66
},
77
"devDependencies": {
8-
"esbuild": "^0.24.2",
8+
"esbuild": "^0.25.9",
99
"sharp": "~0.34.3"
1010
},
1111
"private": true

desktop/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
"eslint-plugin-promise": "^6.1.1",
6262
"eslint": "^8.54.0",
6363
"prettier": "^3.1.0",
64-
"esbuild": "^0.24.2",
65-
"esbuild-loader": "^4.0.3",
64+
"esbuild": "^0.25.9",
65+
"esbuild-loader": "^4.3.0",
6666
"svelte-preprocess": "^5.1.3",
6767
"@types/ws": "^8.5.11",
6868
"jest": "^29.7.0",
@@ -261,11 +261,14 @@
261261
"@hcengineering/huly-mail": "^0.6.0",
262262
"@hcengineering/huly-mail-assets": "^0.6.0",
263263
"@hcengineering/huly-mail-resources": "^0.6.0",
264+
"@hcengineering/home": "^0.6.0",
265+
"@hcengineering/home-assets": "^0.6.0",
266+
"@hcengineering/home-resources": "^0.6.0",
264267
"electron-squirrel-startup": "~1.0.0",
265268
"dotenv": "~16.0.0",
266269
"electron-context-menu": "^4.0.4",
267270
"electron-windows-badge": "^1.1.0",
268-
"svelte": "^4.2.19",
271+
"svelte": "^4.2.20",
269272
"commander": "^8.1.0",
270273
"electron-store": "^8.2.0",
271274
"electron-log": "^5.1.7",

desktop/src/ui/platform.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import { achievementId } from '@hcengineering/achievement'
6969
import communication, { communicationId } from '@hcengineering/communication'
7070
import { emojiId } from '@hcengineering/emoji'
7171
import { hulyMailId } from '@hcengineering/huly-mail'
72+
import { homeId } from '@hcengineering/home'
7273
import billingPlugin, { billingId } from '@hcengineering/billing'
7374

7475
import '@hcengineering/activity-assets'
@@ -127,6 +128,7 @@ import '@hcengineering/media-assets'
127128
import '@hcengineering/communication-assets'
128129
import '@hcengineering/billing-assets'
129130
import '@hcengineering/huly-mail-assets'
131+
import '@hcengineering/home-assets'
130132

131133
import analyticsCollector, { analyticsCollectorId } from '@hcengineering/analytics-collector'
132134
import { coreId } from '@hcengineering/core'
@@ -249,6 +251,7 @@ function configureI18n (): void {
249251
addStringsLoader(emojiId, async (lang: string) => await import(`@hcengineering/emoji-assets/lang/${lang}.json`))
250252
addStringsLoader(billingId, async (lang: string) => await import(`@hcengineering/billing-assets/lang/${lang}.json`))
251253
addStringsLoader(hulyMailId, async (lang: string) => await import(`@hcengineering/huly-mail-assets/lang/${lang}.json`))
254+
addStringsLoader(homeId, async (lang: string) => await import(`@hcengineering/home-assets/lang/${lang}.json`))
252255
}
253256

254257
export class PlatformBranding {
@@ -420,8 +423,9 @@ export async function configurePlatform (onWorkbenchConnect?: () => Promise<void
420423
addLocation(achievementId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/achievement-resources'))
421424
addLocation(communicationId, () => import(/* webpackChunkName: "communication" */ '@hcengineering/communication-resources'))
422425
addLocation(emojiId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/emoji-resources'))
423-
addLocation(billingId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/billing-resources'))
424-
addLocation(hulyMailId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/huly-mail-resources'))
426+
addLocation(billingId, () => import(/* webpackChunkName: "billing" */ '@hcengineering/billing-resources'))
427+
addLocation(hulyMailId, () => import(/* webpackChunkName: "huly-mail" */ '@hcengineering/huly-mail-resources'))
428+
addLocation(homeId, () => import(/* webpackChunkName: "home" */ '@hcengineering/home-resources'))
425429

426430
setMetadata(client.metadata.FilterModel, 'ui')
427431
setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin])

dev/doc-import-tool/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"eslint-plugin-n": "^15.4.0",
3030
"eslint": "^8.54.0",
3131
"ts-node": "^10.8.0",
32-
"esbuild": "^0.24.2",
32+
"esbuild": "^0.25.9",
3333
"@types/minio": "~7.0.11",
3434
"@types/node": "^22.15.29",
3535
"@typescript-eslint/parser": "^6.11.0",

dev/docker-compose.min.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
cockroach:
3-
image: cockroachdb/cockroach:latest-v24.2
3+
image: cockroachdb/cockroach:latest-v24.3
44
extra_hosts:
55
- 'huly.local:host-gateway'
66
ports:

dev/docker-compose.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ services:
4141
- 4040:4040
4242
restart: unless-stopped
4343
cockroach:
44-
image: cockroachdb/cockroach:latest-v24.2
44+
image: cockroachdb/cockroach:latest-v24.3
4545
extra_hosts:
4646
- 'huly.local:host-gateway'
4747
ports:
@@ -499,6 +499,25 @@ services:
499499
- QUEUE_CONFIG=${QUEUE_CONFIG}
500500
- OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318/v1/traces
501501
restart: unless-stopped
502+
hulylake:
503+
image: hardcoreeng/hulylake
504+
extra_hosts:
505+
- 'huly.local:host-gateway'
506+
depends_on:
507+
minio:
508+
condition: service_healthy
509+
cockroach:
510+
condition: service_started
511+
ports:
512+
- 8096:8096
513+
environment:
514+
- HULY_TOKEN_SECRET=secret
515+
- HULY_DB_CONNECTION=${DB_CR_URL}
516+
- AWS_ENDPOINT_URL=http://minio:9000
517+
- AWS_REGION=local
518+
- AWS_ACCESS_KEY_ID=minioadmin
519+
- AWS_SECRET_ACCESS_KEY=minioadmin
520+
restart: unless-stopped
502521
hulykvs:
503522
image: hardcoreeng/hulykvs
504523
depends_on:

dev/import-tool/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@typescript-eslint/eslint-plugin": "^6.11.0",
3737
"eslint": "^8.54.0",
3838
"ts-node": "^10.8.0",
39-
"esbuild": "^0.24.2",
39+
"esbuild": "^0.25.9",
4040
"@types/node": "^22.15.29",
4141
"@typescript-eslint/parser": "^6.11.0",
4242
"typescript": "^5.8.3",

0 commit comments

Comments
 (0)