Merge remote-tracking branch 'origin/develop' into staging

Signed-off-by: Andrey Sobolev <[email protected]>
hcengineering · Dec 25, 2024 · f1d12e7 · f1d12e7
2 parents e8db59c + fa4dc0d
commit f1d12e7
Show file tree

Hide file tree

Showing 41 changed files with 1,120 additions and 1,548 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/scripts/package.json b/common/scripts/package.json
@@ -5,7 +5,7 @@
     "format": "echo \"No format specified\""
   },
   "devDependencies": {
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "sharp": "~0.32.0"
   },
   "private": true

diff --git a/desktop/package.json b/desktop/package.json
@@ -58,7 +58,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint": "^8.54.0",
     "prettier": "^3.1.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "esbuild-loader": "^4.0.3",
     "svelte-preprocess": "^5.1.3",
     "@types/ws": "^8.5.11"

diff --git a/dev/doc-import-tool/package.json b/dev/doc-import-tool/package.json
@@ -33,7 +33,7 @@
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
     "ts-node": "^10.8.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@types/minio": "~7.0.11",
     "@types/node": "~20.11.16",
     "@typescript-eslint/parser": "^6.11.0",

diff --git a/dev/import-tool/package.json b/dev/import-tool/package.json
@@ -36,7 +36,7 @@
     "@typescript-eslint/eslint-plugin": "^6.11.0",
     "eslint": "^8.54.0",
     "ts-node": "^10.8.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@types/node": "~20.11.16",
     "@typescript-eslint/parser": "^6.11.0",
     "typescript": "^5.3.3",

diff --git a/dev/prod/package.json b/dev/prod/package.json
@@ -47,7 +47,7 @@
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "update-browserslist-db": "^1.1.0",
     "browserslist": "^4.23.3",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "esbuild-loader": "^4.0.3",
     "typescript": "^5.3.3",
     "svelte-preprocess": "^5.1.3"

diff --git a/dev/tool/package.json b/dev/tool/package.json
@@ -41,7 +41,7 @@
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
     "ts-node": "^10.8.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@types/minio": "~7.0.11",
     "@types/node": "~20.11.16",
     "@typescript-eslint/parser": "^6.11.0",

diff --git a/models/all/package.json b/models/all/package.json
@@ -31,7 +31,7 @@
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",
     "typescript": "^5.3.3",
-    "esbuild": "^0.20.0"
+    "esbuild": "^0.24.2"
   },
   "dependencies": {
     "@hcengineering/model": "^0.6.11",

diff --git a/packages/collaborator-client/package.json b/packages/collaborator-client/package.json
@@ -30,7 +30,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@typescript-eslint/parser": "^6.11.0",
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",

diff --git a/packages/platform-rig/bin/compile.js b/packages/platform-rig/bin/compile.js
@@ -172,6 +172,7 @@ async function performESBuild(filesToTranspile) {
     sourcemap: 'linked',
     allowOverwrite: true,
     format: 'cjs',
+    color: true,
     plugins: [
       copy({
         // this is equal to process.cwd(), which means we use cwd path as base path to resolve `to` path
@@ -181,7 +182,7 @@ async function performESBuild(filesToTranspile) {
           from: [args[1] + '/**/*.json'],
           to: ['./lib'],
         },
-        watch: true,
+        watch: false
       })
     ]
   })

diff --git a/packages/platform-rig/package.json b/packages/platform-rig/package.json
@@ -8,8 +8,8 @@
   "devDependencies": {
     "eslint-config-standard-with-typescript": "^40.0.0",
     "svelte-eslint-parser": "^0.33.1",
-    "esbuild": "^0.20.0",
-    "esbuild-svelte": "^0.8.0",
+    "esbuild": "^0.24.2",
+    "esbuild-svelte": "^0.9.0",
     "esbuild-plugin-copy": "~2.1.1"
   },
   "dependencies": {

diff --git a/plugins/workbench-resources/src/workbench.ts b/plugins/workbench-resources/src/workbench.ts
@@ -54,14 +54,13 @@ let prevTabId: Ref<WorkbenchTab> | undefined
 tabIdStore.subscribe((value) => {
   prevTabIdStore.set(prevTabId)
   prevTabId = value
+  saveTabToLocalStorage(value)
 })
 
 locationWorkspaceStore.subscribe((workspace) => {
   tabIdStore.set(getTabFromLocalStorage(workspace ?? ''))
 })
 
-tabIdStore.subscribe(saveTabToLocalStorage)
-
 const syncTabLoc = reduceCalls(async (): Promise<void> => {
   const loc = getCurrentLocation()
   const workspace = get(locationWorkspaceStore)
@@ -84,11 +83,14 @@ const syncTabLoc = reduceCalls(async (): Promise<void> => {
     if (t.name !== name) return false
 
     const tabLoc = getTabLocation(t)
+    if (tabLoc.path[2] !== loc.path[2]) return false
+    if (tabLoc.path[2] === notificationId) return true
 
-    return tabLoc.path[2] === loc.path[2] && tabLoc.path[3] === loc.path[3]
+    return tabLoc.path[3] === loc.path[3]
   })
 
   if (tab.name !== undefined && name !== tab.name && tab.isPinned) {
+    if (get(tabIdStore) !== tab._id) return
     if (tabByName !== undefined) {
       selectTab(tabByName._id)
       return
@@ -127,7 +129,7 @@ const syncTabLoc = reduceCalls(async (): Promise<void> => {
   }
 })
 
-locationStore.subscribe((l: Location) => {
+locationStore.subscribe(() => {
   void syncTabLoc()
 })
 

diff --git a/pods/account/package.json b/pods/account/package.json
@@ -37,7 +37,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@types/koa-bodyparser": "^4.3.12",
     "@types/koa-router": "^7.4.8",
     "@types/koa": "^2.15.0",

diff --git a/pods/backup/package.json b/pods/backup/package.json
@@ -38,7 +38,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@typescript-eslint/parser": "^6.11.0",
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",

diff --git a/pods/collaborator/package.json b/pods/collaborator/package.json
@@ -36,7 +36,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@typescript-eslint/parser": "^6.11.0",
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",

diff --git a/pods/front/package.json b/pods/front/package.json
@@ -43,7 +43,7 @@
     "@types/express-fileupload": "^1.1.7",
     "@types/uuid": "^8.3.1",
     "@types/cors": "^2.8.12",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "prettier": "^3.1.0",
     "typescript": "^5.3.3",
     "@types/body-parser": "~1.19.2",

diff --git a/pods/fulltext/package.json b/pods/fulltext/package.json
@@ -37,7 +37,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@typescript-eslint/parser": "^6.11.0",
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",

diff --git a/pods/server/package.json b/pods/server/package.json
@@ -42,7 +42,7 @@
     "eslint-config-prettier": "^8.8.0",
     "@types/ws": "^8.5.11",
     "ts-node": "^10.8.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@typescript-eslint/parser": "^6.11.0",
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",

diff --git a/pods/stats/package.json b/pods/stats/package.json
@@ -36,7 +36,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@types/koa-bodyparser": "^4.3.12",
     "@types/koa-router": "^7.4.8",
     "@types/koa": "^2.15.0",

diff --git a/pods/workspace/package.json b/pods/workspace/package.json
@@ -37,7 +37,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@typescript-eslint/parser": "^6.11.0",
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",

diff --git a/server/account-service/package.json b/server/account-service/package.json
@@ -27,7 +27,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@types/koa-bodyparser": "^4.3.12",
     "@types/koa-router": "^7.4.8",
     "@types/koa": "^2.15.0",

diff --git a/server/collaborator/package.json b/server/collaborator/package.json
@@ -30,7 +30,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@typescript-eslint/parser": "^6.11.0",
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",

diff --git a/server/server-pipeline/package.json b/server/server-pipeline/package.json
@@ -27,7 +27,7 @@
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
     "ts-node": "^10.8.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@typescript-eslint/parser": "^6.11.0",
     "eslint-config-standard-with-typescript": "^40.0.0",
     "prettier": "^3.1.0",

diff --git a/server/workspace-service/package.json b/server/workspace-service/package.json
@@ -26,7 +26,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-n": "^15.4.0",
     "eslint": "^8.54.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.2",
     "@types/koa-bodyparser": "^4.3.12",
     "@types/koa-router": "^7.4.8",
     "@types/koa": "^2.15.0",

diff --git a/services/ai-bot/love-agent/package.json b/services/ai-bot/love-agent/package.json
@@ -40,9 +40,9 @@
   },
   "dependencies": {
     "@deepgram/sdk": "^3.9.0",
-    "@livekit/agents": "^0.5.1",
-    "@livekit/rtc-node": "^0.12.1",
-    "@livekit/agents-plugin-openai": "^0.7.1",
+    "@livekit/agents": "^0.6.0",
+    "@livekit/rtc-node": "^0.12.2",
+    "@livekit/agents-plugin-openai": "^0.7.3",
     "dotenv": "^16.4.5"
   }
 }