diff --git a/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch b/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch deleted file mode 100644 index 89d06fb1dc..0000000000 --- a/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/dist/index.js b/dist/index.js -index 663919ac5bb4f9147c5c1b09bd2e379586266a4b..88ff8873ac5beb5eb293f7e741a92fb15b00960c 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -20,21 +20,21 @@ function getSystemProxy() { - else if (process.platform === 'darwin') { - const proxySettings = yield mac_system_proxy_1.getMacSystemProxy(); - const noProxy = proxySettings.ExceptionsList || []; -- if (proxySettings.HTTPSEnable && proxySettings.HTTPSProxy && proxySettings.HTTPSPort) { -+ if (proxySettings.HTTPEnable && proxySettings.HTTPProxy && proxySettings.HTTPPort) { - return { -- proxyUrl: `https://${proxySettings.HTTPSProxy}:${proxySettings.HTTPSPort}`, -+ proxyUrl: `http://${proxySettings.HTTPProxy}:${proxySettings.HTTPPort}`, - noProxy - }; - } -- else if (proxySettings.HTTPEnable && proxySettings.HTTPProxy && proxySettings.HTTPPort) { -+ else if (proxySettings.SOCKSEnable && proxySettings.SOCKSProxy && proxySettings.SOCKSPort) { - return { -- proxyUrl: `http://${proxySettings.HTTPProxy}:${proxySettings.HTTPPort}`, -+ proxyUrl: `socks://${proxySettings.SOCKSProxy}:${proxySettings.SOCKSPort}`, - noProxy - }; - } -- else if (proxySettings.SOCKSEnable && proxySettings.SOCKSProxy && proxySettings.SOCKSPort) { -+ else if (proxySettings.HTTPSEnable && proxySettings.HTTPSProxy && proxySettings.HTTPSPort) { - return { -- proxyUrl: `socks://${proxySettings.SOCKSProxy}:${proxySettings.SOCKSPort}`, -+ proxyUrl: `http://${proxySettings.HTTPSProxy}:${proxySettings.HTTPSPort}`, - noProxy - }; - } diff --git a/package.json b/package.json index f9c80d2d9b..2953650f89 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "markdown-it": "^14.1.0", "node-stream-zip": "^1.15.0", "officeparser": "^4.1.1", - "os-proxy-config": "patch:os-proxy-config@npm%3A1.1.1#~/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch", + "os-proxy-config": "^1.1.2", "proxy-agent": "^6.5.0", "tar": "^7.4.3", "turndown": "^7.2.0", diff --git a/yarn.lock b/yarn.lock index d5bf790042..6b510301d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5193,7 +5193,7 @@ __metadata: npx-scope-finder: "npm:^1.2.0" officeparser: "npm:^4.1.1" openai: "patch:openai@npm%3A4.87.3#~/.yarn/patches/openai-npm-4.87.3-2b30a7685f.patch" - os-proxy-config: "patch:os-proxy-config@npm%3A1.1.1#~/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch" + os-proxy-config: "npm:^1.1.2" p-queue: "npm:^8.1.0" prettier: "npm:^3.5.3" proxy-agent: "npm:^6.5.0" @@ -13902,23 +13902,13 @@ __metadata: languageName: node linkType: hard -"os-proxy-config@npm:1.1.1": - version: 1.1.1 - resolution: "os-proxy-config@npm:1.1.1" +"os-proxy-config@npm:^1.1.2": + version: 1.1.2 + resolution: "os-proxy-config@npm:1.1.2" dependencies: mac-system-proxy: "npm:^1.0.0" windows-system-proxy: "npm:^1.0.0" - checksum: 10c0/87f493e73e3daa91c908d7a9d7271e768ca3f3267adc77a2423bc71af536ec3ee78d16b8e34e647bae1225893c0e0ccf30be8d0b3e7a6d2bf58876c5a701813d - languageName: node - linkType: hard - -"os-proxy-config@patch:os-proxy-config@npm%3A1.1.1#~/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch": - version: 1.1.1 - resolution: "os-proxy-config@patch:os-proxy-config@npm%3A1.1.1#~/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch::version=1.1.1&hash=6d7077" - dependencies: - mac-system-proxy: "npm:^1.0.0" - windows-system-proxy: "npm:^1.0.0" - checksum: 10c0/22022450101e5a4ddc948bec5508b14829f88f377ec11a660779d747d61dc10a45c6733c823bd38235207de278ebedb6d3b8d3236a90714f1c726424a1c7a3ad + checksum: 10c0/a7585885b9bb6251969dc6c025eb863fb8859ebf876344610f5fde57a9392f2c1adb44b130b84469ee7c2649635296187dde15edc3d7e269a3f2a6ff38041f94 languageName: node linkType: hard