From fbe86da98b5f94ea1221b3c0ef2fdfcacb17ca45 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Tue, 22 Apr 2025 11:59:52 +0200 Subject: [PATCH] Only import BrowserModule once (#14354) Desktop imported BrowserModule & BrowserAnimationModule multiple times which can result in compile errors. Following the patterns used in our other clients this updates the BrowserModule import to only occur in app.module. --- apps/desktop/src/app/app.module.ts | 3 +++ apps/desktop/src/app/shared/shared.module.ts | 10 +++------- .../app/vault/vault-filter/vault-filter.module.ts | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index b892324a979..c84f1a96afd 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -4,6 +4,7 @@ import "zone.js"; import "../platform/app/locales"; import { NgModule } from "@angular/core"; +import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ColorPasswordCountPipe } from "@bitwarden/angular/pipes/color-password-count.pipe"; import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe"; @@ -44,6 +45,8 @@ import { SharedModule } from "./shared/shared.module"; @NgModule({ imports: [ + BrowserAnimationsModule, + SharedModule, AppRoutingModule, VaultFilterModule, diff --git a/apps/desktop/src/app/shared/shared.module.ts b/apps/desktop/src/app/shared/shared.module.ts index e08d29c4d12..6eed4a197f3 100644 --- a/apps/desktop/src/app/shared/shared.module.ts +++ b/apps/desktop/src/app/shared/shared.module.ts @@ -2,11 +2,9 @@ import { A11yModule } from "@angular/cdk/a11y"; import { DragDropModule } from "@angular/cdk/drag-drop"; import { OverlayModule } from "@angular/cdk/overlay"; import { ScrollingModule } from "@angular/cdk/scrolling"; -import { DatePipe } from "@angular/common"; +import { CommonModule, DatePipe } from "@angular/common"; import { NgModule } from "@angular/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { BrowserModule } from "@angular/platform-browser"; -import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { JslibModule } from "@bitwarden/angular/jslib.module"; @@ -15,9 +13,8 @@ import { ServicesModule } from "../services/services.module"; @NgModule({ imports: [ + CommonModule, A11yModule, - BrowserAnimationsModule, - BrowserModule, DragDropModule, FormsModule, JslibModule, @@ -28,9 +25,8 @@ import { ServicesModule } from "../services/services.module"; ], declarations: [AvatarComponent], exports: [ + CommonModule, A11yModule, - BrowserAnimationsModule, - BrowserModule, DatePipe, DragDropModule, FormsModule, diff --git a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts index fb6706bef1c..8729996c835 100644 --- a/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts +++ b/apps/desktop/src/vault/app/vault/vault-filter/vault-filter.module.ts @@ -1,5 +1,5 @@ +import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; -import { BrowserModule } from "@angular/platform-browser"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { DeprecatedVaultFilterService as DeprecatedVaultFilterServiceAbstraction } from "@bitwarden/angular/vault/abstractions/deprecated-vault-filter.service"; @@ -13,7 +13,7 @@ import { TypeFilterComponent } from "./filters/type-filter.component"; import { VaultFilterComponent } from "./vault-filter.component"; @NgModule({ - imports: [BrowserModule, JslibModule], + imports: [CommonModule, JslibModule], declarations: [ VaultFilterComponent, CollectionFilterComponent,