diff --git a/.yarn/patches/got-npm-11.8.2-c1eb105458.patch b/.yarn/patches/got-npm-11.8.2-c1eb105458.patch deleted file mode 100644 index f4ba466..0000000 --- a/.yarn/patches/got-npm-11.8.2-c1eb105458.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/dist/source/as-promise/index.js b/dist/source/as-promise/index.js -index 9575c09d653037596ddf945afccedbbc672c4ee6..e76be77add047033f8618164aa4f03e372d4ac8f 100644 ---- a/dist/source/as-promise/index.js -+++ b/dist/source/as-promise/index.js -@@ -29,6 +29,7 @@ const proxiedRequestEvents = [ - function asPromise(normalizedOptions) { - let globalRequest; - let globalResponse; -+ let promiseSettled = false; - const emitter = new events_1.EventEmitter(); - const promise = new PCancelable((resolve, reject, onCancel) => { - const makeRequest = (retryCount) => { -@@ -37,7 +38,10 @@ function asPromise(normalizedOptions) { - request._noPipe = true; - onCancel(() => request.destroy()); - onCancel.shouldReject = false; -- onCancel(() => reject(new types_1.CancelError(request))); -+ onCancel(() => { -+ promiseSettled = true; -+ reject(new types_1.CancelError(request)); -+ }); - globalRequest = request; - request.once('response', async (response) => { - var _a; -@@ -118,12 +122,14 @@ function asPromise(normalizedOptions) { - return; - } - globalResponse = response; -+ promiseSettled = true; - resolve(request.options.resolveBodyOnly ? response.body : response); - }); - const onError = (error) => { - if (promise.isCanceled) { - return; - } -+ promiseSettled = true; - const { options } = request; - if (error instanceof types_1.HTTPError && !options.throwHttpErrors) { - const { response } = error; -@@ -136,6 +142,9 @@ function asPromise(normalizedOptions) { - const previousBody = request.options.body; - request.once('retry', (newRetryCount, error) => { - var _a, _b; -+ if (promiseSettled) { -+ return; -+ } - if (previousBody === ((_a = error.request) === null || _a === void 0 ? void 0 : _a.options.body) && is_1.default.nodeStream((_b = error.request) === null || _b === void 0 ? void 0 : _b.options.body)) { - onError(error); - return; diff --git a/Dockerfile b/Dockerfile index 31a5dd7..ffe8eaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,6 @@ COPY packages/backstage-theme-github/package.json ./packages/backstage-theme-git COPY plugins/ plugins/ COPY .yarnrc.yml ./ COPY .yarn/plugins/ .yarn/plugins/ -COPY .yarn/patches/ .yarn/patches/ COPY backstage.json ./ RUN yarn install --immutable @@ -121,7 +120,6 @@ RUN tar xzf skeleton.tar.gz && rm skeleton.tar.gz COPY .yarnrc.yml ./ COPY .yarn/plugins/ .yarn/plugins/ -COPY .yarn/patches/ .yarn/patches/ COPY backstage.json ./ RUN yarn workspaces focus --all --production && rm -rf "$(yarn cache clean)" diff --git a/package.json b/package.json index 464503a..70be25c 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "resolutions": { "@types/react": "^18", "@types/react-dom": "^18", + "got": "npm:11.8.2", "isolated-vm": "5.0.4" }, "prettier": "@spotify/prettier-config", diff --git a/yarn.lock b/yarn.lock index dab856c..f109fac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23730,25 +23730,6 @@ __metadata: languageName: node linkType: hard -"got@patch:got@npm%3A11.8.2#~/.yarn/patches/got-npm-11.8.2-c1eb105458.patch": - version: 11.8.2 - resolution: "got@patch:got@npm%3A11.8.2#~/.yarn/patches/got-npm-11.8.2-c1eb105458.patch::version=11.8.2&hash=15933f" - dependencies: - "@sindresorhus/is": "npm:^4.0.0" - "@szmarczak/http-timer": "npm:^4.0.5" - "@types/cacheable-request": "npm:^6.0.1" - "@types/responselike": "npm:^1.0.0" - cacheable-lookup: "npm:^5.0.3" - cacheable-request: "npm:^7.0.1" - decompress-response: "npm:^6.0.0" - http2-wrapper: "npm:^1.0.0-beta.5.2" - lowercase-keys: "npm:^2.0.0" - p-cancelable: "npm:^2.0.0" - responselike: "npm:^2.0.0" - checksum: 10c0/516cdf835173357b519184137c02f9722dd348ab94dff79a572ccae43d741457369031e0a775e0b1f93eb560efb8faf38dcec6bbbde0adf434f489c15df14b89 - languageName: node - linkType: hard - "graceful-fs@npm:4.2.11, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11"