-
-
-
-
-
- {{ "codeSent" | i18n }}
-
-
-
-
-
-
- {{ "confirmIdentity" | i18n }}
-
-
diff --git a/jslib/angular/src/components/user-verification.component.ts b/jslib/angular/src/components/user-verification.component.ts
deleted file mode 100644
index 5504796e..00000000
--- a/jslib/angular/src/components/user-verification.component.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { animate, style, transition, trigger } from "@angular/animations";
-import { Component, OnInit } from "@angular/core";
-import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from "@angular/forms";
-
-import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
-import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
-import { VerificationType } from "jslib-common/enums/verificationType";
-import { Verification } from "jslib-common/types/verification";
-
-/**
- * Used for general-purpose user verification throughout the app.
- * Collects the user's master password, or if they are using Key Connector, prompts for an OTP via email.
- * This is exposed to the parent component via the ControlValueAccessor interface (e.g. bind it to a FormControl).
- * Use UserVerificationService to verify the user's input.
- */
-@Component({
- selector: "app-user-verification",
- templateUrl: "user-verification.component.html",
- providers: [
- {
- provide: NG_VALUE_ACCESSOR,
- multi: true,
- useExisting: UserVerificationComponent,
- },
- ],
- animations: [
- trigger("sent", [
- transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
- ]),
- ],
-})
-export class UserVerificationComponent implements ControlValueAccessor, OnInit {
- usesKeyConnector = false;
- disableRequestOTP = false;
- sentCode = false;
-
- secret = new FormControl("");
-
- private onChange: (value: Verification) => void;
-
- constructor(
- private keyConnectorService: KeyConnectorService,
- private userVerificationService: UserVerificationService
- ) {}
-
- async ngOnInit() {
- this.usesKeyConnector = await this.keyConnectorService.getUsesKeyConnector();
- this.processChanges(this.secret.value);
-
- this.secret.valueChanges.subscribe((secret: string) => this.processChanges(secret));
- }
-
- async requestOTP() {
- if (this.usesKeyConnector) {
- this.disableRequestOTP = true;
- try {
- await this.userVerificationService.requestOTP();
- this.sentCode = true;
- } finally {
- this.disableRequestOTP = false;
- }
- }
- }
-
- writeValue(obj: any): void {
- this.secret.setValue(obj);
- }
-
- registerOnChange(fn: any): void {
- this.onChange = fn;
- }
-
- registerOnTouched(fn: any): void {
- // Not implemented
- }
-
- setDisabledState?(isDisabled: boolean): void {
- this.disableRequestOTP = isDisabled;
- if (isDisabled) {
- this.secret.disable();
- } else {
- this.secret.enable();
- }
- }
-
- private processChanges(secret: string) {
- if (this.onChange == null) {
- return;
- }
-
- this.onChange({
- type: this.usesKeyConnector ? VerificationType.OTP : VerificationType.MasterPassword,
- secret: secret,
- });
- }
-}
diff --git a/jslib/angular/src/directives/api-action.directive.ts b/jslib/angular/src/directives/api-action.directive.ts
index 3d121726..25dba7f2 100644
--- a/jslib/angular/src/directives/api-action.directive.ts
+++ b/jslib/angular/src/directives/api-action.directive.ts
@@ -1,7 +1,7 @@
import { Directive, ElementRef, Input, OnChanges } from "@angular/core";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { ErrorResponse } from "jslib-common/models/response/errorResponse";
+import { LogService } from "@/jslib/common/src/abstractions/log.service";
+import { ErrorResponse } from "@/jslib/common/src/models/response/errorResponse";
import { ValidationService } from "../services/validation.service";
diff --git a/jslib/angular/src/directives/autofocus.directive.ts b/jslib/angular/src/directives/autofocus.directive.ts
index 5c5997fa..f7b60b1f 100644
--- a/jslib/angular/src/directives/autofocus.directive.ts
+++ b/jslib/angular/src/directives/autofocus.directive.ts
@@ -1,7 +1,7 @@
import { Directive, ElementRef, Input, NgZone } from "@angular/core";
import { take } from "rxjs/operators";
-import { Utils } from "jslib-common/misc/utils";
+import { Utils } from "@/jslib/common/src/misc/utils";
@Directive({
selector: "[appAutofocus]",
diff --git a/jslib/angular/src/pipes/i18n.pipe.ts b/jslib/angular/src/pipes/i18n.pipe.ts
index 8fc09434..50651740 100644
--- a/jslib/angular/src/pipes/i18n.pipe.ts
+++ b/jslib/angular/src/pipes/i18n.pipe.ts
@@ -1,6 +1,6 @@
import { Pipe, PipeTransform } from "@angular/core";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
@Pipe({
name: "i18n",
diff --git a/jslib/angular/src/pipes/search-ciphers.pipe.ts b/jslib/angular/src/pipes/search-ciphers.pipe.ts
index e8bdd13e..aae299af 100644
--- a/jslib/angular/src/pipes/search-ciphers.pipe.ts
+++ b/jslib/angular/src/pipes/search-ciphers.pipe.ts
@@ -1,6 +1,6 @@
import { Pipe, PipeTransform } from "@angular/core";
-import { CipherView } from "jslib-common/models/view/cipherView";
+import { CipherView } from "@/jslib/common/src/models/view/cipherView";
@Pipe({
name: "searchCiphers",
diff --git a/jslib/angular/src/scss/bwicons/styles/style.scss b/jslib/angular/src/scss/bwicons/styles/style.scss
index e8c05f23..17a33e10 100644
--- a/jslib/angular/src/scss/bwicons/styles/style.scss
+++ b/jslib/angular/src/scss/bwicons/styles/style.scss
@@ -1,5 +1,5 @@
$icomoon-font-family: "bwi-font" !default;
-$icomoon-font-path: "~@bitwarden/jslib-angular/src/scss/bwicons/fonts/" !default;
+$icomoon-font-path: "/jslib/angular/src/scss/bwicons/fonts/" !default;
// New font sheet? Update the font-face information below
@font-face {
diff --git a/jslib/angular/src/services/auth-guard.service.ts b/jslib/angular/src/services/auth-guard.service.ts
index 8c06e438..ea16b739 100644
--- a/jslib/angular/src/services/auth-guard.service.ts
+++ b/jslib/angular/src/services/auth-guard.service.ts
@@ -1,10 +1,10 @@
import { Injectable } from "@angular/core";
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router";
-import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
+import { KeyConnectorService } from "@/jslib/common/src/abstractions/keyConnector.service";
+import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
@Injectable()
export class AuthGuardService implements CanActivate {
diff --git a/jslib/angular/src/services/broadcaster.service.ts b/jslib/angular/src/services/broadcaster.service.ts
index 36218405..786327f6 100644
--- a/jslib/angular/src/services/broadcaster.service.ts
+++ b/jslib/angular/src/services/broadcaster.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from "@angular/core";
-import { BroadcasterService as BaseBroadcasterService } from "jslib-common/services/broadcaster.service";
+import { BroadcasterService as BaseBroadcasterService } from "@/jslib/common/src/services/broadcaster.service";
@Injectable()
export class BroadcasterService extends BaseBroadcasterService {}
diff --git a/jslib/angular/src/services/jslib-services.module.ts b/jslib/angular/src/services/jslib-services.module.ts
index 8d8aa85b..9333d016 100644
--- a/jslib/angular/src/services/jslib-services.module.ts
+++ b/jslib/angular/src/services/jslib-services.module.ts
@@ -1,78 +1,78 @@
import { Injector, LOCALE_ID, NgModule } from "@angular/core";
-import { ApiService as ApiServiceAbstraction } from "jslib-common/abstractions/api.service";
-import { AppIdService as AppIdServiceAbstraction } from "jslib-common/abstractions/appId.service";
-import { AuditService as AuditServiceAbstraction } from "jslib-common/abstractions/audit.service";
-import { AuthService as AuthServiceAbstraction } from "jslib-common/abstractions/auth.service";
-import { BroadcasterService as BroadcasterServiceAbstraction } from "jslib-common/abstractions/broadcaster.service";
-import { CipherService as CipherServiceAbstraction } from "jslib-common/abstractions/cipher.service";
-import { CollectionService as CollectionServiceAbstraction } from "jslib-common/abstractions/collection.service";
-import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service";
-import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "jslib-common/abstractions/cryptoFunction.service";
-import { EnvironmentService as EnvironmentServiceAbstraction } from "jslib-common/abstractions/environment.service";
-import { EventService as EventServiceAbstraction } from "jslib-common/abstractions/event.service";
-import { ExportService as ExportServiceAbstraction } from "jslib-common/abstractions/export.service";
-import { FileUploadService as FileUploadServiceAbstraction } from "jslib-common/abstractions/fileUpload.service";
-import { FolderService as FolderServiceAbstraction } from "jslib-common/abstractions/folder.service";
-import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service";
-import { KeyConnectorService as KeyConnectorServiceAbstraction } from "jslib-common/abstractions/keyConnector.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { MessagingService as MessagingServiceAbstraction } from "jslib-common/abstractions/messaging.service";
-import { NotificationsService as NotificationsServiceAbstraction } from "jslib-common/abstractions/notifications.service";
-import { OrganizationService as OrganizationServiceAbstraction } from "jslib-common/abstractions/organization.service";
-import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "jslib-common/abstractions/passwordGeneration.service";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service";
-import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service";
-import { PolicyService as PolicyServiceAbstraction } from "jslib-common/abstractions/policy.service";
-import { ProviderService as ProviderServiceAbstraction } from "jslib-common/abstractions/provider.service";
-import { SearchService as SearchServiceAbstraction } from "jslib-common/abstractions/search.service";
-import { SendService as SendServiceAbstraction } from "jslib-common/abstractions/send.service";
-import { SettingsService as SettingsServiceAbstraction } from "jslib-common/abstractions/settings.service";
-import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service";
-import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service";
-import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service";
-import { SyncService as SyncServiceAbstraction } from "jslib-common/abstractions/sync.service";
-import { TokenService as TokenServiceAbstraction } from "jslib-common/abstractions/token.service";
-import { TotpService as TotpServiceAbstraction } from "jslib-common/abstractions/totp.service";
-import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service";
-import { UserVerificationService as UserVerificationServiceAbstraction } from "jslib-common/abstractions/userVerification.service";
-import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "jslib-common/abstractions/usernameGeneration.service";
-import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service";
-import { StateFactory } from "jslib-common/factories/stateFactory";
-import { Account } from "jslib-common/models/domain/account";
-import { GlobalState } from "jslib-common/models/domain/globalState";
-import { ApiService } from "jslib-common/services/api.service";
-import { AppIdService } from "jslib-common/services/appId.service";
-import { AuditService } from "jslib-common/services/audit.service";
-import { AuthService } from "jslib-common/services/auth.service";
-import { CipherService } from "jslib-common/services/cipher.service";
-import { CollectionService } from "jslib-common/services/collection.service";
-import { ConsoleLogService } from "jslib-common/services/consoleLog.service";
-import { CryptoService } from "jslib-common/services/crypto.service";
-import { EnvironmentService } from "jslib-common/services/environment.service";
-import { EventService } from "jslib-common/services/event.service";
-import { ExportService } from "jslib-common/services/export.service";
-import { FileUploadService } from "jslib-common/services/fileUpload.service";
-import { FolderService } from "jslib-common/services/folder.service";
-import { KeyConnectorService } from "jslib-common/services/keyConnector.service";
-import { NotificationsService } from "jslib-common/services/notifications.service";
-import { OrganizationService } from "jslib-common/services/organization.service";
-import { PasswordGenerationService } from "jslib-common/services/passwordGeneration.service";
-import { PolicyService } from "jslib-common/services/policy.service";
-import { ProviderService } from "jslib-common/services/provider.service";
-import { SearchService } from "jslib-common/services/search.service";
-import { SendService } from "jslib-common/services/send.service";
-import { SettingsService } from "jslib-common/services/settings.service";
-import { StateService } from "jslib-common/services/state.service";
-import { StateMigrationService } from "jslib-common/services/stateMigration.service";
-import { SyncService } from "jslib-common/services/sync.service";
-import { TokenService } from "jslib-common/services/token.service";
-import { TotpService } from "jslib-common/services/totp.service";
-import { TwoFactorService } from "jslib-common/services/twoFactor.service";
-import { UserVerificationService } from "jslib-common/services/userVerification.service";
-import { UsernameGenerationService } from "jslib-common/services/usernameGeneration.service";
-import { VaultTimeoutService } from "jslib-common/services/vaultTimeout.service";
-import { WebCryptoFunctionService } from "jslib-common/services/webCryptoFunction.service";
+import { ApiService as ApiServiceAbstraction } from "@/jslib/common/src/abstractions/api.service";
+import { AppIdService as AppIdServiceAbstraction } from "@/jslib/common/src/abstractions/appId.service";
+import { AuditService as AuditServiceAbstraction } from "@/jslib/common/src/abstractions/audit.service";
+import { AuthService as AuthServiceAbstraction } from "@/jslib/common/src/abstractions/auth.service";
+import { BroadcasterService as BroadcasterServiceAbstraction } from "@/jslib/common/src/abstractions/broadcaster.service";
+import { CipherService as CipherServiceAbstraction } from "@/jslib/common/src/abstractions/cipher.service";
+import { CollectionService as CollectionServiceAbstraction } from "@/jslib/common/src/abstractions/collection.service";
+import { CryptoService as CryptoServiceAbstraction } from "@/jslib/common/src/abstractions/crypto.service";
+import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@/jslib/common/src/abstractions/cryptoFunction.service";
+import { EnvironmentService as EnvironmentServiceAbstraction } from "@/jslib/common/src/abstractions/environment.service";
+import { EventService as EventServiceAbstraction } from "@/jslib/common/src/abstractions/event.service";
+import { ExportService as ExportServiceAbstraction } from "@/jslib/common/src/abstractions/export.service";
+import { FileUploadService as FileUploadServiceAbstraction } from "@/jslib/common/src/abstractions/fileUpload.service";
+import { FolderService as FolderServiceAbstraction } from "@/jslib/common/src/abstractions/folder.service";
+import { I18nService as I18nServiceAbstraction } from "@/jslib/common/src/abstractions/i18n.service";
+import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@/jslib/common/src/abstractions/keyConnector.service";
+import { LogService } from "@/jslib/common/src/abstractions/log.service";
+import { MessagingService as MessagingServiceAbstraction } from "@/jslib/common/src/abstractions/messaging.service";
+import { NotificationsService as NotificationsServiceAbstraction } from "@/jslib/common/src/abstractions/notifications.service";
+import { OrganizationService as OrganizationServiceAbstraction } from "@/jslib/common/src/abstractions/organization.service";
+import { PasswordGenerationService as PasswordGenerationServiceAbstraction } from "@/jslib/common/src/abstractions/passwordGeneration.service";
+import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@/jslib/common/src/abstractions/passwordReprompt.service";
+import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@/jslib/common/src/abstractions/platformUtils.service";
+import { PolicyService as PolicyServiceAbstraction } from "@/jslib/common/src/abstractions/policy.service";
+import { ProviderService as ProviderServiceAbstraction } from "@/jslib/common/src/abstractions/provider.service";
+import { SearchService as SearchServiceAbstraction } from "@/jslib/common/src/abstractions/search.service";
+import { SendService as SendServiceAbstraction } from "@/jslib/common/src/abstractions/send.service";
+import { SettingsService as SettingsServiceAbstraction } from "@/jslib/common/src/abstractions/settings.service";
+import { StateService as StateServiceAbstraction } from "@/jslib/common/src/abstractions/state.service";
+import { StateMigrationService as StateMigrationServiceAbstraction } from "@/jslib/common/src/abstractions/stateMigration.service";
+import { StorageService as StorageServiceAbstraction } from "@/jslib/common/src/abstractions/storage.service";
+import { SyncService as SyncServiceAbstraction } from "@/jslib/common/src/abstractions/sync.service";
+import { TokenService as TokenServiceAbstraction } from "@/jslib/common/src/abstractions/token.service";
+import { TotpService as TotpServiceAbstraction } from "@/jslib/common/src/abstractions/totp.service";
+import { TwoFactorService as TwoFactorServiceAbstraction } from "@/jslib/common/src/abstractions/twoFactor.service";
+import { UserVerificationService as UserVerificationServiceAbstraction } from "@/jslib/common/src/abstractions/userVerification.service";
+import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@/jslib/common/src/abstractions/usernameGeneration.service";
+import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@/jslib/common/src/abstractions/vaultTimeout.service";
+import { StateFactory } from "@/jslib/common/src/factories/stateFactory";
+import { Account } from "@/jslib/common/src/models/domain/account";
+import { GlobalState } from "@/jslib/common/src/models/domain/globalState";
+import { ApiService } from "@/jslib/common/src/services/api.service";
+import { AppIdService } from "@/jslib/common/src/services/appId.service";
+import { AuditService } from "@/jslib/common/src/services/audit.service";
+import { AuthService } from "@/jslib/common/src/services/auth.service";
+import { CipherService } from "@/jslib/common/src/services/cipher.service";
+import { CollectionService } from "@/jslib/common/src/services/collection.service";
+import { ConsoleLogService } from "@/jslib/common/src/services/consoleLog.service";
+import { CryptoService } from "@/jslib/common/src/services/crypto.service";
+import { EnvironmentService } from "@/jslib/common/src/services/environment.service";
+import { EventService } from "@/jslib/common/src/services/event.service";
+import { ExportService } from "@/jslib/common/src/services/export.service";
+import { FileUploadService } from "@/jslib/common/src/services/fileUpload.service";
+import { FolderService } from "@/jslib/common/src/services/folder.service";
+import { KeyConnectorService } from "@/jslib/common/src/services/keyConnector.service";
+import { NotificationsService } from "@/jslib/common/src/services/notifications.service";
+import { OrganizationService } from "@/jslib/common/src/services/organization.service";
+import { PasswordGenerationService } from "@/jslib/common/src/services/passwordGeneration.service";
+import { PolicyService } from "@/jslib/common/src/services/policy.service";
+import { ProviderService } from "@/jslib/common/src/services/provider.service";
+import { SearchService } from "@/jslib/common/src/services/search.service";
+import { SendService } from "@/jslib/common/src/services/send.service";
+import { SettingsService } from "@/jslib/common/src/services/settings.service";
+import { StateService } from "@/jslib/common/src/services/state.service";
+import { StateMigrationService } from "@/jslib/common/src/services/stateMigration.service";
+import { SyncService } from "@/jslib/common/src/services/sync.service";
+import { TokenService } from "@/jslib/common/src/services/token.service";
+import { TotpService } from "@/jslib/common/src/services/totp.service";
+import { TwoFactorService } from "@/jslib/common/src/services/twoFactor.service";
+import { UserVerificationService } from "@/jslib/common/src/services/userVerification.service";
+import { UsernameGenerationService } from "@/jslib/common/src/services/usernameGeneration.service";
+import { VaultTimeoutService } from "@/jslib/common/src/services/vaultTimeout.service";
+import { WebCryptoFunctionService } from "@/jslib/common/src/services/webCryptoFunction.service";
import { AuthGuardService } from "./auth-guard.service";
import { BroadcasterService } from "./broadcaster.service";
diff --git a/jslib/angular/src/services/lock-guard.service.ts b/jslib/angular/src/services/lock-guard.service.ts
index 992c6e5d..926fc521 100644
--- a/jslib/angular/src/services/lock-guard.service.ts
+++ b/jslib/angular/src/services/lock-guard.service.ts
@@ -1,8 +1,8 @@
import { Injectable } from "@angular/core";
import { CanActivate, Router } from "@angular/router";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
@Injectable()
export class LockGuardService implements CanActivate {
diff --git a/jslib/angular/src/services/passwordReprompt.service.ts b/jslib/angular/src/services/passwordReprompt.service.ts
index 723c41f7..99db5437 100644
--- a/jslib/angular/src/services/passwordReprompt.service.ts
+++ b/jslib/angular/src/services/passwordReprompt.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from "@angular/core";
-import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service";
+import { KeyConnectorService } from "@/jslib/common/src/abstractions/keyConnector.service";
+import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@/jslib/common/src/abstractions/passwordReprompt.service";
import { PasswordRepromptComponent } from "../components/password-reprompt.component";
diff --git a/jslib/angular/src/services/unauth-guard.service.ts b/jslib/angular/src/services/unauth-guard.service.ts
index ee2da045..264677e7 100644
--- a/jslib/angular/src/services/unauth-guard.service.ts
+++ b/jslib/angular/src/services/unauth-guard.service.ts
@@ -1,8 +1,8 @@
import { Injectable } from "@angular/core";
import { CanActivate, Router } from "@angular/router";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
@Injectable()
export class UnauthGuardService implements CanActivate {
diff --git a/jslib/angular/src/services/validation.service.ts b/jslib/angular/src/services/validation.service.ts
index 865f6458..85c5a0d5 100644
--- a/jslib/angular/src/services/validation.service.ts
+++ b/jslib/angular/src/services/validation.service.ts
@@ -1,8 +1,8 @@
import { Injectable } from "@angular/core";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { ErrorResponse } from "jslib-common/models/response/errorResponse";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
+import { ErrorResponse } from "@/jslib/common/src/models/response/errorResponse";
@Injectable()
export class ValidationService {
diff --git a/jslib/angular/tsconfig.json b/jslib/angular/tsconfig.json
deleted file mode 100644
index c2fd662c..00000000
--- a/jslib/angular/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": "../shared/tsconfig",
- "compilerOptions": {
- "paths": {
- "jslib-common/*": ["../common/src/*"],
- "jslib-angular/*": ["./src/"]
- }
- },
- "include": ["src", "spec"],
- "exclude": ["node_modules", "dist"]
-}
diff --git a/jslib/angular/tsconfig.spec.json b/jslib/angular/tsconfig.spec.json
deleted file mode 100644
index fc8520e7..00000000
--- a/jslib/angular/tsconfig.spec.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "extends": "./tsconfig.json"
-}
diff --git a/jslib/common/custom-matchers.d.ts b/jslib/common/custom-matchers.d.ts
new file mode 100644
index 00000000..214529ff
--- /dev/null
+++ b/jslib/common/custom-matchers.d.ts
@@ -0,0 +1,15 @@
+import type { CustomMatchers } from "./test.setup";
+
+// This declares the types for our custom matchers so that they're recognised by Typescript
+// This file must also be included in the TS compilation (via the tsconfig.json "include" property) to be recognised by
+// vscode
+
+/* eslint-disable */
+declare global {
+ namespace jest {
+ interface Expect extends CustomMatchers {}
+ interface Matchers