From 2de71c63106d350a0df3046b451a4e767c83a011 Mon Sep 17 00:00:00 2001 From: Bojan Kucera Date: Mon, 9 Jun 2025 20:49:48 -0400 Subject: [PATCH] fixes --- bun.lock | 11 +++++---- scripts/build-all.bat | 55 +++++++++++++++++++++++++++++++++++++++---- scripts/build-all.ps1 | 32 +++++++++++++------------ 3 files changed, 74 insertions(+), 24 deletions(-) diff --git a/bun.lock b/bun.lock index 9203204..e94cb36 100644 --- a/bun.lock +++ b/bun.lock @@ -378,6 +378,9 @@ }, }, }, + "trustedDependencies": [ + "mongodb", + ], "packages": { "@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="], @@ -763,7 +766,7 @@ "@sigstore/core": ["@sigstore/core@2.0.0", "", {}, "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg=="], - "@sigstore/protobuf-specs": ["@sigstore/protobuf-specs@0.4.2", "", {}, "sha512-F2ye+n1INNhqT0MW+LfUEvTUPc/nS70vICJcxorKl7/gV9CO39+EDCw+qHNKEqvsDWk++yGVKCbzK1qLPvmC8g=="], + "@sigstore/protobuf-specs": ["@sigstore/protobuf-specs@0.4.3", "", {}, "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA=="], "@sigstore/sign": ["@sigstore/sign@3.1.0", "", { "dependencies": { "@sigstore/bundle": "^3.1.0", "@sigstore/core": "^2.0.0", "@sigstore/protobuf-specs": "^0.4.0", "make-fetch-happen": "^14.0.2", "proc-log": "^5.0.0", "promise-retry": "^2.0.1" } }, "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw=="], @@ -1169,7 +1172,7 @@ "ee-first": ["ee-first@1.1.1", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="], - "electron-to-chromium": ["electron-to-chromium@1.5.165", "", {}, "sha512-naiMx1Z6Nb2TxPU6fiFrUrDTjyPMLdTtaOd2oLmG8zVSg2hCWGkhPyxwk+qRmZ1ytwVqUv0u7ZcDA5+ALhaUtw=="], + "electron-to-chromium": ["electron-to-chromium@1.5.166", "", {}, "sha512-QPWqHL0BglzPYyJJ1zSSmwFFL6MFXhbACOCcsCdUMCkzPdS9/OIBVxg516X/Ado2qwAq8k0nJJ7phQPCqiaFAw=="], "emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="], @@ -1187,7 +1190,7 @@ "ent": ["ent@2.2.2", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "punycode": "^1.4.1", "safe-regex-test": "^1.1.0" } }, "sha512-kKvD1tO6BM+oK9HzCPpUdRb4vKFQY/FPTFmurMvh6LlN68VMrdj77w8yp51/kDbpkFOS9J8w5W6zIzgM2H8/hw=="], - "entities": ["entities@6.0.0", "", {}, "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw=="], + "entities": ["entities@6.0.1", "", {}, "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="], "env-paths": ["env-paths@2.2.1", "", {}, "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="], @@ -1631,7 +1634,7 @@ "normalize-range": ["normalize-range@0.1.2", "", {}, "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="], - "normalize-url": ["normalize-url@8.0.1", "", {}, "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w=="], + "normalize-url": ["normalize-url@8.0.2", "", {}, "sha512-Ee/R3SyN4BuynXcnTaekmaVdbDAEiNrHqjQIA37mHU8G9pf7aaAD4ZX3XjBLo6rsdcxA/gtkcNYZLt30ACgynw=="], "npm-bundled": ["npm-bundled@4.0.0", "", { "dependencies": { "npm-normalize-package-bin": "^4.0.0" } }, "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA=="], diff --git a/scripts/build-all.bat b/scripts/build-all.bat index ae5fc63..a558060 100644 --- a/scripts/build-all.bat +++ b/scripts/build-all.bat @@ -19,11 +19,56 @@ if %ERRORLEVEL% NEQ 0 ( REM Step 2: Build apps with Turbo (excluding dashboard) echo 🏗️ Building applications with Turbo... -call turbo run build --filter="./apps/data-service" --filter="./apps/execution-service" --filter="./apps/portfolio-service" --filter="./apps/processing-service" --filter="./apps/strategy-service" -if %ERRORLEVEL% NEQ 0 ( - echo ❌ Turbo app build failed - cd /d "%ORIGINAL_DIR%" - exit /b 1 + +REM Check if each app exists and build individually +if exist "apps\data-service" ( + echo Building data-service... + call turbo run build --filter="./apps/data-service" + if %ERRORLEVEL% NEQ 0 ( + echo ❌ data-service build failed + cd /d "%ORIGINAL_DIR%" + exit /b 1 + ) +) + +if exist "apps\execution-service" ( + echo Building execution-service... + call turbo run build --filter="./apps/execution-service" + if %ERRORLEVEL% NEQ 0 ( + echo ❌ execution-service build failed + cd /d "%ORIGINAL_DIR%" + exit /b 1 + ) +) + +if exist "apps\portfolio-service" ( + echo Building portfolio-service... + call turbo run build --filter="./apps/portfolio-service" + if %ERRORLEVEL% NEQ 0 ( + echo ❌ portfolio-service build failed + cd /d "%ORIGINAL_DIR%" + exit /b 1 + ) +) + +if exist "apps\processing-service" ( + echo Building processing-service... + call turbo run build --filter="./apps/processing-service" + if %ERRORLEVEL% NEQ 0 ( + echo ❌ processing-service build failed + cd /d "%ORIGINAL_DIR%" + exit /b 1 + ) +) + +if exist "apps\strategy-service" ( + echo Building strategy-service... + call turbo run build --filter="./apps/strategy-service" + if %ERRORLEVEL% NEQ 0 ( + echo ❌ strategy-service build failed + cd /d "%ORIGINAL_DIR%" + exit /b 1 + ) ) REM Step 3: Build dashboard with Angular CLI diff --git a/scripts/build-all.ps1 b/scripts/build-all.ps1 index 991d07d..7b2837f 100644 --- a/scripts/build-all.ps1 +++ b/scripts/build-all.ps1 @@ -29,26 +29,28 @@ try { & powershell ./scripts/build-libs.ps1 if ($LASTEXITCODE -ne 0) { throw "Library build failed" - } - - # Step 3: Build apps with Turbo (excluding dashboard) + } # Step 3: Build apps with Turbo (excluding dashboard) Write-Host "🏗️ Building applications with Turbo..." -ForegroundColor Green # Get list of apps excluding dashboard $appDirs = Get-ChildItem -Path "apps" -Directory | Where-Object { $_.Name -ne "dashboard" } - $appFilters = $appDirs | ForEach-Object { "./apps/$($_.Name)" } - if ($appFilters.Count -gt 0) { - $filterArg = $appFilters -join " " - $turboCmd = "turbo run build --filter=`"$filterArg`"" - - if ($Verbose) { - Write-Host "Running: $turboCmd" -ForegroundColor DarkGray - } - - Invoke-Expression $turboCmd - if ($LASTEXITCODE -ne 0) { - throw "Turbo app build failed" + if ($appDirs.Count -gt 0) { + # Build each app individually to avoid filter syntax issues + foreach ($app in $appDirs) { + $appPath = "./apps/$($app.Name)" + Write-Host " Building $($app.Name)..." -ForegroundColor Cyan + + $turboCmd = "turbo run build --filter=$appPath" + + if ($Verbose) { + Write-Host " Running: $turboCmd" -ForegroundColor DarkGray + } + + Invoke-Expression $turboCmd + if ($LASTEXITCODE -ne 0) { + throw "Failed to build app: $($app.Name)" + } } Write-Host "✅ Apps built successfully: $($appDirs.Name -join ', ')" -ForegroundColor Green