From 52ace2de8cd2d9bb2c12f0e6b53c883b064fed88 Mon Sep 17 00:00:00 2001 From: Derek Nance Date: Fri, 13 Feb 2026 16:07:46 -0600 Subject: [PATCH] shared OSS app module --- apps/desktop/src/app/app.module.ts | 56 +--------------- apps/desktop/src/app/oss.module.ts | 65 +++++++++++++++++++ .../bit-desktop/src/app/app.module.ts | 5 +- 3 files changed, 70 insertions(+), 56 deletions(-) create mode 100644 apps/desktop/src/app/oss.module.ts diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index 24e4e3994f9..db6c5483778 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -4,64 +4,14 @@ 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"; -import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service"; -import { CalloutModule, DialogModule, ToastContainerComponent } from "@bitwarden/components"; -import { AssignCollectionsComponent } from "@bitwarden/vault"; - -import { DeleteAccountComponent } from "../auth/delete-account.component"; -import { LoginModule } from "../auth/login/login.module"; -import { SshAgentService } from "../autofill/services/ssh-agent.service"; -import { PremiumComponent } from "../billing/app/accounts/premium.component"; -import { DesktopPremiumUpgradePromptService } from "../services/desktop-premium-upgrade-prompt.service"; -import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module"; -import { VaultV2Component } from "../vault/app/vault/vault-v2.component"; import { AppRoutingModule } from "./app-routing.module"; import { AppComponent } from "./app.component"; -import { UserVerificationComponent } from "./components/user-verification.component"; -import { AccountSwitcherComponent } from "./layout/account-switcher.component"; -import { HeaderComponent } from "./layout/header.component"; -import { NavComponent } from "./layout/nav.component"; -import { SearchComponent } from "./layout/search/search.component"; -import { SharedModule } from "./shared/shared.module"; +import { OssModule } from "./oss.module"; @NgModule({ - imports: [ - BrowserAnimationsModule, - SharedModule, - AppRoutingModule, - VaultFilterModule, - LoginModule, - DialogModule, - CalloutModule, - DeleteAccountComponent, - UserVerificationComponent, - NavComponent, - AssignCollectionsComponent, - VaultV2Component, - ToastContainerComponent, - ], - declarations: [ - AccountSwitcherComponent, - AppComponent, - ColorPasswordPipe, - ColorPasswordCountPipe, - HeaderComponent, - PremiumComponent, - SearchComponent, - ], - exports: [HeaderComponent, ToastContainerComponent], - providers: [ - SshAgentService, - { - provide: PremiumUpgradePromptService, - useClass: DesktopPremiumUpgradePromptService, - }, - ], + imports: [OssModule, AppRoutingModule], + declarations: [AppComponent], bootstrap: [AppComponent], }) export class AppModule {} diff --git a/apps/desktop/src/app/oss.module.ts b/apps/desktop/src/app/oss.module.ts new file mode 100644 index 00000000000..a94e3231330 --- /dev/null +++ b/apps/desktop/src/app/oss.module.ts @@ -0,0 +1,65 @@ +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"; +import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service"; +import { CalloutModule, DialogModule, ToastContainerComponent } from "@bitwarden/components"; +import { AssignCollectionsComponent } from "@bitwarden/vault"; + +import { DeleteAccountComponent } from "../auth/delete-account.component"; +import { LoginModule } from "../auth/login/login.module"; +import { SshAgentService } from "../autofill/services/ssh-agent.service"; +import { PremiumComponent } from "../billing/app/accounts/premium.component"; +import { DesktopPremiumUpgradePromptService } from "../services/desktop-premium-upgrade-prompt.service"; +import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module"; +import { VaultV2Component } from "../vault/app/vault/vault-v2.component"; + +import { UserVerificationComponent } from "./components/user-verification.component"; +import { AccountSwitcherComponent } from "./layout/account-switcher.component"; +import { HeaderComponent } from "./layout/header.component"; +import { NavComponent } from "./layout/nav.component"; +import { SearchComponent } from "./layout/search/search.component"; +import { SharedModule } from "./shared/shared.module"; + +@NgModule({ + imports: [ + SharedModule, + BrowserAnimationsModule, + VaultFilterModule, + LoginModule, + DialogModule, + CalloutModule, + DeleteAccountComponent, + UserVerificationComponent, + NavComponent, + AssignCollectionsComponent, + VaultV2Component, + ToastContainerComponent, + ], + declarations: [ + AccountSwitcherComponent, + ColorPasswordPipe, + ColorPasswordCountPipe, + HeaderComponent, + PremiumComponent, + SearchComponent, + ], + exports: [ + SharedModule, + AccountSwitcherComponent, + HeaderComponent, + PremiumComponent, + SearchComponent, + ToastContainerComponent, + ], + providers: [ + SshAgentService, + { + provide: PremiumUpgradePromptService, + useClass: DesktopPremiumUpgradePromptService, + }, + ], + bootstrap: [], +}) +export class OssModule {} diff --git a/bitwarden_license/bit-desktop/src/app/app.module.ts b/bitwarden_license/bit-desktop/src/app/app.module.ts index 2583dc6e2b9..9563328e18a 100644 --- a/bitwarden_license/bit-desktop/src/app/app.module.ts +++ b/bitwarden_license/bit-desktop/src/app/app.module.ts @@ -3,17 +3,16 @@ import "zone.js"; // Register the locales for the application import "@bitwarden/desktop/platform/app/locales"; -import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; import { AppRoutingModule as OssRoutingModule } from "@bitwarden/desktop/app/app-routing.module"; -import { AppModule as OssModule } from "@bitwarden/desktop/app/app.module"; +import { OssModule } from "@bitwarden/desktop/app/oss.module"; import { AppRoutingModule } from "./app-routing.module"; import { AppComponent } from "./app.component"; @NgModule({ - imports: [CommonModule, OssModule, OssRoutingModule, AppRoutingModule], + imports: [OssModule, OssRoutingModule, AppRoutingModule], declarations: [AppComponent], bootstrap: [AppComponent], })