From bae3394efc89ea47f5c852b1051806a7f6aea3e2 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Mon, 27 Jun 2022 15:00:07 -0700 Subject: [PATCH] Fix patches for protobufjs and got --- patches/{got+11.8.2.patch => got+11.8.5.patch} | 10 +++++----- ...protobufjs+6.10.2.patch => protobufjs+6.11.3.patch} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename patches/{got+11.8.2.patch => got+11.8.5.patch} (86%) rename patches/{protobufjs+6.10.2.patch => protobufjs+6.11.3.patch} (100%) diff --git a/patches/got+11.8.2.patch b/patches/got+11.8.5.patch similarity index 86% rename from patches/got+11.8.2.patch rename to patches/got+11.8.5.patch index 19cb1236d..e567615ac 100644 --- a/patches/got+11.8.2.patch +++ b/patches/got+11.8.5.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/got/dist/source/as-promise/index.js b/node_modules/got/dist/source/as-promise/index.js -index 9575c09..a00a014 100644 +index b4026d3..a473860 100644 --- a/node_modules/got/dist/source/as-promise/index.js +++ b/node_modules/got/dist/source/as-promise/index.js @@ -33,6 +33,7 @@ function asPromise(normalizedOptions) { @@ -10,14 +10,14 @@ index 9575c09..a00a014 100644 request.retryCount = retryCount; request._noPipe = true; onCancel(() => request.destroy()); -@@ -118,6 +119,7 @@ function asPromise(normalizedOptions) { +@@ -114,6 +115,7 @@ function asPromise(normalizedOptions) { return; } globalResponse = response; + isResolved = true; - resolve(request.options.resolveBodyOnly ? response.body : response); - }); - const onError = (error) => { + if (!is_response_ok_1.isResponseOk(response)) { + request._beforeError(new types_1.HTTPError(response)); + return; @@ -127,9 +129,11 @@ function asPromise(normalizedOptions) { const { options } = request; if (error instanceof types_1.HTTPError && !options.throwHttpErrors) { diff --git a/patches/protobufjs+6.10.2.patch b/patches/protobufjs+6.11.3.patch similarity index 100% rename from patches/protobufjs+6.10.2.patch rename to patches/protobufjs+6.11.3.patch