Skip to content

Commit

Permalink
convert to jslib submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
@kspearrin
kspearrin committed Feb 19, 2018
1 parent ada2da7 commit 1f1303f
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 60 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
View file
@@ -0,0 +1,4 @@
[submodule "jslib"]
path = jslib
url = https://github.com/bitwarden/jslib.git
branch = master
1 change: 1 addition & 0 deletions jslib
Submodule jslib added at 5b6333
18 changes: 2 additions & 16 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Expand Up @@ -68,7 +68,6 @@
"webpack-merge": "^4.1.0"
},
"dependencies": {
"@bitwarden/jslib": "git+https://github.com/bitwarden/jslib.git",
"@types/angular": "^1.6.34",
"@types/chrome": "0.0.51",
"@types/jquery": "^3.2.16",
Expand Down
82 changes: 41 additions & 41 deletions src/popup/app/app.js
View file
Expand Up @@ -32,7 +32,7 @@ window.BrowserApi = BrowserApi;
import { U2f } from '../../scripts/u2f';
window.U2f = U2f;

import { Analytics } from '../../../node_modules/@bitwarden/jslib/src/misc/analytics';
import { Analytics } from '../../../jslib/src/misc/analytics';
new Analytics(window, () => BrowserApi.gaFilter(), null, null, null, () => {
const bgPage = BrowserApi.getBackgroundPage();
if (!bgPage || !bgPage.bitwardenMain) {
Expand All @@ -42,15 +42,15 @@ new Analytics(window, () => BrowserApi.gaFilter(), null, null, null, () => {
});

// Model imports
import { Attachment } from '../../../node_modules/@bitwarden/jslib/src/models/domain/attachment';
import { Card } from '../../../node_modules/@bitwarden/jslib/src/models/domain/card';
import { Cipher } from '../../../node_modules/@bitwarden/jslib/src/models/domain/cipher';
import { CipherString } from '../../../node_modules/@bitwarden/jslib/src/models/domain/cipherString';
import { Field } from '../../../node_modules/@bitwarden/jslib/src/models/domain/field';
import { Folder } from '../../../node_modules/@bitwarden/jslib/src/models/domain/folder';
import { Identity } from '../../../node_modules/@bitwarden/jslib/src/models/domain/identity';
import { Login } from '../../../node_modules/@bitwarden/jslib/src/models/domain/login';
import { SecureNote } from '../../../node_modules/@bitwarden/jslib/src/models/domain/secureNote';
import { Attachment } from '../../../jslib/src/models/domain/attachment';
import { Card } from '../../../jslib/src/models/domain/card';
import { Cipher } from '../../../jslib/src/models/domain/cipher';
import { CipherString } from '../../../jslib/src/models/domain/cipherString';
import { Field } from '../../../jslib/src/models/domain/field';
import { Folder } from '../../../jslib/src/models/domain/folder';
import { Identity } from '../../../jslib/src/models/domain/identity';
import { Login } from '../../../jslib/src/models/domain/login';
import { SecureNote } from '../../../jslib/src/models/domain/secureNote';
window.Attachment = Attachment;
window.Card = Card;
window.Cipher = Cipher;
Expand All @@ -61,15 +61,15 @@ window.Identity = Identity;
window.Login = Login;
window.SecureNote = SecureNote;

import { AttachmentData } from '../../../node_modules/@bitwarden/jslib/src/models/data/attachmentData';
import { CardData } from '../../../node_modules/@bitwarden/jslib/src/models/data/cardData';
import { CipherData } from '../../../node_modules/@bitwarden/jslib/src/models/data/cipherData';
import { CollectionData } from '../../../node_modules/@bitwarden/jslib/src/models/data/collectionData';
import { FieldData } from '../../../node_modules/@bitwarden/jslib/src/models/data/fieldData';
import { FolderData } from '../../../node_modules/@bitwarden/jslib/src/models/data/folderData';
import { IdentityData } from '../../../node_modules/@bitwarden/jslib/src/models/data/identityData';
import { LoginData } from '../../../node_modules/@bitwarden/jslib/src/models/data/loginData';
import { SecureNoteData } from '../../../node_modules/@bitwarden/jslib/src/models/data/secureNoteData';
import { AttachmentData } from '../../../jslib/src/models/data/attachmentData';
import { CardData } from '../../../jslib/src/models/data/cardData';
import { CipherData } from '../../../jslib/src/models/data/cipherData';
import { CollectionData } from '../../../jslib/src/models/data/collectionData';
import { FieldData } from '../../../jslib/src/models/data/fieldData';
import { FolderData } from '../../../jslib/src/models/data/folderData';
import { IdentityData } from '../../../jslib/src/models/data/identityData';
import { LoginData } from '../../../jslib/src/models/data/loginData';
import { SecureNoteData } from '../../../jslib/src/models/data/secureNoteData';
window.AttachmentData = AttachmentData;
window.CardData = CardData;
window.CipherData = CipherData;
Expand All @@ -80,14 +80,14 @@ window.IdentityData = IdentityData;
window.LoginData = LoginData;
window.SecureNoteData = SecureNoteData;

import { CipherRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/cipherRequest';
import { DeviceRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/deviceRequest';
import { DeviceTokenRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/deviceTokenRequest';
import { FolderRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/folderRequest';
import { PasswordHintRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/passwordHintRequest';
import { RegisterRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/registerRequest';
import { TokenRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/tokenRequest';
import { TwoFactorEmailRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/twoFactorEmailRequest';
import { CipherRequest } from '../../../jslib/src/models/request/cipherRequest';
import { DeviceRequest } from '../../../jslib/src/models/request/deviceRequest';
import { DeviceTokenRequest } from '../../../jslib/src/models/request/deviceTokenRequest';
import { FolderRequest } from '../../../jslib/src/models/request/folderRequest';
import { PasswordHintRequest } from '../../../jslib/src/models/request/passwordHintRequest';
import { RegisterRequest } from '../../../jslib/src/models/request/registerRequest';
import { TokenRequest } from '../../../jslib/src/models/request/tokenRequest';
import { TwoFactorEmailRequest } from '../../../jslib/src/models/request/twoFactorEmailRequest';
window.CipherRequest = CipherRequest;
window.DeviceRequest = DeviceRequest;
window.DeviceTokenRequest = DeviceTokenRequest;
Expand All @@ -97,20 +97,20 @@ window.RegisterRequest = RegisterRequest;
window.TokenRequest = TokenRequest;
window.TwoFactorEmailRequest = TwoFactorEmailRequest;

import { AttachmentResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/attachmentResponse';
import { CipherResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/cipherResponse';
import { CollectionResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/collectionResponse';
import { DeviceResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/deviceResponse';
import { DomainsResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/domainsResponse';
import { ErrorResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/errorResponse';
import { FolderResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/folderResponse';
import { GlobalDomainResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/globalDomainResponse';
import { IdentityTokenResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/identityTokenResponse';
import { KeysResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/keysResponse';
import { ListResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/listResponse';
import { ProfileOrganizationResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/profileOrganizationResponse';
import { ProfileResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/profileResponse';
import { SyncResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/syncResponse';
import { AttachmentResponse } from '../../../jslib/src/models/response/attachmentResponse';
import { CipherResponse } from '../../../jslib/src/models/response/cipherResponse';
import { CollectionResponse } from '../../../jslib/src/models/response/collectionResponse';
import { DeviceResponse } from '../../../jslib/src/models/response/deviceResponse';
import { DomainsResponse } from '../../../jslib/src/models/response/domainsResponse';
import { ErrorResponse } from '../../../jslib/src/models/response/errorResponse';
import { FolderResponse } from '../../../jslib/src/models/response/folderResponse';
import { GlobalDomainResponse } from '../../../jslib/src/models/response/globalDomainResponse';
import { IdentityTokenResponse } from '../../../jslib/src/models/response/identityTokenResponse';
import { KeysResponse } from '../../../jslib/src/models/response/keysResponse';
import { ListResponse } from '../../../jslib/src/models/response/listResponse';
import { ProfileOrganizationResponse } from '../../../jslib/src/models/response/profileOrganizationResponse';
import { ProfileResponse } from '../../../jslib/src/models/response/profileResponse';
import { SyncResponse } from '../../../jslib/src/models/response/syncResponse';
window.AttachmentResponse = AttachmentResponse;
window.CipherResponse = CipherResponse;
window.CollectionResponse = CollectionResponse;
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
View file
Expand Up @@ -11,7 +11,7 @@
],
"baseUrl": ".",
"paths": {
"jslib/*": [ "node_modules/@bitwarden/jslib/src/*" ]
"jslib/*": [ "jslib/src/*" ]
}
},
"exclude": [
Expand Down
2 changes: 1 addition & 1 deletion webpack.common.js
View file
Expand Up @@ -119,7 +119,7 @@ module.exports = {
resolve: {
extensions: ['.tsx', '.ts', '.js'],
alias: {
jslib: path.join(__dirname, 'node_modules/@bitwarden/jslib/src')
jslib: path.join(__dirname, 'jslib/src')
}
},
output: {
Expand Down

0 comments on commit 1f1303f

Please sign in to comment.