diff --git a/eslint.config.mjs b/eslint.config.mjs index 5ac78f89afb..103a1e3f748 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -643,11 +643,10 @@ export default tseslint.config( // Within a package, import sibling code via relative paths rather than the package's own // `@bitwarden/*` alias. Scoped to libs here; the rule self-limits to the file's owning package. // https://contributing.bitwarden.com/contributing/code-style/web/typescript#imports-within-the-same-package - // TODO: change to "error" once existing self-alias imports are converted (run `eslint --fix`). { files: ["libs/**/*.ts", "bitwarden_license/bit-common/src/**/*.ts"], rules: { - "@bitwarden/platform/no-self-package-import": "off", + "@bitwarden/platform/no-self-package-import": "error", }, }, diff --git a/libs/angular/src/auth/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts b/libs/angular/src/auth/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts index 8c7d99d701d..c485775c10d 100644 --- a/libs/angular/src/auth/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts +++ b/libs/angular/src/auth/self-hosted-env-config-dialog/self-hosted-env-config-dialog.component.ts @@ -11,7 +11,6 @@ import { } from "@angular/forms"; import { Subject, firstValueFrom, take, filter, takeUntil } from "rxjs"; -import { JslibModule } from "@bitwarden/angular/jslib.module"; import { EnvironmentService, Region, @@ -30,6 +29,8 @@ import { TypographyModule, } from "@bitwarden/components"; +import { JslibModule } from "../../jslib.module"; + /** * Validator for self-hosted environment settings form. * It enforces that at least one URL is provided. diff --git a/libs/common/src/billing/models/response/premium-checkout-session.response.ts b/libs/common/src/billing/models/response/premium-checkout-session.response.ts index a4b889cf33f..06b1a65737a 100644 --- a/libs/common/src/billing/models/response/premium-checkout-session.response.ts +++ b/libs/common/src/billing/models/response/premium-checkout-session.response.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from "@bitwarden/common/models/response/base.response"; +import { BaseResponse } from "../../../models/response/base.response"; export class PremiumCheckoutSessionResponse extends BaseResponse { checkoutSessionUrl: string; diff --git a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.spec.ts b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.spec.ts index a81f34886d8..a07a72b8efa 100644 --- a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.spec.ts +++ b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.spec.ts @@ -1,6 +1,5 @@ import { mock } from "jest-mock-extended"; -import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; // eslint-disable-next-line no-restricted-imports import { BiometricStateService, @@ -14,6 +13,7 @@ import { UserKeyRotationServiceAbstraction } from "@bitwarden/user-crypto-manage import { ClientType } from "../../enums"; import { ConfigService } from "../../platform/abstractions/config/config.service"; import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service"; +import { SdkService } from "../../platform/abstractions/sdk/sdk.service"; import { SyncService } from "../../platform/sync"; import { UserId } from "../../types/guid"; import { CipherService } from "../../vault/abstractions/cipher.service"; diff --git a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts index f2fdc9bfd7c..2e40a97e060 100644 --- a/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts +++ b/libs/common/src/key-management/encrypted-migrator/default-encrypted-migrator.ts @@ -1,4 +1,3 @@ -import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; // eslint-disable-next-line no-restricted-imports import { BiometricStateService, @@ -13,6 +12,7 @@ import { assertNonNullish } from "../../auth/utils"; import { ClientType } from "../../enums"; import { ConfigService } from "../../platform/abstractions/config/config.service"; import { PlatformUtilsService } from "../../platform/abstractions/platform-utils.service"; +import { SdkService } from "../../platform/abstractions/sdk/sdk.service"; import { SyncService } from "../../platform/sync"; import { UserId } from "../../types/guid"; import { CipherService } from "../../vault/abstractions/cipher.service"; diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts index 46d05732873..5d1efc4dbae 100644 --- a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts +++ b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts @@ -1,7 +1,6 @@ import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, firstValueFrom, of } from "rxjs"; -import { V2UpgradeTokenStateService } from "@bitwarden/common/key-management/upgrade-token/abstractions/v2-upgrade-token-state.service.abstraction"; // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop. // eslint-disable-next-line no-restricted-imports import { KdfConfigService, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management"; @@ -17,6 +16,7 @@ import { import { ApiService } from "../../../abstractions/api.service"; import { AccountCryptographicStateService } from "../../../key-management/account-cryptography/account-cryptographic-state.service"; import { EncryptedString } from "../../../key-management/crypto/models/enc-string"; +import { V2UpgradeTokenStateService } from "../../../key-management/upgrade-token/abstractions/v2-upgrade-token-state.service.abstraction"; import { UserId } from "../../../types/guid"; import { UserKey } from "../../../types/key"; import { ConfigService } from "../../abstractions/config/config.service"; diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.ts b/libs/common/src/platform/services/sdk/default-sdk.service.ts index a80ab147365..28cc6cd1bef 100644 --- a/libs/common/src/platform/services/sdk/default-sdk.service.ts +++ b/libs/common/src/platform/services/sdk/default-sdk.service.ts @@ -20,7 +20,6 @@ import { filter, } from "rxjs"; -import { V2UpgradeTokenStateService } from "@bitwarden/common/key-management/upgrade-token/abstractions/v2-upgrade-token-state.service.abstraction"; // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop. // eslint-disable-next-line no-restricted-imports import { KeyService, KdfConfigService } from "@bitwarden/key-management"; @@ -39,6 +38,7 @@ import { AccountInfo, AccountService } from "../../../auth/abstractions/account. import { AccountCryptographicStateService } from "../../../key-management/account-cryptography/account-cryptographic-state.service"; import { EncString } from "../../../key-management/crypto/models/enc-string"; import { JsWasmStateBridge } from "../../../key-management/state-bridge"; +import { V2UpgradeTokenStateService } from "../../../key-management/upgrade-token/abstractions/v2-upgrade-token-state.service.abstraction"; import { OrganizationId, UserId } from "../../../types/guid"; import { ConfigService } from "../../abstractions/config/config.service"; import { Environment, EnvironmentService } from "../../abstractions/environment.service";