Upstream
/
bitwarden-desktop
mirror of https://github.com/bitwarden/desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add jslib as a "real" dependency (#941) 

* Add jslib as a "real" dependency

* Move more packages to jslib

* Remove some unesessary dev dependencies.

* Add back missing preinstall

* Revert jslib bump

* Fix jslib containing wrong types/node.

* Bump jslib

* Remove unessesary alias

* Remove dummy module
This commit is contained in:
Oscar Hinton 2021-06-07 19:26:36 +02:00 committed by GitHub
parent 5ae7490478
commit 296340a5be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 2686 additions and 4280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit b1d9b84eae451ec2edaf18b7256dd8361b0310ca Subproject commit 1016bbfb9eb28c220de8d2ab86d1f2757328f254

6167
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

49
package.json
View File

@ -22,7 +22,8 @@
"sub:update": "git submodule update --remote", "sub:update": "git submodule update --remote",
"sub:pull": "git submodule foreach git pull origin master", "sub:pull": "git submodule foreach git pull origin master",
"sub:commit": "npm run sub:pull && git commit -am \"update submodule\"", "sub:commit": "npm run sub:pull && git commit -am \"update submodule\"",
"postinstall": "electron-rebuild && npm run sub:init && patch-package", "preinstall": "npm run sub:init",
"postinstall": "patch-package && electron-rebuild",
"symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib", "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib",
"symlink:mac": "npm run symlink:lin", "symlink:mac": "npm run symlink:lin",
"symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib", "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
@ -249,21 +250,14 @@
"@angular/compiler-cli": "^11.2.10", "@angular/compiler-cli": "^11.2.10",
"@ngtools/webpack": "^11.2.10", "@ngtools/webpack": "^11.2.10",
"@types/duo_web_sdk": "^2.7.0", "@types/duo_web_sdk": "^2.7.0",
"@types/lunr": "^2.3.3",
"@types/node": "^14.14.43", "@types/node": "^14.14.43",
"@types/node-forge": "^0.9.7", "@types/node-ipc": "^9.1.4",
"@types/node-ipc": "^9.1.3",
"@types/papaparse": "^5.2.0",
"@types/webcrypto": "^0.0.28",
"@types/webpack": "^4.4.27",
"@types/zxcvbn": "^4.4.1",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": "^3.0.0",
"concurrently": "^6.0.2", "concurrently": "^6.0.2",
"copy-webpack-plugin": "^6.4.0", "copy-webpack-plugin": "^6.4.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"css-loader": "^5.2.4", "css-loader": "^5.2.4",
"del": "^6.0.0", "del": "^6.0.0",
"electron": "11.4.5",
"electron-builder": "22.10.5", "electron-builder": "22.10.5",
"electron-notarize": "^1.0.0", "electron-notarize": "^1.0.0",
"electron-rebuild": "^2.3.5", "electron-rebuild": "^2.3.5",
@ -282,6 +276,7 @@
"sass-loader": "^10.1.1", "sass-loader": "^10.1.1",
"tapable": "^1.1.3", "tapable": "^1.1.3",
"ts-loader": "^8.1.0", "ts-loader": "^8.1.0",
"tsconfig-paths-webpack-plugin": "^3.5.1",
"tslint": "~6.1.0", "tslint": "~6.1.0",
"tslint-loader": "^3.5.4", "tslint-loader": "^3.5.4",
"typescript": "4.1.5", "typescript": "4.1.5",
@ -291,41 +286,15 @@
"webpack-node-externals": "^3.0.0" "webpack-node-externals": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^11.2.11", "@bitwarden/jslib-angular": "file:jslib/angular",
"@angular/cdk": "^11.2.10", "@bitwarden/jslib-common": "file:jslib/common",
"@angular/cli": "^11.2.10", "@bitwarden/jslib-electron": "file:jslib/electron",
"@angular/common": "^11.2.11",
"@angular/compiler": "^11.2.11",
"@angular/core": "^11.2.11",
"@angular/forms": "^11.2.11",
"@angular/localize": "^11.2.11",
"@angular/platform-browser": "^11.2.11",
"@angular/platform-browser-dynamic": "^11.2.11",
"@angular/router": "^11.2.11",
"@microsoft/signalr": "3.1.13",
"@microsoft/signalr-protocol-msgpack": "3.1.13",
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
"angular2-toaster": "^11.0.1", "angular2-toaster": "^11.0.1",
"big-integer": "1.6.48",
"browser-hrtime": "^1.1.8",
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git", "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
"electron-log": "^4.3.5",
"electron-store": "8.0.0",
"electron-updater": "^4.3.9",
"forcefocus": "^1.1.0",
"keytar": "7.6.0",
"lunr": "^2.3.9",
"ngx-infinite-scroll": "^10.0.1",
"node-forge": "0.10.0",
"node-ipc": "^9.1.4", "node-ipc": "^9.1.4",
"nord": "0.2.1", "nord": "^0.2.1",
"papaparse": "^5.3.0",
"regedit": "^3.0.3", "regedit": "^3.0.3",
"rxjs": "^6.6.7", "sweetalert2": "^10.16.6"
"sweetalert2": "^10.16.6",
"tslib": "^2.0.0",
"zone.js": "^0.11.4",
"zxcvbn": "4.4.2"
}, },
"engines": { "engines": {
"node": "~14", "node": "~14",

8
src/app/accounts/environment.component.ts
View File

@ -1,10 +1,10 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { EnvironmentComponent as BaseEnvironmentComponent } from 'jslib/angular/components/environment.component'; import { EnvironmentComponent as BaseEnvironmentComponent } from 'jslib-angular/components/environment.component';
@Component({ @Component({
selector: 'app-environment', selector: 'app-environment',

8
src/app/accounts/hint.component.ts
View File

@ -1,11 +1,11 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { HintComponent as BaseHintComponent } from 'jslib/angular/components/hint.component'; import { HintComponent as BaseHintComponent } from 'jslib-angular/components/hint.component';
@Component({ @Component({
selector: 'app-hint', selector: 'app-hint',

26
src/app/accounts/lock.component.ts
View File

@ -9,22 +9,22 @@ import {
} from '@angular/router'; } from '@angular/router';
import { ipcRenderer } from 'electron'; import { ipcRenderer } from 'electron';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component'; import { LockComponent as BaseLockComponent } from 'jslib-angular/components/lock.component';
import { ElectronConstants } from 'jslib/electron/electronConstants'; import { ElectronConstants } from 'jslib-electron/electronConstants';
const BroadcasterSubscriptionId = 'LockComponent'; const BroadcasterSubscriptionId = 'LockComponent';

24
src/app/accounts/login.component.ts
View File

@ -11,20 +11,20 @@ import { Router } from '@angular/router';
import { EnvironmentComponent } from './environment.component'; import { EnvironmentComponent } from './environment.component';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component'; import { LoginComponent as BaseLoginComponent } from 'jslib-angular/components/login.component';
import { ModalComponent } from 'jslib/angular/components/modal.component'; import { ModalComponent } from 'jslib-angular/components/modal.component';
const BroadcasterSubscriptionId = 'LoginComponent'; const BroadcasterSubscriptionId = 'LoginComponent';

14
src/app/accounts/premium.component.ts
View File

@ -3,14 +3,14 @@ import {
NgZone, NgZone,
} from '@angular/core'; } from '@angular/core';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { PremiumComponent as BasePremiumComponent } from 'jslib/angular/components/premium.component'; import { PremiumComponent as BasePremiumComponent } from 'jslib-angular/components/premium.component';
@Component({ @Component({
selector: 'app-premium', selector: 'app-premium',

18
src/app/accounts/register.component.ts
View File

@ -6,17 +6,17 @@ import {
} from '@angular/core'; } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/components/register.component'; import { RegisterComponent as BaseRegisterComponent } from 'jslib-angular/components/register.component';
const BroadcasterSubscriptionId = 'RegisterComponent'; const BroadcasterSubscriptionId = 'RegisterComponent';

22
src/app/accounts/set-password.component.ts
View File

@ -9,23 +9,23 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
const BroadcasterSubscriptionId = 'SetPasswordComponent'; const BroadcasterSubscriptionId = 'SetPasswordComponent';
import { import {
SetPasswordComponent as BaseSetPasswordComponent, SetPasswordComponent as BaseSetPasswordComponent,
} from 'jslib/angular/components/set-password.component'; } from 'jslib-angular/components/set-password.component';
@Component({ @Component({
selector: 'app-set-password', selector: 'app-set-password',

26
src/app/accounts/settings.component.ts
View File

@ -5,23 +5,23 @@ import {
import Swal from 'sweetalert2/src/sweetalert2.js'; import Swal from 'sweetalert2/src/sweetalert2.js';
import { DeviceType } from 'jslib/enums/deviceType'; import { DeviceType } from 'jslib-common/enums/deviceType';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { ElectronConstants } from 'jslib/electron/electronConstants'; import { ElectronConstants } from 'jslib-electron/electronConstants';
import { isWindowsStore } from 'jslib/electron/utils'; import { Utils } from 'jslib-common/misc/utils';
import { Utils } from 'jslib/misc/utils'; import { isWindowsStore } from 'jslib-electron/utils';
@Component({ @Component({
selector: 'app-settings', selector: 'app-settings',

20
src/app/accounts/sso.component.ts
View File

@ -5,17 +5,17 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { SsoComponent as BaseSsoComponent } from 'jslib/angular/components/sso.component'; import { SsoComponent as BaseSsoComponent } from 'jslib-angular/components/sso.component';
@Component({ @Component({
selector: 'app-sso', selector: 'app-sso',

8
src/app/accounts/two-factor-options.component.ts
View File

@ -1,13 +1,13 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent, TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent,
} from 'jslib/angular/components/two-factor-options.component'; } from 'jslib-angular/components/two-factor-options.component';
@Component({ @Component({
selector: 'app-two-factor-options', selector: 'app-two-factor-options',

22
src/app/accounts/two-factor.component.ts
View File

@ -12,19 +12,19 @@ import {
import { TwoFactorOptionsComponent } from './two-factor-options.component'; import { TwoFactorOptionsComponent } from './two-factor-options.component';
import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { ModalComponent } from 'jslib/angular/components/modal.component'; import { ModalComponent } from 'jslib-angular/components/modal.component';
import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/components/two-factor.component'; import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib-angular/components/two-factor.component';
@Component({ @Component({
selector: 'app-two-factor', selector: 'app-two-factor',

6
src/app/app-routing.module.ts
View File

@ -4,9 +4,9 @@ import {
Routes, Routes,
} from '@angular/router'; } from '@angular/router';
import { AuthGuardService } from 'jslib/angular/services/auth-guard.service'; import { AuthGuardService } from 'jslib-angular/services/auth-guard.service';
import { LockGuardService } from 'jslib/angular/services/lock-guard.service'; import { LockGuardService } from 'jslib-angular/services/lock-guard.service';
import { UnauthGuardService } from 'jslib/angular/services/unauth-guard.service'; import { UnauthGuardService } from 'jslib-angular/services/unauth-guard.service';
import { HintComponent } from './accounts/hint.component'; import { HintComponent } from './accounts/hint.component';
import { LockComponent } from './accounts/lock.component'; import { LockComponent } from './accounts/lock.component';

50
src/app/app.component.ts
View File

@ -22,35 +22,35 @@ import { PremiumComponent } from './accounts/premium.component';
import { SettingsComponent } from './accounts/settings.component'; import { SettingsComponent } from './accounts/settings.component';
import { PasswordGeneratorHistoryComponent } from './vault/password-generator-history.component'; import { PasswordGeneratorHistoryComponent } from './vault/password-generator-history.component';
import { ModalComponent } from 'jslib/angular/components/modal.component'; import { ModalComponent } from 'jslib-angular/components/modal.component';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { NotificationsService } from 'jslib/abstractions/notifications.service'; import { NotificationsService } from 'jslib-common/abstractions/notifications.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { SettingsService } from 'jslib/abstractions/settings.service'; import { SettingsService } from 'jslib-common/abstractions/settings.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { SystemService } from 'jslib/abstractions/system.service'; import { SystemService } from 'jslib-common/abstractions/system.service';
import { TokenService } from 'jslib/abstractions/token.service'; import { TokenService } from 'jslib-common/abstractions/token.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { CipherType } from 'jslib/enums/cipherType'; import { CipherType } from 'jslib-common/enums/cipherType';
import { ExportComponent } from './vault/export.component'; import { ExportComponent } from './vault/export.component';
import { FolderAddEditComponent } from './vault/folder-add-edit.component'; import { FolderAddEditComponent } from './vault/folder-add-edit.component';

32
src/app/app.module.ts
View File

@ -27,24 +27,24 @@ import { SsoComponent } from './accounts/sso.component';
import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component'; import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
import { TwoFactorComponent } from './accounts/two-factor.component'; import { TwoFactorComponent } from './accounts/two-factor.component';
import { CalloutComponent } from 'jslib/angular/components/callout.component'; import { CalloutComponent } from 'jslib-angular/components/callout.component';
import { IconComponent } from 'jslib/angular/components/icon.component'; import { IconComponent } from 'jslib-angular/components/icon.component';
import { ModalComponent } from 'jslib/angular/components/modal.component'; import { ModalComponent } from 'jslib-angular/components/modal.component';
import { A11yTitleDirective } from 'jslib/angular/directives/a11y-title.directive'; import { A11yTitleDirective } from 'jslib-angular/directives/a11y-title.directive';
import { ApiActionDirective } from 'jslib/angular/directives/api-action.directive'; import { ApiActionDirective } from 'jslib-angular/directives/api-action.directive';
import { AutofocusDirective } from 'jslib/angular/directives/autofocus.directive'; import { AutofocusDirective } from 'jslib-angular/directives/autofocus.directive';
import { BlurClickDirective } from 'jslib/angular/directives/blur-click.directive'; import { BlurClickDirective } from 'jslib-angular/directives/blur-click.directive';
import { BoxRowDirective } from 'jslib/angular/directives/box-row.directive'; import { BoxRowDirective } from 'jslib-angular/directives/box-row.directive';
import { FallbackSrcDirective } from 'jslib/angular/directives/fallback-src.directive'; import { FallbackSrcDirective } from 'jslib-angular/directives/fallback-src.directive';
import { SelectCopyDirective } from 'jslib/angular/directives/select-copy.directive'; import { SelectCopyDirective } from 'jslib-angular/directives/select-copy.directive';
import { StopClickDirective } from 'jslib/angular/directives/stop-click.directive'; import { StopClickDirective } from 'jslib-angular/directives/stop-click.directive';
import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive'; import { StopPropDirective } from 'jslib-angular/directives/stop-prop.directive';
import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-value.directive'; import { TrueFalseValueDirective } from 'jslib-angular/directives/true-false-value.directive';
import { ColorPasswordPipe } from 'jslib/angular/pipes/color-password.pipe'; import { ColorPasswordPipe } from 'jslib-angular/pipes/color-password.pipe';
import { I18nPipe } from 'jslib/angular/pipes/i18n.pipe'; import { I18nPipe } from 'jslib-angular/pipes/i18n.pipe';
import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; import { SearchCiphersPipe } from 'jslib-angular/pipes/search-ciphers.pipe';
import { AddEditComponent } from './vault/add-edit.component'; import { AddEditComponent } from './vault/add-edit.component';
import { AttachmentsComponent } from './vault/attachments.component'; import { AttachmentsComponent } from './vault/attachments.component';

2
src/app/layout/nav.component.ts
View File

@ -1,5 +1,5 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
@Component({ @Component({
selector: 'app-nav', selector: 'app-nav',

2
src/app/main.ts
View File

@ -1,7 +1,7 @@
import { enableProdMode } from '@angular/core'; import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { isDev } from 'jslib/electron/utils'; import { isDev } from 'jslib-electron/utils';
// tslint:disable-next-line // tslint:disable-next-line
require('../scss/styles.scss'); require('../scss/styles.scss');

16
src/app/send/add-edit.component.ts
View File

@ -2,15 +2,15 @@ import { DatePipe } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/send/add-edit.component'; import { AddEditComponent as BaseAddEditComponent } from 'jslib-angular/components/send/add-edit.component';
@Component({ @Component({
selector: 'app-send-add-edit', selector: 'app-send-add-edit',

22
src/app/send/send.component.ts
View File

@ -6,20 +6,20 @@ import {
ViewChild, ViewChild,
} from '@angular/core'; } from '@angular/core';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { SendComponent as BaseSendComponent } from 'jslib/angular/components/send/send.component'; import { SendComponent as BaseSendComponent } from 'jslib-angular/components/send/send.component';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { invokeMenu, RendererMenuItem } from 'jslib/electron/utils'; import { invokeMenu, RendererMenuItem } from 'jslib-electron/utils';
import { SendView } from 'jslib/models/view/sendView'; import { SendView } from 'jslib-common/models/view/sendView';
import { AddEditComponent } from './add-edit.component'; import { AddEditComponent } from './add-edit.component';

141
src/app/services.module.ts
View File

@ -6,86 +6,85 @@ import {
import { ToasterModule } from 'angular2-toaster'; import { ToasterModule } from 'angular2-toaster';
import { ElectronLogService } from 'jslib/electron/services/electronLog.service'; import { ElectronLogService } from 'jslib-electron/services/electronLog.service';
import { ElectronRendererMessagingService } from 'jslib/electron/services/electronRendererMessaging.service'; import { ElectronRendererMessagingService } from 'jslib-electron/services/electronRendererMessaging.service';
import { ElectronRendererSecureStorageService } from 'jslib/electron/services/electronRendererSecureStorage.service'; import { ElectronRendererSecureStorageService } from 'jslib-electron/services/electronRendererSecureStorage.service';
import { ElectronRendererStorageService } from 'jslib/electron/services/electronRendererStorage.service'; import { ElectronRendererStorageService } from 'jslib-electron/services/electronRendererStorage.service';
import { DeviceType } from 'jslib/enums/deviceType';
import { ElectronPlatformUtilsService } from '../services/electronPlatformUtils.service'; import { ElectronPlatformUtilsService } from '../services/electronPlatformUtils.service';
import { I18nService } from '../services/i18n.service'; import { I18nService } from '../services/i18n.service';
import { NativeMessagingService } from '../services/nativeMessaging.service'; import { NativeMessagingService } from '../services/nativeMessaging.service';
import { AuthGuardService } from 'jslib/angular/services/auth-guard.service'; import { AuthGuardService } from 'jslib-angular/services/auth-guard.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { LockGuardService } from 'jslib/angular/services/lock-guard.service'; import { LockGuardService } from 'jslib-angular/services/lock-guard.service';
import { UnauthGuardService } from 'jslib/angular/services/unauth-guard.service'; import { UnauthGuardService } from 'jslib-angular/services/unauth-guard.service';
import { ValidationService } from 'jslib/angular/services/validation.service'; import { ValidationService } from 'jslib-angular/services/validation.service';
import { ApiService } from 'jslib/services/api.service'; import { ApiService } from 'jslib-common/services/api.service';
import { AppIdService } from 'jslib/services/appId.service'; import { AppIdService } from 'jslib-common/services/appId.service';
import { AuditService } from 'jslib/services/audit.service'; import { AuditService } from 'jslib-common/services/audit.service';
import { AuthService } from 'jslib/services/auth.service'; import { AuthService } from 'jslib-common/services/auth.service';
import { CipherService } from 'jslib/services/cipher.service'; import { CipherService } from 'jslib-common/services/cipher.service';
import { CollectionService } from 'jslib/services/collection.service'; import { CollectionService } from 'jslib-common/services/collection.service';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { ContainerService } from 'jslib/services/container.service'; import { ContainerService } from 'jslib-common/services/container.service';
import { CryptoService } from 'jslib/services/crypto.service'; import { CryptoService } from 'jslib-common/services/crypto.service';
import { EnvironmentService } from 'jslib/services/environment.service'; import { EnvironmentService } from 'jslib-common/services/environment.service';
import { EventService } from 'jslib/services/event.service'; import { EventService } from 'jslib-common/services/event.service';
import { ExportService } from 'jslib/services/export.service'; import { ExportService } from 'jslib-common/services/export.service';
import { FileUploadService } from 'jslib/services/fileUpload.service'; import { FileUploadService } from 'jslib-common/services/fileUpload.service';
import { FolderService } from 'jslib/services/folder.service'; import { FolderService } from 'jslib-common/services/folder.service';
import { NotificationsService } from 'jslib/services/notifications.service'; import { NotificationsService } from 'jslib-common/services/notifications.service';
import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/services/passwordGeneration.service';
import { PolicyService } from 'jslib/services/policy.service'; import { PasswordRepromptService } from 'jslib-common/services/passwordReprompt.service';
import { SearchService } from 'jslib/services/search.service'; import { PolicyService } from 'jslib-common/services/policy.service';
import { SendService } from 'jslib/services/send.service'; import { SearchService } from 'jslib-common/services/search.service';
import { SettingsService } from 'jslib/services/settings.service'; import { SendService } from 'jslib-common/services/send.service';
import { StateService } from 'jslib/services/state.service'; import { SettingsService } from 'jslib-common/services/settings.service';
import { SyncService } from 'jslib/services/sync.service'; import { StateService } from 'jslib-common/services/state.service';
import { SystemService } from 'jslib/services/system.service'; import { SyncService } from 'jslib-common/services/sync.service';
import { TokenService } from 'jslib/services/token.service'; import { SystemService } from 'jslib-common/services/system.service';
import { TotpService } from 'jslib/services/totp.service'; import { TokenService } from 'jslib-common/services/token.service';
import { UserService } from 'jslib/services/user.service'; import { TotpService } from 'jslib-common/services/totp.service';
import { VaultTimeoutService } from 'jslib/services/vaultTimeout.service'; import { UserService } from 'jslib-common/services/user.service';
import { WebCryptoFunctionService } from 'jslib/services/webCryptoFunction.service'; import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service';
import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service';
import { ApiService as ApiServiceAbstraction } from 'jslib/abstractions/api.service'; import { ApiService as ApiServiceAbstraction } from 'jslib-common/abstractions/api.service';
import { AuditService as AuditServiceAbstraction } from 'jslib/abstractions/audit.service'; import { AuditService as AuditServiceAbstraction } from 'jslib-common/abstractions/audit.service';
import { AuthService as AuthServiceAbstraction } from 'jslib/abstractions/auth.service'; import { AuthService as AuthServiceAbstraction } from 'jslib-common/abstractions/auth.service';
import { CipherService as CipherServiceAbstraction } from 'jslib/abstractions/cipher.service'; import { CipherService as CipherServiceAbstraction } from 'jslib-common/abstractions/cipher.service';
import { CollectionService as CollectionServiceAbstraction } from 'jslib/abstractions/collection.service'; import { CollectionService as CollectionServiceAbstraction } from 'jslib-common/abstractions/collection.service';
import { CryptoService as CryptoServiceAbstraction } from 'jslib/abstractions/crypto.service'; import { CryptoService as CryptoServiceAbstraction } from 'jslib-common/abstractions/crypto.service';
import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib-common/abstractions/cryptoFunction.service';
import { EnvironmentService as EnvironmentServiceAbstraction } from 'jslib/abstractions/environment.service'; import { EnvironmentService as EnvironmentServiceAbstraction } from 'jslib-common/abstractions/environment.service';
import { EventService as EventServiceAbstraction } from 'jslib/abstractions/event.service'; import { EventService as EventServiceAbstraction } from 'jslib-common/abstractions/event.service';
import { ExportService as ExportServiceAbstraction } from 'jslib/abstractions/export.service'; import { ExportService as ExportServiceAbstraction } from 'jslib-common/abstractions/export.service';
import { FileUploadService as FileUploadServiceAbstraction } from 'jslib/abstractions/fileUpload.service'; import { FileUploadService as FileUploadServiceAbstraction } from 'jslib-common/abstractions/fileUpload.service';
import { FolderService as FolderServiceAbstraction } from 'jslib/abstractions/folder.service'; import { FolderService as FolderServiceAbstraction } from 'jslib-common/abstractions/folder.service';
import { I18nService as I18nServiceAbstraction } from 'jslib/abstractions/i18n.service'; import { I18nService as I18nServiceAbstraction } from 'jslib-common/abstractions/i18n.service';
import { LogService as LogServiceAbstraction } from 'jslib/abstractions/log.service'; import { LogService as LogServiceAbstraction } from 'jslib-common/abstractions/log.service';
import { MessagingService as MessagingServiceAbstraction } from 'jslib/abstractions/messaging.service'; import { MessagingService as MessagingServiceAbstraction } from 'jslib-common/abstractions/messaging.service';
import { NotificationsService as NotificationsServiceAbstraction } from 'jslib/abstractions/notifications.service'; import { NotificationsService as NotificationsServiceAbstraction } from 'jslib-common/abstractions/notifications.service';
import { import {
PasswordGenerationService as PasswordGenerationServiceAbstraction, PasswordGenerationService as PasswordGenerationServiceAbstraction,
} from 'jslib/abstractions/passwordGeneration.service'; } from 'jslib-common/abstractions/passwordGeneration.service';
import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from 'jslib/abstractions/passwordReprompt.service'; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from 'jslib-common/abstractions/passwordReprompt.service';
import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService as PolicyServiceAbstraction } from 'jslib/abstractions/policy.service'; import { PolicyService as PolicyServiceAbstraction } from 'jslib-common/abstractions/policy.service';
import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service'; import { SearchService as SearchServiceAbstraction } from 'jslib-common/abstractions/search.service';
import { SendService as SendServiceAbstraction } from 'jslib/abstractions/send.service'; import { SendService as SendServiceAbstraction } from 'jslib-common/abstractions/send.service';
import { SettingsService as SettingsServiceAbstraction } from 'jslib/abstractions/settings.service'; import { SettingsService as SettingsServiceAbstraction } from 'jslib-common/abstractions/settings.service';
import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service'; import { StateService as StateServiceAbstraction } from 'jslib-common/abstractions/state.service';
import { StorageService as StorageServiceAbstraction } from 'jslib/abstractions/storage.service'; import { StorageService as StorageServiceAbstraction } from 'jslib-common/abstractions/storage.service';
import { SyncService as SyncServiceAbstraction } from 'jslib/abstractions/sync.service'; import { SyncService as SyncServiceAbstraction } from 'jslib-common/abstractions/sync.service';
import { SystemService as SystemServiceAbstraction } from 'jslib/abstractions/system.service'; import { SystemService as SystemServiceAbstraction } from 'jslib-common/abstractions/system.service';
import { TokenService as TokenServiceAbstraction } from 'jslib/abstractions/token.service'; import { TokenService as TokenServiceAbstraction } from 'jslib-common/abstractions/token.service';
import { TotpService as TotpServiceAbstraction } from 'jslib/abstractions/totp.service'; import { TotpService as TotpServiceAbstraction } from 'jslib-common/abstractions/totp.service';
import { UserService as UserServiceAbstraction } from 'jslib/abstractions/user.service'; import { UserService as UserServiceAbstraction } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from 'jslib-common/abstractions/vaultTimeout.service';
import { PasswordRepromptService } from 'jslib/services/passwordReprompt.service';
const logService = new ElectronLogService(); const logService = new ElectronLogService();
const i18nService = new I18nService(window.navigator.language, './locales'); const i18nService = new I18nService(window.navigator.language, './locales');

26
src/app/vault/add-edit.component.ts
View File

@ -7,21 +7,21 @@ import {
} from '@angular/core'; } from '@angular/core';
import { NgForm } from '@angular/forms'; import { NgForm } from '@angular/forms';
import { AuditService } from 'jslib/abstractions/audit.service'; import { AuditService } from 'jslib-common/abstractions/audit.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/add-edit.component'; import { AddEditComponent as BaseAddEditComponent } from 'jslib-angular/components/add-edit.component';
const BroadcasterSubscriptionId = 'AddEditComponent'; const BroadcasterSubscriptionId = 'AddEditComponent';

14
src/app/vault/attachments.component.ts
View File

@ -1,13 +1,13 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib/angular/components/attachments.component'; import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib-angular/components/attachments.component';
@Component({ @Component({
selector: 'app-vault-attachments', selector: 'app-vault-attachments',

4
src/app/vault/ciphers.component.ts
View File

@ -1,8 +1,8 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { CiphersComponent as BaseCiphersComponent } from 'jslib/angular/components/ciphers.component'; import { CiphersComponent as BaseCiphersComponent } from 'jslib-angular/components/ciphers.component';
@Component({ @Component({
selector: 'app-vault-ciphers', selector: 'app-vault-ciphers',

10
src/app/vault/collections.component.ts
View File

@ -1,11 +1,11 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { CollectionsComponent as BaseCollectionsComponent } from 'jslib/angular/components/collections.component'; import { CollectionsComponent as BaseCollectionsComponent } from 'jslib-angular/components/collections.component';
@Component({ @Component({
selector: 'app-vault-collections', selector: 'app-vault-collections',

14
src/app/vault/export.component.ts
View File

@ -7,15 +7,15 @@ import {
import * as os from 'os'; import * as os from 'os';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { ExportService } from 'jslib/abstractions/export.service'; import { ExportService } from 'jslib-common/abstractions/export.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { ExportComponent as BaseExportComponent } from 'jslib/angular/components/export.component'; import { ExportComponent as BaseExportComponent } from 'jslib-angular/components/export.component';
const BroadcasterSubscriptionId = 'ExportComponent'; const BroadcasterSubscriptionId = 'ExportComponent';

8
src/app/vault/folder-add-edit.component.ts
View File

@ -1,12 +1,12 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
FolderAddEditComponent as BaseFolderAddEditComponent, FolderAddEditComponent as BaseFolderAddEditComponent,
} from 'jslib/angular/components/folder-add-edit.component'; } from 'jslib-angular/components/folder-add-edit.component';
@Component({ @Component({
selector: 'app-folder-add-edit', selector: 'app-folder-add-edit',

10
src/app/vault/groupings.component.ts
View File

@ -1,11 +1,11 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { GroupingsComponent as BaseGroupingsComponent } from 'jslib/angular/components/groupings.component'; import { GroupingsComponent as BaseGroupingsComponent } from 'jslib-angular/components/groupings.component';
@Component({ @Component({
selector: 'app-vault-groupings', selector: 'app-vault-groupings',

8
src/app/vault/password-generator-history.component.ts
View File

@ -1,12 +1,12 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent, PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent,
} from 'jslib/angular/components/password-generator-history.component'; } from 'jslib-angular/components/password-generator-history.component';
@Component({ @Component({
selector: 'app-password-generator-history', selector: 'app-password-generator-history',

8
src/app/vault/password-generator.component.ts
View File

@ -1,12 +1,12 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
PasswordGeneratorComponent as BasePasswordGeneratorComponent, PasswordGeneratorComponent as BasePasswordGeneratorComponent,
} from 'jslib/angular/components/password-generator.component'; } from 'jslib-angular/components/password-generator.component';
@Component({ @Component({
selector: 'app-password-generator', selector: 'app-password-generator',

8
src/app/vault/password-history.component.ts
View File

@ -1,12 +1,12 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
PasswordHistoryComponent as BasePasswordHistoryComponent, PasswordHistoryComponent as BasePasswordHistoryComponent,
} from 'jslib/angular/components/password-history.component'; } from 'jslib-angular/components/password-history.component';
@Component({ @Component({
selector: 'app-password-history', selector: 'app-password-history',

12
src/app/vault/share.component.ts
View File

@ -1,12 +1,12 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { ShareComponent as BaseShareComponent } from 'jslib/angular/components/share.component'; import { ShareComponent as BaseShareComponent } from 'jslib-angular/components/share.component';
@Component({ @Component({
selector: 'app-vault-share', selector: 'app-vault-share',

32
src/app/vault/vault.component.ts
View File

@ -15,9 +15,9 @@ import {
import { ToasterService } from 'angular2-toaster'; import { ToasterService } from 'angular2-toaster';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { ModalComponent } from 'jslib/angular/components/modal.component'; import { ModalComponent } from 'jslib-angular/components/modal.component';
import { AddEditComponent } from './add-edit.component'; import { AddEditComponent } from './add-edit.component';
import { AttachmentsComponent } from './attachments.component'; import { AttachmentsComponent } from './attachments.component';
@ -30,22 +30,22 @@ import { PasswordHistoryComponent } from './password-history.component';
import { ShareComponent } from './share.component'; import { ShareComponent } from './share.component';
import { ViewComponent } from './view.component'; import { ViewComponent } from './view.component';
import { CipherType } from 'jslib/enums/cipherType'; import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType';
import { EventType } from 'jslib/enums/eventType'; import { CipherType } from 'jslib-common/enums/cipherType';
import { EventType } from 'jslib-common/enums/eventType';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib-common/models/view/cipherView';
import { FolderView } from 'jslib/models/view/folderView'; import { FolderView } from 'jslib-common/models/view/folderView';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service'; import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { TotpService } from 'jslib/abstractions/totp.service'; import { TotpService } from 'jslib-common/abstractions/totp.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { invokeMenu, RendererMenuItem } from 'jslib/electron/utils'; import { invokeMenu, RendererMenuItem } from 'jslib-electron/utils';
import { CipherRepromptType } from 'jslib/enums/cipherRepromptType';
const BroadcasterSubscriptionId = 'VaultComponent'; const BroadcasterSubscriptionId = 'VaultComponent';

31
src/app/vault/view.component.ts
View File

@ -7,25 +7,24 @@ import {
Output, Output,
} from '@angular/core'; } from '@angular/core';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuditService } from 'jslib/abstractions/audit.service'; import { AuditService } from 'jslib-common/abstractions/audit.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service'; import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { TokenService } from 'jslib-common/abstractions/token.service';
import { TokenService } from 'jslib/abstractions/token.service'; import { TotpService } from 'jslib-common/abstractions/totp.service';
import { TotpService } from 'jslib/abstractions/totp.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { UserService } from 'jslib/abstractions/user.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { ViewComponent as BaseViewComponent } from 'jslib/angular/components/view.component'; import { ViewComponent as BaseViewComponent } from 'jslib-angular/components/view.component';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib-common/models/view/cipherView';
const BroadcasterSubscriptionId = 'ViewComponent'; const BroadcasterSubscriptionId = 'ViewComponent';

2
src/global.d.ts vendored
View File

@ -1,3 +1 @@
declare function escape(s: string): string;
declare function unescape(s: string): string;
declare module 'forcefocus'; declare module 'forcefocus';

24
src/main.ts
View File

@ -7,17 +7,17 @@ import { MenuMain } from './main/menu.main';
import { MessagingMain } from './main/messaging.main'; import { MessagingMain } from './main/messaging.main';
import { PowerMonitorMain } from './main/powerMonitor.main'; import { PowerMonitorMain } from './main/powerMonitor.main';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { BiometricMain } from 'jslib/abstractions/biometric.main'; import { BiometricMain } from 'jslib-common/abstractions/biometric.main';
import { ElectronConstants } from 'jslib/electron/electronConstants'; import { ElectronConstants } from 'jslib-electron/electronConstants';
import { KeytarStorageListener } from 'jslib/electron/keytarStorageListener'; import { KeytarStorageListener } from 'jslib-electron/keytarStorageListener';
import { ElectronLogService } from 'jslib/electron/services/electronLog.service'; import { ElectronLogService } from 'jslib-electron/services/electronLog.service';
import { ElectronMainMessagingService } from 'jslib/electron/services/electronMainMessaging.service'; import { ElectronMainMessagingService } from 'jslib-electron/services/electronMainMessaging.service';
import { ElectronStorageService } from 'jslib/electron/services/electronStorage.service'; import { ElectronStorageService } from 'jslib-electron/services/electronStorage.service';
import { TrayMain } from 'jslib/electron/tray.main'; import { TrayMain } from 'jslib-electron/tray.main';
import { UpdaterMain } from 'jslib/electron/updater.main'; import { UpdaterMain } from 'jslib-electron/updater.main';
import { WindowMain } from 'jslib/electron/window.main'; import { WindowMain } from 'jslib-electron/window.main';
import { NativeMessagingMain } from './main/nativeMessaging.main'; import { NativeMessagingMain } from './main/nativeMessaging.main';
export class Main { export class Main {
@ -112,10 +112,10 @@ export class Main {
this.keytarStorageListener = new KeytarStorageListener('Bitwarden'); this.keytarStorageListener = new KeytarStorageListener('Bitwarden');
if (process.platform === 'win32') { if (process.platform === 'win32') {
const BiometricWindowsMain = require('jslib/electron/biometric.windows.main').default; const BiometricWindowsMain = require('jslib-electron/biometric.windows.main').default;
this.biometricMain = new BiometricWindowsMain(this.storageService, this.i18nService, this.windowMain); this.biometricMain = new BiometricWindowsMain(this.storageService, this.i18nService, this.windowMain);
} else if (process.platform === 'darwin') { } else if (process.platform === 'darwin') {
const BiometricDarwinMain = require('jslib/electron/biometric.darwin.main').default; const BiometricDarwinMain = require('jslib-electron/biometric.darwin.main').default;
this.biometricMain = new BiometricDarwinMain(this.storageService, this.i18nService); this.biometricMain = new BiometricDarwinMain(this.storageService, this.i18nService);
} }

6
src/main/menu.main.ts
View File

@ -12,11 +12,11 @@ import {
import { Main } from '../main'; import { Main } from '../main';
import { BaseMenu } from 'jslib/electron/baseMenu'; import { BaseMenu } from 'jslib-electron/baseMenu';
import { isMacAppStore, isSnapStore, isWindowsStore } from 'jslib/electron/utils'; import { isMacAppStore, isSnapStore, isWindowsStore } from 'jslib-electron/utils';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
export class MenuMain extends BaseMenu { export class MenuMain extends BaseMenu {
menu: Menu; menu: Menu;

4
src/main/messaging.main.ts
View File

@ -4,9 +4,9 @@ import * as path from 'path';
import { Main } from '../main'; import { Main } from '../main';
import { ElectronConstants } from 'jslib/electron/electronConstants'; import { ElectronConstants } from 'jslib-electron/electronConstants';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
const SyncInterval = 5 * 60 * 1000; // 5 minutes const SyncInterval = 5 * 60 * 1000; // 5 minutes

4
src/main/nativeMessaging.main.ts
View File

@ -6,8 +6,8 @@ import * as path from 'path';
import * as util from 'util'; import * as util from 'util';
import { ipcMain } from 'electron'; import { ipcMain } from 'electron';
import { LogService } from 'jslib/abstractions/log.service'; import { LogService } from 'jslib-common/abstractions/log.service';
import { WindowMain } from 'jslib/electron/window.main'; import { WindowMain } from 'jslib-electron/window.main';
export class NativeMessagingMain { export class NativeMessagingMain {
private connected: Socket[] = []; private connected: Socket[] = [];

4
src/main/powerMonitor.main.ts
View File

@ -1,8 +1,8 @@
import { powerMonitor } from 'electron'; import { powerMonitor } from 'electron';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { isSnapStore } from 'jslib/electron/utils'; import { isSnapStore } from 'jslib-electron/utils';
import { Main } from '../main'; import { Main } from '../main';

8
src/services/electronPlatformUtils.service.ts
View File

@ -1,11 +1,11 @@
import Swal from 'sweetalert2'; import Swal from 'sweetalert2';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { import {
ElectronPlatformUtilsService as BaseElectronPlatformUtilsService ElectronPlatformUtilsService as BaseElectronPlatformUtilsService
} from 'jslib/electron/services/electronPlatformUtils.service'; } from 'jslib-electron/services/electronPlatformUtils.service';
export class ElectronPlatformUtilsService extends BaseElectronPlatformUtilsService { export class ElectronPlatformUtilsService extends BaseElectronPlatformUtilsService {

2
src/services/i18n.service.ts
View File

@ -1,7 +1,7 @@
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { I18nService as BaseI18nService } from 'jslib/services/i18n.service'; import { I18nService as BaseI18nService } from 'jslib-common/services/i18n.service';
export class I18nService extends BaseI18nService { export class I18nService extends BaseI18nService {
constructor(systemLanguage: string, localesDirectory: string) { constructor(systemLanguage: string, localesDirectory: string) {

24
src/services/nativeMessaging.service.ts
View File

@ -1,19 +1,19 @@
import { ipcRenderer } from 'electron'; import { ipcRenderer } from 'electron';
import Swal from 'sweetalert2'; import Swal from 'sweetalert2';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { LogService } from 'jslib/abstractions/log.service'; import { LogService } from 'jslib-common/abstractions/log.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { StorageService } from 'jslib/abstractions'; import { StorageService } from 'jslib-common/abstractions';
import { ElectronConstants } from 'jslib/electron/electronConstants'; import { Utils } from 'jslib-common/misc/utils';
import { Utils } from 'jslib/misc/utils'; import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey';
import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; import { ElectronConstants } from 'jslib-electron/electronConstants';
const MessageValidTimeout = 10 * 1000; const MessageValidTimeout = 10 * 1000;
const EncryptionAlgorithm = 'sha1'; const EncryptionAlgorithm = 'sha1';

12
tsconfig.json
View File

@ -11,11 +11,17 @@
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"tldjs": [ "tldjs": [
"jslib/src/misc/tldjs.noop" "jslib/common/src/misc/tldjs.noop"
], ],
"jslib/*": [ "jslib-common/*": [
"jslib/src/*" "jslib/common/src/*"
], ],
"jslib-angular/*": [
"jslib/angular/src/*"
],
"jslib-electron/*": [
"jslib/electron/src/*"
]
} }
}, },
"angularCompilerOptions": { "angularCompilerOptions": {

6
webpack.main.js
View File

@ -3,6 +3,7 @@ const { merge } = require('webpack-merge');
const CopyWebpackPlugin = require('copy-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const nodeExternals = require('webpack-node-externals'); const nodeExternals = require('webpack-node-externals');
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
const common = { const common = {
module: { module: {
@ -22,10 +23,7 @@ const common = {
plugins: [], plugins: [],
resolve: { resolve: {
extensions: ['.tsx', '.ts', '.js'], extensions: ['.tsx', '.ts', '.js'],
alias: { plugins: [new TsconfigPathsPlugin({ configFile: './tsconfig.json' })]
jslib: path.join(__dirname, 'jslib/src'),
tldjs: path.join(__dirname, 'jslib/src/misc/tldjs.noop'),
},
}, },
output: { output: {
filename: '[name].js', filename: '[name].js',