Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

update package https-proxy-agent (#246)

Browse Source 
* update package http-proxy-agent

* Update syntax appropriately

* Explicitly add utils package to fix broken tests

* Revert "Explicitly add utils package to fix broken tests"

This reverts commit 2cf03fdcbae89e55124c7e36201238520434f8cc.

* Import util in spec to make sure it gets bundled

* Revert "Import util in spec to make sure it gets bundled"

This reverts commit 79264cdab0ef37af855d64a6dc3ef574575309d2.

* Add alias to ensure util module resolves in tests

Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
This commit is contained in:
Chad Scharf 2021-01-27 20:08:56 -05:00 committed by GitHub
parent d1c46e6bdc
commit 06239aea2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
package-lock.json generated
View File

@ -668,9 +668,27 @@
"dev": true "dev": true
}, },
"agent-base": { "agent-base": {
"version": "5.1.1", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"requires": {
"debug": "4"
},
"dependencies": {
"debug": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"requires": {
"ms": "2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}
}
}, },
"ajv": { "ajv": {
"version": "6.7.0", "version": "6.7.0",
@ -4293,20 +4311,20 @@
"dev": true "dev": true
}, },
"https-proxy-agent": { "https-proxy-agent": {
"version": "4.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
"integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
"requires": { "requires": {
"agent-base": "5", "agent-base": "6",
"debug": "4" "debug": "4"
}, },
"dependencies": { "dependencies": {
"debug": { "debug": {
"version": "4.1.1", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"requires": { "requires": {
"ms": "^2.1.1" "ms": "2.1.2"
} }
}, },
"ms": { "ms": {

2
package.json
View File

@ -87,7 +87,7 @@
"electron-updater": "4.3.5", "electron-updater": "4.3.5",
"forcefocus": "^1.1.0", "forcefocus": "^1.1.0",
"form-data": "2.3.2", "form-data": "2.3.2",
"https-proxy-agent": "4.0.0", "https-proxy-agent": "5.0.0",
"inquirer": "6.2.0", "inquirer": "6.2.0",
"jsdom": "13.2.0", "jsdom": "13.2.0",
"keytar": "4.13.0", "keytar": "4.13.0",

7
spec/support/karma.conf.js
View File

@ -57,7 +57,12 @@ module.exports = (config) => {
tsconfig: './tsconfig.json', tsconfig: './tsconfig.json',
bundlerOptions: { bundlerOptions: {
entrypoints: /\.spec\.ts$/, entrypoints: /\.spec\.ts$/,
sourceMap: true sourceMap: true,
resolve: {
alias: {
"util": "node_modules/util/util.js"
}
}
} }
}, },

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

@ -1,5 +1,5 @@
import * as FormData from 'form-data'; import * as FormData from 'form-data';
import * as HttpsProxyAgent from 'https-proxy-agent'; import { HttpsProxyAgent } from 'https-proxy-agent';
import * as fe from 'node-fetch'; import * as fe from 'node-fetch';
import { ApiService } from './api.service'; import { ApiService } from './api.service';