1f1303f · bw-clients · git.iko.soy

git.iko.soy/bw-clients

convert to jslib submodule

commit1f1303fc978ec3db9786fd6e7de620ebe6956264 authorKyle Spearrin <kyle.spearrin@gmail.com> dateMon 19 Feb 2018, 17:01 (9 years ago) parentada2da7

7 files changed+50−60

compare with master

unifiedsplit

.gitmodules+4 jslib+1 package-lock.json+2−16 package.json−1 src/popup/app/app.js+41−41 tsconfig.json+1−1 webpack.common.js+1−1

.gitmodulesnew file+4

@@ -0,0 +1,4 @@

1+[submodule "jslib"]

2+ path = jslib

3+ url = https://github.com/bitwarden/jslib.git

4+ branch = master

jslibnew file+1

Submodule changed.

package-lock.json+2−16

@@ -4,21 +4,6 @@

44 "lockfileVersion": 1,

55 "requires": true,

66 "dependencies": {

7− "@bitwarden/jslib": {

8− "version": "git+https://github.com/bitwarden/jslib.git#5b63336347ad9597ed65d907b1bdb804d8b4f39a",

9− "requires": {

10− "@types/node-forge": "0.7.1",

11− "@types/webcrypto": "0.0.28",

12− "node-forge": "0.7.1"

13− },

14− "dependencies": {

15− "@types/node-forge": {

16− "version": "0.7.1",

17− "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-0.7.1.tgz",

18− "integrity": "sha512-sXCLq42I8Evd/qnrSluSKwxuBc2ioPvNCvb5hl+VL3d2zlh45n26b3rPf8DuJiAuJSv5Z5cqcF1KL7X77tXG4Q=="

19− }

20− }

21− },

227 "@types/angular": {

238 "version": "1.6.43",

249 "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.43.tgz",

@@ -8981,7 +8966,8 @@

89818966 "node-forge": {

89828967 "version": "0.7.1",

89838968 "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",

8984− "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="

8969+ "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",

8970+ "dev": true

89858971 },

89868972 "node-libs-browser": {

89878973 "version": "2.1.0",

package.json−1

@@ -68,7 +68,6 @@

6868 "webpack-merge": "^4.1.0"

6969 },

7070 "dependencies": {

71− "@bitwarden/jslib": "git+https://github.com/bitwarden/jslib.git",

7271 "@types/angular": "^1.6.34",

7372 "@types/chrome": "0.0.51",

7473 "@types/jquery": "^3.2.16",

src/popup/app/app.js+41−41

@@ -32,7 +32,7 @@ window.BrowserApi = BrowserApi;

3232import { U2f } from '../../scripts/u2f';

3333window.U2f = U2f;

3434

35−import { Analytics } from '../../../node_modules/@bitwarden/jslib/src/misc/analytics';

35+import { Analytics } from '../../../jslib/src/misc/analytics';

3636new Analytics(window, () => BrowserApi.gaFilter(), null, null, null, () => {

3737 const bgPage = BrowserApi.getBackgroundPage();

3838 if (!bgPage || !bgPage.bitwardenMain) {

@@ -42,15 +42,15 @@ new Analytics(window, () => BrowserApi.gaFilter(), null, null, null, () => {

4242});

4343

4444// Model imports

45−import { Attachment } from '../../../node_modules/@bitwarden/jslib/src/models/domain/attachment';

46−import { Card } from '../../../node_modules/@bitwarden/jslib/src/models/domain/card';

47−import { Cipher } from '../../../node_modules/@bitwarden/jslib/src/models/domain/cipher';

48−import { CipherString } from '../../../node_modules/@bitwarden/jslib/src/models/domain/cipherString';

49−import { Field } from '../../../node_modules/@bitwarden/jslib/src/models/domain/field';

50−import { Folder } from '../../../node_modules/@bitwarden/jslib/src/models/domain/folder';

51−import { Identity } from '../../../node_modules/@bitwarden/jslib/src/models/domain/identity';

52−import { Login } from '../../../node_modules/@bitwarden/jslib/src/models/domain/login';

53−import { SecureNote } from '../../../node_modules/@bitwarden/jslib/src/models/domain/secureNote';

45+import { Attachment } from '../../../jslib/src/models/domain/attachment';

46+import { Card } from '../../../jslib/src/models/domain/card';

47+import { Cipher } from '../../../jslib/src/models/domain/cipher';

48+import { CipherString } from '../../../jslib/src/models/domain/cipherString';

49+import { Field } from '../../../jslib/src/models/domain/field';

50+import { Folder } from '../../../jslib/src/models/domain/folder';

51+import { Identity } from '../../../jslib/src/models/domain/identity';

52+import { Login } from '../../../jslib/src/models/domain/login';

53+import { SecureNote } from '../../../jslib/src/models/domain/secureNote';

5454window.Attachment = Attachment;

5555window.Card = Card;

5656window.Cipher = Cipher;

@@ -61,15 +61,15 @@ window.Identity = Identity;

6161window.Login = Login;

6262window.SecureNote = SecureNote;

6363

64−import { AttachmentData } from '../../../node_modules/@bitwarden/jslib/src/models/data/attachmentData';

65−import { CardData } from '../../../node_modules/@bitwarden/jslib/src/models/data/cardData';

66−import { CipherData } from '../../../node_modules/@bitwarden/jslib/src/models/data/cipherData';

67−import { CollectionData } from '../../../node_modules/@bitwarden/jslib/src/models/data/collectionData';

68−import { FieldData } from '../../../node_modules/@bitwarden/jslib/src/models/data/fieldData';

69−import { FolderData } from '../../../node_modules/@bitwarden/jslib/src/models/data/folderData';

70−import { IdentityData } from '../../../node_modules/@bitwarden/jslib/src/models/data/identityData';

71−import { LoginData } from '../../../node_modules/@bitwarden/jslib/src/models/data/loginData';

72−import { SecureNoteData } from '../../../node_modules/@bitwarden/jslib/src/models/data/secureNoteData';

64+import { AttachmentData } from '../../../jslib/src/models/data/attachmentData';

65+import { CardData } from '../../../jslib/src/models/data/cardData';

66+import { CipherData } from '../../../jslib/src/models/data/cipherData';

67+import { CollectionData } from '../../../jslib/src/models/data/collectionData';

68+import { FieldData } from '../../../jslib/src/models/data/fieldData';

69+import { FolderData } from '../../../jslib/src/models/data/folderData';

70+import { IdentityData } from '../../../jslib/src/models/data/identityData';

71+import { LoginData } from '../../../jslib/src/models/data/loginData';

72+import { SecureNoteData } from '../../../jslib/src/models/data/secureNoteData';

7373window.AttachmentData = AttachmentData;

7474window.CardData = CardData;

7575window.CipherData = CipherData;

@@ -80,14 +80,14 @@ window.IdentityData = IdentityData;

8080window.LoginData = LoginData;

8181window.SecureNoteData = SecureNoteData;

8282

83−import { CipherRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/cipherRequest';

84−import { DeviceRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/deviceRequest';

85−import { DeviceTokenRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/deviceTokenRequest';

86−import { FolderRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/folderRequest';

87−import { PasswordHintRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/passwordHintRequest';

88−import { RegisterRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/registerRequest';

89−import { TokenRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/tokenRequest';

90−import { TwoFactorEmailRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/twoFactorEmailRequest';

83+import { CipherRequest } from '../../../jslib/src/models/request/cipherRequest';

84+import { DeviceRequest } from '../../../jslib/src/models/request/deviceRequest';

85+import { DeviceTokenRequest } from '../../../jslib/src/models/request/deviceTokenRequest';

86+import { FolderRequest } from '../../../jslib/src/models/request/folderRequest';

87+import { PasswordHintRequest } from '../../../jslib/src/models/request/passwordHintRequest';

88+import { RegisterRequest } from '../../../jslib/src/models/request/registerRequest';

89+import { TokenRequest } from '../../../jslib/src/models/request/tokenRequest';

90+import { TwoFactorEmailRequest } from '../../../jslib/src/models/request/twoFactorEmailRequest';

9191window.CipherRequest = CipherRequest;

9292window.DeviceRequest = DeviceRequest;

9393window.DeviceTokenRequest = DeviceTokenRequest;

@@ -97,20 +97,20 @@ window.RegisterRequest = RegisterRequest;

9797window.TokenRequest = TokenRequest;

9898window.TwoFactorEmailRequest = TwoFactorEmailRequest;

9999

100−import { AttachmentResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/attachmentResponse';

101−import { CipherResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/cipherResponse';

102−import { CollectionResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/collectionResponse';

103−import { DeviceResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/deviceResponse';

104−import { DomainsResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/domainsResponse';

105−import { ErrorResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/errorResponse';

106−import { FolderResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/folderResponse';

107−import { GlobalDomainResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/globalDomainResponse';

108−import { IdentityTokenResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/identityTokenResponse';

109−import { KeysResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/keysResponse';

110−import { ListResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/listResponse';

111−import { ProfileOrganizationResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/profileOrganizationResponse';

112−import { ProfileResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/profileResponse';

113−import { SyncResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/syncResponse';

100+import { AttachmentResponse } from '../../../jslib/src/models/response/attachmentResponse';

101+import { CipherResponse } from '../../../jslib/src/models/response/cipherResponse';

102+import { CollectionResponse } from '../../../jslib/src/models/response/collectionResponse';

103+import { DeviceResponse } from '../../../jslib/src/models/response/deviceResponse';

104+import { DomainsResponse } from '../../../jslib/src/models/response/domainsResponse';

105+import { ErrorResponse } from '../../../jslib/src/models/response/errorResponse';

106+import { FolderResponse } from '../../../jslib/src/models/response/folderResponse';

107+import { GlobalDomainResponse } from '../../../jslib/src/models/response/globalDomainResponse';

108+import { IdentityTokenResponse } from '../../../jslib/src/models/response/identityTokenResponse';

109+import { KeysResponse } from '../../../jslib/src/models/response/keysResponse';

110+import { ListResponse } from '../../../jslib/src/models/response/listResponse';

111+import { ProfileOrganizationResponse } from '../../../jslib/src/models/response/profileOrganizationResponse';

112+import { ProfileResponse } from '../../../jslib/src/models/response/profileResponse';

113+import { SyncResponse } from '../../../jslib/src/models/response/syncResponse';

114114window.AttachmentResponse = AttachmentResponse;

115115window.CipherResponse = CipherResponse;

116116window.CollectionResponse = CollectionResponse;

tsconfig.json+1−1

@@ -11,7 +11,7 @@

1111 ],

1212 "baseUrl": ".",

1313 "paths": {

14− "jslib/*": [ "node_modules/@bitwarden/jslib/src/*" ]

14+ "jslib/*": [ "jslib/src/*" ]

1515 }

1616 },

1717 "exclude": [

webpack.common.js+1−1

@@ -119,7 +119,7 @@ module.exports = {

119119 resolve: {

120120 extensions: ['.tsx', '.ts', '.js'],

121121 alias: {

122− jslib: path.join(__dirname, 'node_modules/@bitwarden/jslib/src')

122+ jslib: path.join(__dirname, 'jslib/src')

123123 }

124124 },

125125 output: {