Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions .yarn/patches/got-npm-11.8.2-c1eb105458.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
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;
2 changes: 1 addition & 1 deletion .yarn/plugins/@yarnpkg/plugin-backstage.cjs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
nodeLinker: node-modules

plugins:
- checksum: 4d77204ecc396a20b7fc16e530b680ad1c68984cb5bd985d4443dc9fe4275f83
- checksum: e036bbabee4fda5a34aed96597e1fa22a0fc753bc7737c525c1b7e37d626f4894e71a01fe7440458a3d034b7f9e648c394cebfb3b47a75b731b16e5b8d50fe60
path: .yarn/plugins/@yarnpkg/plugin-backstage.cjs
spec: "https://versions.backstage.io/v1/releases/1.53.1/yarn-plugin"
spec: "https://versions.backstage.io/v1/releases/1.55.3/yarn-plugin"
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ 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

Expand Down Expand Up @@ -120,6 +121,7 @@ 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)"

Expand Down
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.53.1"
"version": "1.55.3"
}
Loading
Loading