From 477066118ec41462735dcdebf424d491db534525 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Mon, 7 Jun 2021 19:25:55 +0200 Subject: [PATCH] Add jslib as a "real" dependency (#321) * Split jslib * Bump jslib * Bump jslib, replace alias with tsconfig-paths-webpack-plugin --- jslib | 2 +- package-lock.json | 1191 ++++++++++++++--- package.json | 29 +- src/bw.ts | 60 +- src/commands/completion.command.ts | 4 +- src/commands/config.command.ts | 8 +- src/commands/confirm.command.ts | 10 +- src/commands/create.command.ts | 24 +- src/commands/delete.command.ts | 12 +- src/commands/download.command.ts | 6 +- src/commands/edit.command.ts | 22 +- src/commands/encode.command.ts | 4 +- src/commands/export.command.ts | 8 +- src/commands/generate.command.ts | 6 +- src/commands/get.command.ts | 62 +- src/commands/import.command.ts | 6 +- src/commands/list.command.ts | 28 +- src/commands/lock.command.ts | 6 +- src/commands/login.command.ts | 22 +- src/commands/restore.command.ts | 4 +- src/commands/send/create.command.ts | 14 +- src/commands/send/delete.command.ts | 4 +- src/commands/send/edit.command.ts | 10 +- src/commands/send/get.command.ts | 16 +- src/commands/send/list.command.ts | 10 +- src/commands/send/receive.command.ts | 28 +- src/commands/send/removePassword.command.ts | 4 +- src/commands/share.command.ts | 4 +- src/commands/status.command.ts | 10 +- src/commands/sync.command.ts | 8 +- src/commands/unlock.command.ts | 16 +- .../request/organizationCollectionRequest.ts | 2 +- src/models/response/attachmentResponse.ts | 2 +- src/models/response/cipherResponse.ts | 8 +- src/models/response/collectionResponse.ts | 6 +- src/models/response/folderResponse.ts | 6 +- src/models/response/loginResponse.ts | 4 +- .../organizationCollectionResponse.ts | 2 +- src/models/response/organizationResponse.ts | 8 +- .../response/organizationUserResponse.ts | 6 +- .../response/passwordHistoryResponse.ts | 2 +- src/models/response/sendAccessResponse.ts | 6 +- src/models/response/sendFileResponse.ts | 2 +- src/models/response/sendResponse.ts | 8 +- src/models/response/sendTextResponse.ts | 2 +- src/models/response/templateResponse.ts | 2 +- src/program.ts | 10 +- src/send.program.ts | 6 +- src/services/i18n.service.ts | 2 +- src/services/nodeEnvSecureStorage.service.ts | 10 +- src/utils.ts | 12 +- tsconfig.json | 24 +- webpack.config.js | 5 +- 53 files changed, 1313 insertions(+), 460 deletions(-) diff --git a/jslib b/jslib index dddcc2bc93..1016bbfb9e 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit dddcc2bc93c15df4d9b6a38e7f9a76d01fe8b384 +Subproject commit 1016bbfb9eb28c220de8d2ab86d1f2757328f254 diff --git a/package-lock.json b/package-lock.json index d67a23c2fe..9cabeea536 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,42 +9,27 @@ "version": "1.16.0", "license": "GPL-3.0-only", "dependencies": { - "big-integer": "1.6.48", - "browser-hrtime": "^1.1.8", - "chalk": "^4.1.1", - "commander": "^7.2.0", - "form-data": "^4.0.0", - "https-proxy-agent": "5.0.0", + "@bitwarden/jslib-common": "file:jslib/common", + "@bitwarden/jslib-node": "file:jslib/node", + "commander": "7.2.0", + "form-data": "4.0.0", "inquirer": "8.0.0", "jsdom": "^16.5.3", - "lowdb": "1.0.0", - "lunr": "^2.3.9", - "node-fetch": "2.6.1", "node-forge": "0.10.0", - "open": "^8.0.8", - "papaparse": "^5.3.0", - "tldjs": "2.3.1", - "zxcvbn": "4.4.2" + "open": "^8.0.8" }, "bin": { "bw": "build/bw.js" }, "devDependencies": { - "@types/inquirer": "^7.3.1", "@types/jsdom": "^16.2.10", - "@types/lowdb": "^1.0.9", - "@types/lunr": "^2.3.3", - "@types/node": "^14.14.44", - "@types/node-fetch": "^2.5.10", - "@types/node-forge": "^0.9.7", - "@types/papaparse": "^5.2.0", - "@types/tldjs": "^2.3.0", - "@types/zxcvbn": "^4.4.1", + "@types/node": "^14.17.1", "clean-webpack-plugin": "^3.0.0", "copy-webpack-plugin": "^6.4.0", "cross-env": "^7.0.3", "pkg": "^5.1.0", "ts-loader": "^8.2.0", + "tsconfig-paths-webpack-plugin": "^3.5.1", "tslint": "^6.1.3", "tslint-loader": "^3.5.4", "typescript": "4.1.5", @@ -57,6 +42,55 @@ "npm": "~7" } }, + "jslib/common": { + "name": "@bitwarden/jslib-common", + "version": "0.0.0", + "license": "GPL-3.0", + "dependencies": { + "@microsoft/signalr": "3.1.13", + "@microsoft/signalr-protocol-msgpack": "3.1.13", + "big-integer": "1.6.48", + "browser-hrtime": "^1.1.8", + "lunr": "^2.3.9", + "node-forge": "^0.10.0", + "papaparse": "^5.3.0", + "tldjs": "^2.3.1", + "zxcvbn": "^4.4.2" + }, + "devDependencies": { + "@types/lunr": "^2.3.3", + "@types/node": "^14.17.1", + "@types/node-forge": "^0.9.7", + "@types/papaparse": "^5.2.5", + "@types/tldjs": "^2.3.0", + "@types/zxcvbn": "^4.4.1", + "rimraf": "^3.0.2", + "typescript": "4.1.5" + } + }, + "jslib/node": { + "name": "@bitwarden/jslib-node", + "version": "0.0.0", + "license": "GPL-3.0", + "dependencies": { + "@bitwarden/jslib-common": "file:../common", + "chalk": "^4.1.1", + "commander": "7.2.0", + "form-data": "4.0.0", + "https-proxy-agent": "5.0.0", + "inquirer": "8.0.0", + "lowdb": "1.0.0", + "node-fetch": "^2.6.1" + }, + "devDependencies": { + "@types/inquirer": "^7.3.1", + "@types/lowdb": "^1.0.10", + "@types/node": "^14.17.1", + "@types/node-fetch": "^2.5.10", + "rimraf": "^3.0.2", + "typescript": "4.1.5" + } + }, "node_modules/@babel/code-frame": { "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", @@ -168,6 +202,14 @@ "to-fast-properties": "^2.0.0" } }, + "node_modules/@bitwarden/jslib-common": { + "resolved": "jslib/common", + "link": true + }, + "node_modules/@bitwarden/jslib-node": { + "resolved": "jslib/node", + "link": true + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz", @@ -177,6 +219,33 @@ "node": ">=10.0.0" } }, + "node_modules/@microsoft/signalr": { + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-3.1.13.tgz", + "integrity": "sha512-U3QuWlu5piriiHBPuTdc3rLJudcJM0CS/g8Y5p0eDSkCXbygTal2N28xEpbeUQ0AxW9XE/yfriesjdRicEtIdw==", + "dependencies": { + "eventsource": "^1.0.7", + "request": "^2.88.0", + "ws": "^6.0.0" + } + }, + "node_modules/@microsoft/signalr-protocol-msgpack": { + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/@microsoft/signalr-protocol-msgpack/-/signalr-protocol-msgpack-3.1.13.tgz", + "integrity": "sha512-IR8IqvRFb9hGA/nSKhzT8X4bY40Wk4QvR0epcbGgUXLhThKUnd2YpFpqJIEgd8b8XkLgVX+PBOi+kiBx0+4yDw==", + "dependencies": { + "@microsoft/signalr": ">=3.1.13", + "msgpack5": "^4.5.0" + } + }, + "node_modules/@microsoft/signalr/node_modules/ws": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "dependencies": { + "async-limiter": "~1.0.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -270,6 +339,12 @@ "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", "dev": true }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "node_modules/@types/lodash": { "version": "4.14.170", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz", @@ -298,9 +373,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.17.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz", - "integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==", + "version": "14.17.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.2.tgz", + "integrity": "sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw==", "dev": true }, "node_modules/@types/node-fetch": { @@ -662,9 +737,9 @@ "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==" }, "node_modules/acorn": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz", - "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz", + "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==", "bin": { "acorn": "bin/acorn" }, @@ -728,7 +803,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -886,6 +960,14 @@ "node": ">=0.10.0" } }, + "node_modules/asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, "node_modules/asn1.js": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", @@ -914,6 +996,14 @@ "util": "0.10.3" } }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "engines": { + "node": ">=0.8" + } + }, "node_modules/assert/node_modules/inherits": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", @@ -945,6 +1035,11 @@ "dev": true, "optional": true }, + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -971,6 +1066,19 @@ "node": ">= 4.5.0" } }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1065,6 +1173,14 @@ } ] }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, "node_modules/big-integer": { "version": "1.6.48", "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz", @@ -1383,6 +1499,11 @@ "node": ">=0.10.0" } }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, "node_modules/chalk": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", @@ -1730,8 +1851,7 @@ "node_modules/core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "node_modules/create-ecdh": { "version": "4.0.4", @@ -1857,6 +1977,17 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", "dev": true }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/data-urls": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", @@ -2137,6 +2268,15 @@ "stream-shift": "^1.0.0" } }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, "node_modules/elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -2328,6 +2468,17 @@ "node": ">=0.8.x" } }, + "node_modules/eventsource": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz", + "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==", + "dependencies": { + "original": "^1.0.0" + }, + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", @@ -2339,9 +2490,9 @@ } }, "node_modules/execa": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", - "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.0.tgz", + "integrity": "sha512-CkdUB7s2y6S+d4y+OM/+ZtQcJCiKUCth4cNImGMqrt2zEVtW2rfHGspQBE1GDo6LjeNIQmTPKXqTCKjqFKyu3A==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", @@ -2403,6 +2554,11 @@ "node": ">=6" } }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, "node_modules/extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", @@ -2497,11 +2653,18 @@ "node": ">=0.10.0" } }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "engines": [ + "node >=0.6.0" + ] + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "node_modules/fast-glob": { "version": "3.2.5", @@ -2523,8 +2686,7 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "node_modules/fast-levenshtein": { "version": "2.0.6", @@ -2634,6 +2796,14 @@ "node": ">=0.10.0" } }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "engines": { + "node": "*" + } + }, "node_modules/form-data": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", @@ -2833,6 +3003,14 @@ "node": ">=0.10.0" } }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dependencies": { + "assert-plus": "^1.0.0" + } + }, "node_modules/github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", @@ -2896,6 +3074,27 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -3078,6 +3277,20 @@ "node": ">= 6" } }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, "node_modules/https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", @@ -3204,8 +3417,7 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { "version": "1.3.8", @@ -3488,6 +3700,11 @@ "node": ">=8" } }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, "node_modules/is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -3511,8 +3728,7 @@ "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "node_modules/isexe": { "version": "2.0.0", @@ -3529,6 +3745,11 @@ "node": ">=0.10.0" } }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3548,6 +3769,11 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, "node_modules/jsdom": { "version": "16.6.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz", @@ -3612,11 +3838,20 @@ "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "node_modules/json5": { "version": "2.2.0", @@ -3645,6 +3880,20 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -3854,19 +4103,19 @@ "dev": true }, "node_modules/mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.30", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", - "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", "dependencies": { - "mime-db": "1.47.0" + "mime-db": "1.48.0" }, "engines": { "node": ">= 0.6" @@ -4090,6 +4339,26 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/msgpack5": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/msgpack5/-/msgpack5-4.5.1.tgz", + "integrity": "sha512-zC1vkcliryc4JGlL6OfpHumSYUHWFGimSI+OgfRCjTFLmKA2/foR9rMTOhWiqfOrfxJOctrpWPvrppf8XynJxw==", + "dependencies": { + "bl": "^2.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.3.6", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/msgpack5/node_modules/bl": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz", + "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==", + "dependencies": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, "node_modules/multistream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz", @@ -4326,6 +4595,12 @@ "isarray": "^1.0.0" } }, + "node_modules/node-libs-browser/node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true + }, "node_modules/noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", @@ -4379,6 +4654,14 @@ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==" }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "engines": { + "node": "*" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -4493,6 +4776,14 @@ "node": ">= 0.8.0" } }, + "node_modules/original": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", + "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", + "dependencies": { + "url-parse": "^1.4.3" + } + }, "node_modules/os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", @@ -4589,9 +4880,9 @@ "dev": true }, "node_modules/papaparse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.0.tgz", - "integrity": "sha512-Lb7jN/4bTpiuGPrYy4tkKoUS8sTki8zacB5ke1p5zolhcSE4TlWgrlsxjrDTbG/dFVh07ck7X36hUf/b5V68pg==" + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.1.tgz", + "integrity": "sha512-Dbt2yjLJrCwH2sRqKFFJaN5XgIASO9YOFeFP8rIBRG2Ain8mqk5r1M6DkfvqEVozVcz3r3HaUGw253hA1nLIcA==" }, "node_modules/parallel-transform": { "version": "1.2.0", @@ -4708,6 +4999,11 @@ "node": ">=0.12" } }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, "node_modules/picomatch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", @@ -4887,8 +5183,7 @@ "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "node_modules/progress": { "version": "2.0.3", @@ -4968,9 +5263,20 @@ } }, "node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "engines": { + "node": ">=0.6" + } }, "node_modules/querystring": { "version": "0.2.0", @@ -4990,6 +5296,11 @@ "node": ">=0.4.x" } }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -5048,7 +5359,6 @@ "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -5147,6 +5457,62 @@ "node": ">=0.10" } }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request/node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/request/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5156,6 +5522,11 @@ "node": ">=0.10.0" } }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + }, "node_modules/resolve": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", @@ -5312,8 +5683,7 @@ "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/safe-regex": { "version": "1.1.0", @@ -5712,6 +6082,25 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, + "node_modules/sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -5797,7 +6186,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -5826,6 +6214,15 @@ "node": ">=8" } }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -6243,6 +6640,11 @@ "node": ">= 4" } }, + "node_modules/tldjs/node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -6409,14 +6811,6 @@ "node": ">=6" } }, - "node_modules/tough-cookie/node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "engines": { - "node": ">=6" - } - }, "node_modules/tough-cookie/node_modules/universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -6436,14 +6830,6 @@ "node": ">=8" } }, - "node_modules/tr46/node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "engines": { - "node": ">=6" - } - }, "node_modules/ts-loader": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.3.0.tgz", @@ -6479,6 +6865,63 @@ "node": ">=10" } }, + "node_modules/tsconfig-paths": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", + "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths-webpack-plugin": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.1.tgz", + "integrity": "sha512-n5CMlUUj+N5pjBhBACLq4jdr9cPTitySCjIosoQm0zwK99gmrcTGAfY9CwxRFT9+9OleNWXPRUcxsKP4AYExxQ==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.7.0", + "tsconfig-paths": "^3.9.0" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/enhanced-resolve": { + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz", + "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/tapable": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", + "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, "node_modules/tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", @@ -6714,7 +7157,6 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, "dependencies": { "safe-buffer": "^5.0.1" }, @@ -6722,6 +7164,11 @@ "node": "*" } }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, "node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -6868,20 +7315,10 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, "dependencies": { "punycode": "^2.1.0" } }, - "node_modules/uri-js/node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", @@ -6899,6 +7336,15 @@ "querystring": "0.2.0" } }, + "node_modules/url-parse": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz", + "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", @@ -6926,8 +7372,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "node_modules/util/node_modules/inherits": { "version": "2.0.3", @@ -6935,12 +7380,34 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, + "node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "bin": { + "uuid": "bin/uuid" + } + }, "node_modules/v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, "node_modules/vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -8024,12 +8491,82 @@ "to-fast-properties": "^2.0.0" } }, + "@bitwarden/jslib-common": { + "version": "file:jslib/common", + "requires": { + "@microsoft/signalr": "3.1.13", + "@microsoft/signalr-protocol-msgpack": "3.1.13", + "@types/lunr": "^2.3.3", + "@types/node": "^14.17.1", + "@types/node-forge": "^0.9.7", + "@types/papaparse": "^5.2.5", + "@types/tldjs": "^2.3.0", + "@types/zxcvbn": "^4.4.1", + "big-integer": "1.6.48", + "browser-hrtime": "^1.1.8", + "lunr": "^2.3.9", + "node-forge": "^0.10.0", + "papaparse": "^5.3.0", + "rimraf": "^3.0.2", + "tldjs": "^2.3.1", + "typescript": "4.1.5", + "zxcvbn": "^4.4.2" + } + }, + "@bitwarden/jslib-node": { + "version": "file:jslib/node", + "requires": { + "@bitwarden/jslib-common": "file:../common", + "@types/inquirer": "^7.3.1", + "@types/lowdb": "^1.0.10", + "@types/node": "^14.17.1", + "@types/node-fetch": "^2.5.10", + "chalk": "^4.1.1", + "commander": "7.2.0", + "form-data": "4.0.0", + "https-proxy-agent": "5.0.0", + "inquirer": "8.0.0", + "lowdb": "1.0.0", + "node-fetch": "^2.6.1", + "rimraf": "^3.0.2", + "typescript": "4.1.5" + } + }, "@discoveryjs/json-ext": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz", "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==", "dev": true }, + "@microsoft/signalr": { + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-3.1.13.tgz", + "integrity": "sha512-U3QuWlu5piriiHBPuTdc3rLJudcJM0CS/g8Y5p0eDSkCXbygTal2N28xEpbeUQ0AxW9XE/yfriesjdRicEtIdw==", + "requires": { + "eventsource": "^1.0.7", + "request": "^2.88.0", + "ws": "^6.0.0" + }, + "dependencies": { + "ws": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "requires": { + "async-limiter": "~1.0.0" + } + } + } + }, + "@microsoft/signalr-protocol-msgpack": { + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/@microsoft/signalr-protocol-msgpack/-/signalr-protocol-msgpack-3.1.13.tgz", + "integrity": "sha512-IR8IqvRFb9hGA/nSKhzT8X4bY40Wk4QvR0epcbGgUXLhThKUnd2YpFpqJIEgd8b8XkLgVX+PBOi+kiBx0+4yDw==", + "requires": { + "@microsoft/signalr": ">=3.1.13", + "msgpack5": "^4.5.0" + } + }, "@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -8108,6 +8645,12 @@ "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", "dev": true }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "@types/lodash": { "version": "4.14.170", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz", @@ -8136,9 +8679,9 @@ "dev": true }, "@types/node": { - "version": "14.17.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz", - "integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==", + "version": "14.17.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.2.tgz", + "integrity": "sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw==", "dev": true }, "@types/node-fetch": { @@ -8485,9 +9028,9 @@ "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==" }, "acorn": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz", - "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==" + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz", + "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==" }, "acorn-globals": { "version": "6.0.0", @@ -8532,7 +9075,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -8646,6 +9188,14 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } + }, "asn1.js": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", @@ -8693,6 +9243,11 @@ } } }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -8706,6 +9261,11 @@ "dev": true, "optional": true }, + "async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -8723,6 +9283,16 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -8790,6 +9360,14 @@ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + } + }, "big-integer": { "version": "1.6.48", "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz", @@ -9057,6 +9635,11 @@ "unset-value": "^1.0.0" } }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, "chalk": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", @@ -9331,8 +9914,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "create-ecdh": { "version": "4.0.4", @@ -9444,6 +10026,14 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", "dev": true }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + } + }, "data-urls": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", @@ -9663,6 +10253,15 @@ "stream-shift": "^1.0.0" } }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -9803,6 +10402,14 @@ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true }, + "eventsource": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz", + "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==", + "requires": { + "original": "^1.0.0" + } + }, "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", @@ -9814,9 +10421,9 @@ } }, "execa": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", - "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.0.tgz", + "integrity": "sha512-CkdUB7s2y6S+d4y+OM/+ZtQcJCiKUCth4cNImGMqrt2zEVtW2rfHGspQBE1GDo6LjeNIQmTPKXqTCKjqFKyu3A==", "dev": true, "requires": { "cross-spawn": "^7.0.3", @@ -9868,6 +10475,11 @@ "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", "dev": true }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", @@ -9943,11 +10555,15 @@ } } }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "fast-glob": { "version": "3.2.5", @@ -9966,8 +10582,7 @@ "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "fast-levenshtein": { "version": "2.0.6", @@ -10056,6 +10671,11 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, "form-data": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", @@ -10214,6 +10834,14 @@ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } + }, "github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", @@ -10262,6 +10890,20 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "requires": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + } + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -10403,6 +11045,16 @@ "debug": "4" } }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", @@ -10491,8 +11143,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "1.3.8", @@ -10706,6 +11357,11 @@ "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", "dev": true }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -10723,8 +11379,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -10738,6 +11393,11 @@ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -10754,6 +11414,11 @@ "esprima": "^4.0.0" } }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, "jsdom": { "version": "16.6.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz", @@ -10806,11 +11471,20 @@ "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "json5": { "version": "2.2.0", @@ -10831,6 +11505,17 @@ "universalify": "^2.0.0" } }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -10996,16 +11681,16 @@ } }, "mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==" + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==" }, "mime-types": { - "version": "2.1.30", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", - "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", "requires": { - "mime-db": "1.47.0" + "mime-db": "1.48.0" } }, "mimic-fn": { @@ -11182,6 +11867,28 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "msgpack5": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/msgpack5/-/msgpack5-4.5.1.tgz", + "integrity": "sha512-zC1vkcliryc4JGlL6OfpHumSYUHWFGimSI+OgfRCjTFLmKA2/foR9rMTOhWiqfOrfxJOctrpWPvrppf8XynJxw==", + "requires": { + "bl": "^2.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.3.6", + "safe-buffer": "^5.1.2" + }, + "dependencies": { + "bl": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz", + "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + } + } + }, "multistream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz", @@ -11376,6 +12083,12 @@ "ieee754": "^1.1.4", "isarray": "^1.0.0" } + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true } } }, @@ -11423,6 +12136,11 @@ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==" }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -11509,6 +12227,14 @@ "word-wrap": "~1.2.3" } }, + "original": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", + "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", + "requires": { + "url-parse": "^1.4.3" + } + }, "os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", @@ -11577,9 +12303,9 @@ "dev": true }, "papaparse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.0.tgz", - "integrity": "sha512-Lb7jN/4bTpiuGPrYy4tkKoUS8sTki8zacB5ke1p5zolhcSE4TlWgrlsxjrDTbG/dFVh07ck7X36hUf/b5V68pg==" + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.1.tgz", + "integrity": "sha512-Dbt2yjLJrCwH2sRqKFFJaN5XgIASO9YOFeFP8rIBRG2Ain8mqk5r1M6DkfvqEVozVcz3r3HaUGw253hA1nLIcA==" }, "parallel-transform": { "version": "1.2.0", @@ -11678,6 +12404,11 @@ "sha.js": "^2.4.8" } }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, "picomatch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", @@ -11806,8 +12537,7 @@ "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "progress": { "version": "2.0.3", @@ -11888,9 +12618,14 @@ } }, "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, "querystring": { "version": "0.2.0", @@ -11904,6 +12639,11 @@ "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -11945,7 +12685,6 @@ "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -12025,12 +12764,65 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + }, "resolve": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", @@ -12143,8 +12935,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -12467,6 +13258,22 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -12546,7 +13353,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -12569,6 +13375,12 @@ "ansi-regex": "^5.0.0" } }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -12910,6 +13722,13 @@ "integrity": "sha512-W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw==", "requires": { "punycode": "^1.4.1" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + } } }, "tmp": { @@ -13043,11 +13862,6 @@ "universalify": "^0.1.2" }, "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -13061,13 +13875,6 @@ "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", "requires": { "punycode": "^2.1.1" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - } } }, "ts-loader": { @@ -13094,6 +13901,58 @@ } } }, + "tsconfig-paths": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", + "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + } + } + }, + "tsconfig-paths-webpack-plugin": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.1.tgz", + "integrity": "sha512-n5CMlUUj+N5pjBhBACLq4jdr9cPTitySCjIosoQm0zwK99gmrcTGAfY9CwxRFT9+9OleNWXPRUcxsKP4AYExxQ==", + "dev": true, + "requires": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.7.0", + "tsconfig-paths": "^3.9.0" + }, + "dependencies": { + "enhanced-resolve": { + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz", + "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "tapable": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", + "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==", + "dev": true + } + } + }, "tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", @@ -13286,11 +14145,15 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, "requires": { "safe-buffer": "^5.0.1" } }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -13403,17 +14266,8 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, "requires": { "punycode": "^2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - } } }, "urix": { @@ -13440,6 +14294,15 @@ } } }, + "url-parse": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz", + "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==", + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -13466,8 +14329,12 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, "v8-compile-cache": { "version": "2.3.0", @@ -13475,6 +14342,16 @@ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", diff --git a/package.json b/package.json index 8a125b45d5..d79530c545 100644 --- a/package.json +++ b/package.json @@ -49,21 +49,14 @@ "assets": "./build/**/*" }, "devDependencies": { - "@types/inquirer": "^7.3.1", "@types/jsdom": "^16.2.10", - "@types/lowdb": "^1.0.9", - "@types/lunr": "^2.3.3", - "@types/node": "^14.14.44", - "@types/node-fetch": "^2.5.10", - "@types/node-forge": "^0.9.7", - "@types/papaparse": "^5.2.0", - "@types/tldjs": "^2.3.0", - "@types/zxcvbn": "^4.4.1", + "@types/node": "^14.17.1", "clean-webpack-plugin": "^3.0.0", "copy-webpack-plugin": "^6.4.0", "cross-env": "^7.0.3", "pkg": "^5.1.0", "ts-loader": "^8.2.0", + "tsconfig-paths-webpack-plugin": "^3.5.1", "tslint": "^6.1.3", "tslint-loader": "^3.5.4", "typescript": "4.1.5", @@ -72,22 +65,14 @@ "webpack-node-externals": "^3.0.0" }, "dependencies": { - "big-integer": "1.6.48", - "browser-hrtime": "^1.1.8", - "chalk": "^4.1.1", - "commander": "^7.2.0", - "form-data": "^4.0.0", - "https-proxy-agent": "5.0.0", + "@bitwarden/jslib-common": "file:jslib/common", + "@bitwarden/jslib-node": "file:jslib/node", + "commander": "7.2.0", + "form-data": "4.0.0", "inquirer": "8.0.0", "jsdom": "^16.5.3", - "lowdb": "1.0.0", - "lunr": "^2.3.9", - "node-fetch": "2.6.1", "node-forge": "0.10.0", - "open": "^8.0.8", - "papaparse": "^5.3.0", - "tldjs": "2.3.1", - "zxcvbn": "4.4.2" + "open": "^8.0.8" }, "engines": { "node": "~14", diff --git a/src/bw.ts b/src/bw.ts index 5bf7f747af..48e0eae141 100644 --- a/src/bw.ts +++ b/src/bw.ts @@ -3,42 +3,42 @@ import * as fs from 'fs'; import * as jsdom from 'jsdom'; import * as path from 'path'; -import { LogLevelType } from 'jslib/enums/logLevelType'; +import { LogLevelType } from 'jslib-common/enums/logLevelType'; -import { AuthService } from 'jslib/services/auth.service'; +import { AuthService } from 'jslib-common/services/auth.service'; import { I18nService } from './services/i18n.service'; import { NodeEnvSecureStorageService } from './services/nodeEnvSecureStorage.service'; -import { CliPlatformUtilsService } from 'jslib/cli/services/cliPlatformUtils.service'; -import { ConsoleLogService } from 'jslib/cli/services/consoleLog.service'; +import { CliPlatformUtilsService } from 'jslib-node/cli/services/cliPlatformUtils.service'; +import { ConsoleLogService } from 'jslib-node/cli/services/consoleLog.service'; -import { AppIdService } from 'jslib/services/appId.service'; -import { AuditService } from 'jslib/services/audit.service'; -import { CipherService } from 'jslib/services/cipher.service'; -import { CollectionService } from 'jslib/services/collection.service'; -import { ConstantsService } from 'jslib/services/constants.service'; -import { ContainerService } from 'jslib/services/container.service'; -import { CryptoService } from 'jslib/services/crypto.service'; -import { EnvironmentService } from 'jslib/services/environment.service'; -import { ExportService } from 'jslib/services/export.service'; -import { FileUploadService } from 'jslib/services/fileUpload.service'; -import { FolderService } from 'jslib/services/folder.service'; -import { ImportService } from 'jslib/services/import.service'; -import { LowdbStorageService } from 'jslib/services/lowdbStorage.service'; -import { NodeApiService } from 'jslib/services/nodeApi.service'; -import { NodeCryptoFunctionService } from 'jslib/services/nodeCryptoFunction.service'; -import { NoopMessagingService } from 'jslib/services/noopMessaging.service'; -import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service'; -import { PolicyService } from 'jslib/services/policy.service'; -import { SearchService } from 'jslib/services/search.service'; -import { SendService } from 'jslib/services/send.service'; -import { SettingsService } from 'jslib/services/settings.service'; -import { SyncService } from 'jslib/services/sync.service'; -import { TokenService } from 'jslib/services/token.service'; -import { TotpService } from 'jslib/services/totp.service'; -import { UserService } from 'jslib/services/user.service'; -import { VaultTimeoutService } from 'jslib/services/vaultTimeout.service'; +import { AppIdService } from 'jslib-common/services/appId.service'; +import { AuditService } from 'jslib-common/services/audit.service'; +import { CipherService } from 'jslib-common/services/cipher.service'; +import { CollectionService } from 'jslib-common/services/collection.service'; +import { ConstantsService } from 'jslib-common/services/constants.service'; +import { ContainerService } from 'jslib-common/services/container.service'; +import { CryptoService } from 'jslib-common/services/crypto.service'; +import { EnvironmentService } from 'jslib-common/services/environment.service'; +import { ExportService } from 'jslib-common/services/export.service'; +import { FileUploadService } from 'jslib-common/services/fileUpload.service'; +import { FolderService } from 'jslib-common/services/folder.service'; +import { ImportService } from 'jslib-common/services/import.service'; +import { NodeCryptoFunctionService } from 'jslib-common/services/nodeCryptoFunction.service'; +import { NoopMessagingService } from 'jslib-common/services/noopMessaging.service'; +import { PasswordGenerationService } from 'jslib-common/services/passwordGeneration.service'; +import { PolicyService } from 'jslib-common/services/policy.service'; +import { SearchService } from 'jslib-common/services/search.service'; +import { SendService } from 'jslib-common/services/send.service'; +import { SettingsService } from 'jslib-common/services/settings.service'; +import { SyncService } from 'jslib-common/services/sync.service'; +import { TokenService } from 'jslib-common/services/token.service'; +import { TotpService } from 'jslib-common/services/totp.service'; +import { UserService } from 'jslib-common/services/user.service'; +import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service'; +import { LowdbStorageService } from 'jslib-node/services/lowdbStorage.service'; +import { NodeApiService } from 'jslib-node/services/nodeApi.service'; import { Program } from './program'; import { SendProgram } from './send.program'; diff --git a/src/commands/completion.command.ts b/src/commands/completion.command.ts index eac4a922a5..8728ba6f19 100644 --- a/src/commands/completion.command.ts +++ b/src/commands/completion.command.ts @@ -1,7 +1,7 @@ import * as program from 'commander'; -import { Response } from 'jslib/cli/models/response'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; interface IOption { long?: string; diff --git a/src/commands/config.command.ts b/src/commands/config.command.ts index 23d0777c53..fdac3a1400 100644 --- a/src/commands/config.command.ts +++ b/src/commands/config.command.ts @@ -1,10 +1,10 @@ import * as program from 'commander'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; -import { Response } from 'jslib/cli/models/response'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; -import { StringResponse } from 'jslib/cli/models/response/stringResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; +import { StringResponse } from 'jslib-node/cli/models/response/stringResponse'; export class ConfigCommand { constructor(private environmentService: EnvironmentService) { } diff --git a/src/commands/confirm.command.ts b/src/commands/confirm.command.ts index f3dc82af49..f7b76e3970 100644 --- a/src/commands/confirm.command.ts +++ b/src/commands/confirm.command.ts @@ -1,13 +1,13 @@ import * as program from 'commander'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; -import { OrganizationUserConfirmRequest } from 'jslib/models/request/organizationUserConfirmRequest'; +import { OrganizationUserConfirmRequest } from 'jslib-common/models/request/organizationUserConfirmRequest'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class ConfirmCommand { constructor(private apiService: ApiService, private cryptoService: CryptoService) { } diff --git a/src/commands/create.command.ts b/src/commands/create.command.ts index 23131c25f1..a74fdaccf6 100644 --- a/src/commands/create.command.ts +++ b/src/commands/create.command.ts @@ -2,20 +2,20 @@ import * as program from 'commander'; import * as fs from 'fs'; import * as path from 'path'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Cipher } from 'jslib/models/export/cipher'; -import { Collection } from 'jslib/models/export/collection'; -import { Folder } from 'jslib/models/export/folder'; +import { Cipher } from 'jslib-common/models/export/cipher'; +import { Collection } from 'jslib-common/models/export/collection'; +import { Folder } from 'jslib-common/models/export/folder'; -import { CollectionRequest } from 'jslib/models/request/collectionRequest'; -import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; +import { CollectionRequest } from 'jslib-common/models/request/collectionRequest'; +import { SelectionReadOnlyRequest } from 'jslib-common/models/request/selectionReadOnlyRequest'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; import { CipherResponse } from '../models/response/cipherResponse'; import { FolderResponse } from '../models/response/folderResponse'; @@ -25,7 +25,7 @@ import { OrganizationCollectionRequest } from '../models/request/organizationCol import { CliUtils } from '../utils'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class CreateCommand { constructor(private cipherService: CipherService, private folderService: FolderService, diff --git a/src/commands/delete.command.ts b/src/commands/delete.command.ts index d1e89d4a02..ee1a3fbcf6 100644 --- a/src/commands/delete.command.ts +++ b/src/commands/delete.command.ts @@ -1,13 +1,13 @@ import * as program from 'commander'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class DeleteCommand { constructor(private cipherService: CipherService, private folderService: FolderService, diff --git a/src/commands/download.command.ts b/src/commands/download.command.ts index 2e00be8b2a..7bf1b28f4f 100644 --- a/src/commands/download.command.ts +++ b/src/commands/download.command.ts @@ -1,10 +1,10 @@ import * as fet from 'node-fetch'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; -import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; import { CliUtils } from '../utils'; diff --git a/src/commands/edit.command.ts b/src/commands/edit.command.ts index 0437fc6e8f..91a1703cc4 100644 --- a/src/commands/edit.command.ts +++ b/src/commands/edit.command.ts @@ -1,18 +1,18 @@ import * as program from 'commander'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; -import { Cipher } from 'jslib/models/export/cipher'; -import { Collection } from 'jslib/models/export/collection'; -import { Folder } from 'jslib/models/export/folder'; +import { Cipher } from 'jslib-common/models/export/cipher'; +import { Collection } from 'jslib-common/models/export/collection'; +import { Folder } from 'jslib-common/models/export/folder'; -import { CollectionRequest } from 'jslib/models/request/collectionRequest'; -import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; +import { CollectionRequest } from 'jslib-common/models/request/collectionRequest'; +import { SelectionReadOnlyRequest } from 'jslib-common/models/request/selectionReadOnlyRequest'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; import { CipherResponse } from '../models/response/cipherResponse'; import { FolderResponse } from '../models/response/folderResponse'; @@ -22,7 +22,7 @@ import { OrganizationCollectionRequest } from '../models/request/organizationCol import { CliUtils } from '../utils'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class EditCommand { constructor(private cipherService: CipherService, private folderService: FolderService, diff --git a/src/commands/encode.command.ts b/src/commands/encode.command.ts index 00788bbb4d..885700e4f6 100644 --- a/src/commands/encode.command.ts +++ b/src/commands/encode.command.ts @@ -1,7 +1,7 @@ import * as program from 'commander'; -import { Response } from 'jslib/cli/models/response'; -import { StringResponse } from 'jslib/cli/models/response/stringResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { StringResponse } from 'jslib-node/cli/models/response/stringResponse'; import { CliUtils } from '../utils'; diff --git a/src/commands/export.command.ts b/src/commands/export.command.ts index b2f8eb606b..d3079169a6 100644 --- a/src/commands/export.command.ts +++ b/src/commands/export.command.ts @@ -1,14 +1,14 @@ import * as program from 'commander'; import * as inquirer from 'inquirer'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { ExportService } from 'jslib/abstractions/export.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { ExportService } from 'jslib-common/abstractions/export.service'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; import { CliUtils } from '../utils'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class ExportCommand { constructor(private cryptoService: CryptoService, private exportService: ExportService) { } diff --git a/src/commands/generate.command.ts b/src/commands/generate.command.ts index 291158a29e..984f0a4225 100644 --- a/src/commands/generate.command.ts +++ b/src/commands/generate.command.ts @@ -1,9 +1,9 @@ import * as program from 'commander'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; -import { Response } from 'jslib/cli/models/response'; -import { StringResponse } from 'jslib/cli/models/response/stringResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { StringResponse } from 'jslib-node/cli/models/response/stringResponse'; export class GenerateCommand { constructor(private passwordGenerationService: PasswordGenerationService) { } diff --git a/src/commands/get.command.ts b/src/commands/get.command.ts index 9000cef0bc..4bbfd00d65 100644 --- a/src/commands/get.command.ts +++ b/src/commands/get.command.ts @@ -1,42 +1,42 @@ import * as program from 'commander'; -import { CipherType } from 'jslib/enums/cipherType'; +import { CipherType } from 'jslib-common/enums/cipherType'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuditService } from 'jslib/abstractions/audit.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { SendService } from 'jslib/abstractions/send.service'; -import { TotpService } from 'jslib/abstractions/totp.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuditService } from 'jslib-common/abstractions/audit.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; +import { TotpService } from 'jslib-common/abstractions/totp.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; -import { Card } from 'jslib/models/export/card'; -import { Cipher } from 'jslib/models/export/cipher'; -import { Collection } from 'jslib/models/export/collection'; -import { Field } from 'jslib/models/export/field'; -import { Folder } from 'jslib/models/export/folder'; -import { Identity } from 'jslib/models/export/identity'; -import { Login } from 'jslib/models/export/login'; -import { LoginUri } from 'jslib/models/export/loginUri'; -import { SecureNote } from 'jslib/models/export/secureNote'; +import { Card } from 'jslib-common/models/export/card'; +import { Cipher } from 'jslib-common/models/export/cipher'; +import { Collection } from 'jslib-common/models/export/collection'; +import { Field } from 'jslib-common/models/export/field'; +import { Folder } from 'jslib-common/models/export/folder'; +import { Identity } from 'jslib-common/models/export/identity'; +import { Login } from 'jslib-common/models/export/login'; +import { LoginUri } from 'jslib-common/models/export/loginUri'; +import { SecureNote } from 'jslib-common/models/export/secureNote'; -import { CipherView } from 'jslib/models/view/cipherView'; -import { CollectionView } from 'jslib/models/view/collectionView'; -import { FolderView } from 'jslib/models/view/folderView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; +import { FolderView } from 'jslib-common/models/view/folderView'; -import { EncString } from 'jslib/models/domain/encString'; +import { EncString } from 'jslib-common/models/domain/encString'; -import { Response } from 'jslib/cli/models/response'; -import { StringResponse } from 'jslib/cli/models/response/stringResponse'; -import { ErrorResponse } from 'jslib/models/response/errorResponse'; +import { ErrorResponse } from 'jslib-common/models/response/errorResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { StringResponse } from 'jslib-node/cli/models/response/stringResponse'; -import { SendType } from 'jslib/enums/sendType'; +import { SendType } from 'jslib-common/enums/sendType'; import { CipherResponse } from '../models/response/cipherResponse'; import { CollectionResponse } from '../models/response/collectionResponse'; @@ -54,7 +54,7 @@ import { DownloadCommand } from './download.command'; import { CliUtils } from '../utils'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class GetCommand extends DownloadCommand { constructor(private cipherService: CipherService, private folderService: FolderService, diff --git a/src/commands/import.command.ts b/src/commands/import.command.ts index bddcee1235..9ce6801a28 100644 --- a/src/commands/import.command.ts +++ b/src/commands/import.command.ts @@ -1,8 +1,8 @@ import * as program from 'commander'; -import { ImportService } from 'jslib/abstractions/import.service'; +import { ImportService } from 'jslib-common/abstractions/import.service'; -import { Response } from 'jslib/cli/models/response'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; import { CliUtils } from '../utils'; diff --git a/src/commands/list.command.ts b/src/commands/list.command.ts index 65eb600cab..aa05eeb031 100644 --- a/src/commands/list.command.ts +++ b/src/commands/list.command.ts @@ -1,26 +1,26 @@ import * as program from 'commander'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { CollectionDetailsResponse as ApiCollectionDetailsResponse, CollectionResponse as ApiCollectionResponse, -} from 'jslib/models/response/collectionResponse'; -import { ListResponse as ApiListResponse } from 'jslib/models/response/listResponse'; +} from 'jslib-common/models/response/collectionResponse'; +import { ListResponse as ApiListResponse } from 'jslib-common/models/response/listResponse'; -import { CollectionData } from 'jslib/models/data/collectionData'; +import { CollectionData } from 'jslib-common/models/data/collectionData'; -import { Collection } from 'jslib/models/domain/collection'; +import { Collection } from 'jslib-common/models/domain/collection'; -import { Response } from 'jslib/cli/models/response'; -import { ListResponse } from 'jslib/cli/models/response/listResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { ListResponse } from 'jslib-node/cli/models/response/listResponse'; import { CipherResponse } from '../models/response/cipherResponse'; import { CollectionResponse } from '../models/response/collectionResponse'; @@ -30,7 +30,7 @@ import { OrganizationUserResponse } from '../models/response/organizationUserRes import { CliUtils } from '../utils'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class ListCommand { constructor(private cipherService: CipherService, private folderService: FolderService, diff --git a/src/commands/lock.command.ts b/src/commands/lock.command.ts index 4722c48a6b..0d550b5449 100644 --- a/src/commands/lock.command.ts +++ b/src/commands/lock.command.ts @@ -1,9 +1,9 @@ import * as program from 'commander'; -import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; +import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service'; -import { Response } from 'jslib/cli/models/response'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; export class LockCommand { constructor(private vaultTimeoutService: VaultTimeoutService) { } diff --git a/src/commands/login.command.ts b/src/commands/login.command.ts index cc9dc1797c..bf4da1742c 100644 --- a/src/commands/login.command.ts +++ b/src/commands/login.command.ts @@ -1,19 +1,19 @@ import * as program from 'commander'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; -import { LoginCommand as BaseLoginCommand } from 'jslib/cli/commands/login.command'; +import { LoginCommand as BaseLoginCommand } from 'jslib-node/cli/commands/login.command'; export class LoginCommand extends BaseLoginCommand { private options: program.OptionValues; diff --git a/src/commands/restore.command.ts b/src/commands/restore.command.ts index 6a1b57d5ff..07718e1377 100644 --- a/src/commands/restore.command.ts +++ b/src/commands/restore.command.ts @@ -1,8 +1,8 @@ import * as program from 'commander'; -import { CipherService } from 'jslib/abstractions/cipher.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; export class RestoreCommand { constructor(private cipherService: CipherService) { } diff --git a/src/commands/send/create.command.ts b/src/commands/send/create.command.ts index 4827b25dbd..894528243a 100644 --- a/src/commands/send/create.command.ts +++ b/src/commands/send/create.command.ts @@ -2,16 +2,16 @@ import * as program from 'commander'; import * as fs from 'fs'; import * as path from 'path'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { SendService } from 'jslib/abstractions/send.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { SendType } from 'jslib/enums/sendType'; +import { SendType } from 'jslib-common/enums/sendType'; -import { NodeUtils } from 'jslib/misc/nodeUtils'; +import { NodeUtils } from 'jslib-common/misc/nodeUtils'; -import { Response } from 'jslib/cli/models/response'; -import { StringResponse } from 'jslib/cli/models/response/stringResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { StringResponse } from 'jslib-node/cli/models/response/stringResponse'; import { SendResponse } from '../../models/response/sendResponse'; import { SendTextResponse } from '../../models/response/sendTextResponse'; diff --git a/src/commands/send/delete.command.ts b/src/commands/send/delete.command.ts index d727ad4956..5a1c9ccd8e 100644 --- a/src/commands/send/delete.command.ts +++ b/src/commands/send/delete.command.ts @@ -1,6 +1,6 @@ -import { SendService } from 'jslib/abstractions/send.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; export class SendDeleteCommand { constructor(private sendService: SendService) { } diff --git a/src/commands/send/edit.command.ts b/src/commands/send/edit.command.ts index 8f8cc950d5..efe0f1fcca 100644 --- a/src/commands/send/edit.command.ts +++ b/src/commands/send/edit.command.ts @@ -1,11 +1,11 @@ import * as program from 'commander'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { SendService } from 'jslib/abstractions/send.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Response } from 'jslib/cli/models/response'; -import { SendType } from 'jslib/enums/sendType'; +import { SendType } from 'jslib-common/enums/sendType'; +import { Response } from 'jslib-node/cli/models/response'; import { SendResponse } from '../../models/response/sendResponse'; diff --git a/src/commands/send/get.command.ts b/src/commands/send/get.command.ts index 2a5e8bce70..0e752b6f6f 100644 --- a/src/commands/send/get.command.ts +++ b/src/commands/send/get.command.ts @@ -1,20 +1,20 @@ import * as program from 'commander'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { SendService } from 'jslib/abstractions/send.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; -import { SendView } from 'jslib/models/view/sendView'; +import { SendView } from 'jslib-common/models/view/sendView'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; import { DownloadCommand } from '../download.command'; import { SendResponse } from '../../models/response/sendResponse'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class SendGetCommand extends DownloadCommand { constructor(private sendService: SendService, private environmentService: EnvironmentService, diff --git a/src/commands/send/list.command.ts b/src/commands/send/list.command.ts index 1e00fb98a0..b0b98c4f53 100644 --- a/src/commands/send/list.command.ts +++ b/src/commands/send/list.command.ts @@ -1,11 +1,11 @@ import * as program from 'commander'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { SendService } from 'jslib/abstractions/send.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; -import { Response } from 'jslib/cli/models/response'; -import { ListResponse } from 'jslib/cli/models/response/listResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { ListResponse } from 'jslib-node/cli/models/response/listResponse'; import { SendResponse } from '../..//models/response/sendResponse'; diff --git a/src/commands/send/receive.command.ts b/src/commands/send/receive.command.ts index db1cb7aba9..cf424f7792 100644 --- a/src/commands/send/receive.command.ts +++ b/src/commands/send/receive.command.ts @@ -1,25 +1,25 @@ import * as program from 'commander'; import * as inquirer from 'inquirer'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { SendAccessRequest } from 'jslib/models/request/sendAccessRequest'; -import { ErrorResponse } from 'jslib/models/response/errorResponse'; -import { SendAccessView } from 'jslib/models/view/sendAccessView'; +import { SendAccessRequest } from 'jslib-common/models/request/sendAccessRequest'; +import { ErrorResponse } from 'jslib-common/models/response/errorResponse'; +import { SendAccessView } from 'jslib-common/models/view/sendAccessView'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; -import { SendAccess } from 'jslib/models/domain/sendAccess'; -import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; +import { SendAccess } from 'jslib-common/models/domain/sendAccess'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; -import { SendType } from 'jslib/enums/sendType'; +import { SendType } from 'jslib-common/enums/sendType'; -import { NodeUtils } from 'jslib/misc/nodeUtils'; -import { Utils } from 'jslib/misc/utils'; +import { NodeUtils } from 'jslib-common/misc/nodeUtils'; +import { Utils } from 'jslib-common/misc/utils'; import { SendAccessResponse } from '../../models/response/sendAccessResponse'; diff --git a/src/commands/send/removePassword.command.ts b/src/commands/send/removePassword.command.ts index f10ea3a047..dc8faf9837 100644 --- a/src/commands/send/removePassword.command.ts +++ b/src/commands/send/removePassword.command.ts @@ -1,6 +1,6 @@ -import { SendService } from 'jslib/abstractions/send.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; import { SendResponse } from '../../models/response/sendResponse'; diff --git a/src/commands/share.command.ts b/src/commands/share.command.ts index d1ad07c521..f97f4d7935 100644 --- a/src/commands/share.command.ts +++ b/src/commands/share.command.ts @@ -1,8 +1,8 @@ import * as program from 'commander'; -import { CipherService } from 'jslib/abstractions/cipher.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; import { CipherResponse } from '../models/response/cipherResponse'; diff --git a/src/commands/status.command.ts b/src/commands/status.command.ts index dbd7d12afd..9260e08a18 100644 --- a/src/commands/status.command.ts +++ b/src/commands/status.command.ts @@ -1,11 +1,11 @@ import * as program from 'commander'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { UserService } from 'jslib/abstractions/user.service'; -import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; +import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; import { TemplateResponse } from '../models/response/templateResponse'; diff --git a/src/commands/sync.command.ts b/src/commands/sync.command.ts index c231b1e908..3734373896 100644 --- a/src/commands/sync.command.ts +++ b/src/commands/sync.command.ts @@ -1,10 +1,10 @@ import * as program from 'commander'; -import { SyncService } from 'jslib/abstractions/sync.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; -import { Response } from 'jslib/cli/models/response'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; -import { StringResponse } from 'jslib/cli/models/response/stringResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; +import { StringResponse } from 'jslib-node/cli/models/response/stringResponse'; export class SyncCommand { constructor(private syncService: SyncService) { } diff --git a/src/commands/unlock.command.ts b/src/commands/unlock.command.ts index d175d8397a..9188c7d15b 100644 --- a/src/commands/unlock.command.ts +++ b/src/commands/unlock.command.ts @@ -1,17 +1,17 @@ import * as program from 'commander'; import * as inquirer from 'inquirer'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Response } from 'jslib/cli/models/response'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; -import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; +import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class UnlockCommand { constructor(private cryptoService: CryptoService, private userService: UserService, diff --git a/src/models/request/organizationCollectionRequest.ts b/src/models/request/organizationCollectionRequest.ts index 6ccc081ea3..e639212f4e 100644 --- a/src/models/request/organizationCollectionRequest.ts +++ b/src/models/request/organizationCollectionRequest.ts @@ -1,4 +1,4 @@ -import { Collection } from 'jslib/models/export/collection'; +import { Collection } from 'jslib-common/models/export/collection'; import { SelectionReadOnly } from '../selectionReadOnly'; diff --git a/src/models/response/attachmentResponse.ts b/src/models/response/attachmentResponse.ts index a296cf6fa0..fccc5794e9 100644 --- a/src/models/response/attachmentResponse.ts +++ b/src/models/response/attachmentResponse.ts @@ -1,4 +1,4 @@ -import { AttachmentView } from 'jslib/models/view/attachmentView'; +import { AttachmentView } from 'jslib-common/models/view/attachmentView'; export class AttachmentResponse { id: string; diff --git a/src/models/response/cipherResponse.ts b/src/models/response/cipherResponse.ts index f5afa07a80..444514dcff 100644 --- a/src/models/response/cipherResponse.ts +++ b/src/models/response/cipherResponse.ts @@ -1,13 +1,13 @@ -import { CipherWithIds } from 'jslib/models/export/cipherWithIds'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherWithIds } from 'jslib-common/models/export/cipherWithIds'; +import { CipherView } from 'jslib-common/models/view/cipherView'; -import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; +import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse'; import { AttachmentResponse } from './attachmentResponse'; import { LoginResponse } from './loginResponse'; import { PasswordHistoryResponse } from './passwordHistoryResponse'; -import { CipherType } from 'jslib/enums'; +import { CipherType } from 'jslib-common/enums'; export class CipherResponse extends CipherWithIds implements BaseResponse { object: string; diff --git a/src/models/response/collectionResponse.ts b/src/models/response/collectionResponse.ts index 6d8bd09ef3..ceea2ddbb5 100644 --- a/src/models/response/collectionResponse.ts +++ b/src/models/response/collectionResponse.ts @@ -1,7 +1,7 @@ -import { CollectionWithId } from 'jslib/models/export/collectionWithId'; -import { CollectionView } from 'jslib/models/view/collectionView'; +import { CollectionWithId } from 'jslib-common/models/export/collectionWithId'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; -import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; +import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse'; export class CollectionResponse extends CollectionWithId implements BaseResponse { object: string; diff --git a/src/models/response/folderResponse.ts b/src/models/response/folderResponse.ts index 7ea0b6680e..402f5f6eda 100644 --- a/src/models/response/folderResponse.ts +++ b/src/models/response/folderResponse.ts @@ -1,7 +1,7 @@ -import { FolderWithId } from 'jslib/models/export/folderWithId'; -import { FolderView } from 'jslib/models/view/folderView'; +import { FolderWithId } from 'jslib-common/models/export/folderWithId'; +import { FolderView } from 'jslib-common/models/view/folderView'; -import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; +import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse'; export class FolderResponse extends FolderWithId implements BaseResponse { object: string; diff --git a/src/models/response/loginResponse.ts b/src/models/response/loginResponse.ts index 1a5278316e..9b1af5f4fa 100644 --- a/src/models/response/loginResponse.ts +++ b/src/models/response/loginResponse.ts @@ -1,5 +1,5 @@ -import { Login } from 'jslib/models/export/login'; -import { LoginView } from 'jslib/models/view/loginView'; +import { Login } from 'jslib-common/models/export/login'; +import { LoginView } from 'jslib-common/models/view/loginView'; export class LoginResponse extends Login { passwordRevisionDate: Date; diff --git a/src/models/response/organizationCollectionResponse.ts b/src/models/response/organizationCollectionResponse.ts index 8e87bc5fa2..80e568f96f 100644 --- a/src/models/response/organizationCollectionResponse.ts +++ b/src/models/response/organizationCollectionResponse.ts @@ -1,4 +1,4 @@ -import { CollectionView } from 'jslib/models/view/collectionView'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; import { SelectionReadOnly } from '../selectionReadOnly'; diff --git a/src/models/response/organizationResponse.ts b/src/models/response/organizationResponse.ts index f2727adac9..6f4bd19f0b 100644 --- a/src/models/response/organizationResponse.ts +++ b/src/models/response/organizationResponse.ts @@ -1,9 +1,9 @@ -import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; +import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; -import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType'; -import { OrganizationUserType } from 'jslib/enums/organizationUserType'; +import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; +import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; export class OrganizationResponse implements BaseResponse { object: string; diff --git a/src/models/response/organizationUserResponse.ts b/src/models/response/organizationUserResponse.ts index 690e3630f3..8f720aaf7b 100644 --- a/src/models/response/organizationUserResponse.ts +++ b/src/models/response/organizationUserResponse.ts @@ -1,7 +1,7 @@ -import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; +import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse'; -import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType'; -import { OrganizationUserType } from 'jslib/enums/organizationUserType'; +import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; +import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; export class OrganizationUserResponse implements BaseResponse { object: string; diff --git a/src/models/response/passwordHistoryResponse.ts b/src/models/response/passwordHistoryResponse.ts index 7c092f4220..a622a3deee 100644 --- a/src/models/response/passwordHistoryResponse.ts +++ b/src/models/response/passwordHistoryResponse.ts @@ -1,4 +1,4 @@ -import { PasswordHistoryView } from 'jslib/models/view/passwordHistoryView'; +import { PasswordHistoryView } from 'jslib-common/models/view/passwordHistoryView'; export class PasswordHistoryResponse { lastUsedDate: Date; diff --git a/src/models/response/sendAccessResponse.ts b/src/models/response/sendAccessResponse.ts index 15e5307330..a2effefb16 100644 --- a/src/models/response/sendAccessResponse.ts +++ b/src/models/response/sendAccessResponse.ts @@ -1,8 +1,8 @@ -import { SendType } from 'jslib/enums/sendType'; +import { SendType } from 'jslib-common/enums/sendType'; -import { SendAccessView } from 'jslib/models/view/sendAccessView'; +import { SendAccessView } from 'jslib-common/models/view/sendAccessView'; -import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; +import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse'; import { SendFileResponse } from './sendFileResponse'; import { SendTextResponse } from './sendTextResponse'; diff --git a/src/models/response/sendFileResponse.ts b/src/models/response/sendFileResponse.ts index 94773bdfae..ffc9c49e2a 100644 --- a/src/models/response/sendFileResponse.ts +++ b/src/models/response/sendFileResponse.ts @@ -1,4 +1,4 @@ -import { SendFileView } from 'jslib/models/view/sendFileView'; +import { SendFileView } from 'jslib-common/models/view/sendFileView'; export class SendFileResponse { static template(fileName = 'file attachment location'): SendFileResponse { diff --git a/src/models/response/sendResponse.ts b/src/models/response/sendResponse.ts index a17640e495..b73bfff696 100644 --- a/src/models/response/sendResponse.ts +++ b/src/models/response/sendResponse.ts @@ -1,10 +1,10 @@ -import { SendView } from 'jslib/models/view/sendView'; +import { SendView } from 'jslib-common/models/view/sendView'; -import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; +import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse'; -import { SendType } from 'jslib/enums/sendType'; +import { SendType } from 'jslib-common/enums/sendType'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; import { SendFileResponse } from './sendFileResponse'; import { SendTextResponse } from './sendTextResponse'; diff --git a/src/models/response/sendTextResponse.ts b/src/models/response/sendTextResponse.ts index 5798d802e0..db258e66e1 100644 --- a/src/models/response/sendTextResponse.ts +++ b/src/models/response/sendTextResponse.ts @@ -1,4 +1,4 @@ -import { SendTextView } from 'jslib/models/view/sendTextView'; +import { SendTextView } from 'jslib-common/models/view/sendTextView'; export class SendTextResponse { static template(text = 'Text contained in the send.', hidden = false): SendTextResponse { diff --git a/src/models/response/templateResponse.ts b/src/models/response/templateResponse.ts index 2987686dc2..0ee8052476 100644 --- a/src/models/response/templateResponse.ts +++ b/src/models/response/templateResponse.ts @@ -1,4 +1,4 @@ -import { BaseResponse } from 'jslib/cli/models/response/baseResponse'; +import { BaseResponse } from 'jslib-node/cli/models/response/baseResponse'; export class TemplateResponse implements BaseResponse { object: string; diff --git a/src/program.ts b/src/program.ts index f111e38e4e..f3b0b63c1b 100644 --- a/src/program.ts +++ b/src/program.ts @@ -14,16 +14,16 @@ import { UnlockCommand } from './commands/unlock.command'; import { CompletionCommand } from './commands/completion.command'; -import { LogoutCommand } from 'jslib/cli/commands/logout.command'; -import { UpdateCommand } from 'jslib/cli/commands/update.command'; +import { LogoutCommand } from 'jslib-node/cli/commands/logout.command'; +import { UpdateCommand } from 'jslib-node/cli/commands/update.command'; -import { Response } from 'jslib/cli/models/response'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; import { TemplateResponse } from './models/response/templateResponse'; import { CliUtils } from './utils'; -import { BaseProgram } from 'jslib/cli/baseProgram'; +import { BaseProgram } from 'jslib-node/cli/baseProgram'; const writeLn = CliUtils.writeLn; diff --git a/src/send.program.ts b/src/send.program.ts index e0b75255ce..8296b58c13 100644 --- a/src/send.program.ts +++ b/src/send.program.ts @@ -3,11 +3,11 @@ import * as program from 'commander'; import * as fs from 'fs'; import * as path from 'path'; -import { Response } from 'jslib/cli/models/response'; +import { Response } from 'jslib-node/cli/models/response'; -import { SendType } from 'jslib/enums/sendType'; +import { SendType } from 'jslib-common/enums/sendType'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; import { GetCommand } from './commands/get.command'; import { SendCreateCommand } from './commands/send/create.command'; diff --git a/src/services/i18n.service.ts b/src/services/i18n.service.ts index 76cfc291b8..d1780057ea 100644 --- a/src/services/i18n.service.ts +++ b/src/services/i18n.service.ts @@ -1,7 +1,7 @@ import * as fs from 'fs'; 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 { constructor(systemLanguage: string, localesDirectory: string) { diff --git a/src/services/nodeEnvSecureStorage.service.ts b/src/services/nodeEnvSecureStorage.service.ts index 96986967b7..007536a332 100644 --- a/src/services/nodeEnvSecureStorage.service.ts +++ b/src/services/nodeEnvSecureStorage.service.ts @@ -1,9 +1,9 @@ -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { LogService } from 'jslib/abstractions/log.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; -import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { LogService } from 'jslib-common/abstractions/log.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; export class NodeEnvSecureStorageService implements StorageService { constructor(private storageService: StorageService, private logService: LogService, diff --git a/src/utils.ts b/src/utils.ts index 080227724c..c9ef1ce89e 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,14 +1,14 @@ import * as fs from 'fs'; import * as path from 'path'; -import { Response } from 'jslib/cli/models/response'; -import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; +import { Response } from 'jslib-node/cli/models/response'; +import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'; -import { Organization } from 'jslib/models/domain/organization'; -import { CollectionView } from 'jslib/models/view/collectionView'; -import { FolderView } from 'jslib/models/view/folderView'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; +import { FolderView } from 'jslib-common/models/view/folderView'; -import { NodeUtils } from 'jslib/misc/nodeUtils'; +import { NodeUtils } from 'jslib-common/misc/nodeUtils'; export class CliUtils { static writeLn(s: string, finalLine: boolean = false, error: boolean = false) { diff --git a/tsconfig.json b/tsconfig.json index ab31e6425a..e471938047 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,23 +11,15 @@ "sourceMap": true, "baseUrl": ".", "paths": { - "jslib/*": [ - "jslib/src/*" + "jslib-common/*": [ + "jslib/common/src/*" + ], + "jslib-node/*": [ + "jslib/node/src/*" ] - }, - "typeRoots": [ - "node_modules/@types" - ] + } }, - "exclude": [ - "node_modules", - "jslib/node_modules", - "dist", - "jslib/dist", - "jslib/spec", - "jslib/src/electron", - "jslib/src/angular", - "jslib/src/services/notifications.service.ts", - "build" + "include": [ + "src" ] } diff --git a/webpack.config.js b/webpack.config.js index 8ee1eb7e40..582ae438e1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,6 +3,7 @@ const webpack = require('webpack'); const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const nodeExternals = require('webpack-node-externals'); +const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); if (process.env.NODE_ENV == null) { process.env.NODE_ENV = 'development'; @@ -55,11 +56,9 @@ const config = { }, resolve: { extensions: ['.ts', '.js'], - alias: { - jslib: path.join(__dirname, 'jslib/src'), - }, symlinks: false, modules: [path.resolve('node_modules')], + plugins: [new TsconfigPathsPlugin({ configFile: './tsconfig.json' })], }, output: { filename: '[name].js',