build: fix

MaSch0212 · Jun 22, 2024 · cbda2e5 · cbda2e5
1 parent efadfda
commit cbda2e5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/client/angular.json b/src/client/angular.json
@@ -52,14 +52,24 @@
                 "inject": false
               }
             ],
-            "scripts": []
+            "scripts": [],
+            "externalDependencies": ["http", "https", "url", "util", "net"],
+            "allowedCommonJsDependencies": [
+              "copy-to-clipboard",
+              "tough-cookie",
+              "node-fetch",
+              "fetch-cookie",
+              "abort-controller",
+              "ws",
+              "eventsource"
+            ]
           },
           "configurations": {
             "production": {
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "600kb",
+                  "maximumWarning": "800kb",
                   "maximumError": "1mb"
                 },
                 {

diff --git a/src/client/src/app/components/app/menu/menu.component.ts b/src/client/src/app/components/app/menu/menu.component.ts
@@ -9,7 +9,7 @@ import { ButtonModule } from 'primeng/button';
 import { MenuModule } from 'primeng/menu';
 import { MenubarModule } from 'primeng/menubar';
 import { TooltipModule } from 'primeng/tooltip';
-import { fromEvent, merge, startWith } from 'rxjs';
+import { filter, fromEvent, map, merge } from 'rxjs';
 
 import { selectAppTitle } from '../../../+state/app';
 import { AuthService } from '../../../services/auth.service';
@@ -39,8 +39,6 @@ export class MenuComponent {
   private readonly _swUpdate = inject(SwUpdate);
   private readonly _realtimeEventsService = inject(RealtimeEventsService);
 
-  private readonly _versionInfo = toSignal(this._swUpdate.versionUpdates);
-
   protected readonly translations = this._translateService.translations;
   protected readonly title = chainSignals(this._store.selectSignal(selectAppTitle), title =>
     computed(() =>
@@ -51,8 +49,12 @@ export class MenuComponent {
   protected readonly isAdmin = computed(
     () => this._authService.user()?.roles.includes('admin') ?? false
   );
-  protected readonly newVersionAvailable = computed(
-    () => this._versionInfo()?.type === 'VERSION_READY'
+  protected readonly newVersionAvailable = toSignal(
+    this._swUpdate.versionUpdates.pipe(
+      filter(x => x.type === 'VERSION_READY'),
+      map(() => true)
+    ),
+    { initialValue: false }
   );
 
   protected readonly menuItems = computed<MenuItem[]>(() => [
@@ -99,7 +101,7 @@ export class MenuComponent {
   constructor() {
     if (this._swUpdate.isEnabled) {
       merge(fromEvent(document, 'visibilitychange'), this._realtimeEventsService.onReconnected$)
-        .pipe(startWith(null), takeUntilDestroyed())
+        .pipe(takeUntilDestroyed())
         .subscribe(() => {
           if (!document.hidden) {
             console.info('Checking for updates...');