@backstage/integration 2.0.2-next.0 → 2.0.2-next.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @backstage/integration
 
+## 2.0.2-next.1
+
+### Patch Changes
+
+- 6b112d3: Fixed two issues in the GitLab integration's fetch behavior:
+
+  - The internal fetch wrapper was passing `mode: 'same-origin'` on every request. This had no practical effect server-side, but would have caused cross-origin requests to be rejected when the integration is used from a browser. Requests now use the default fetch mode and work correctly in both browser and Node environments.
+  - When retries are configured, transient network errors (such as dropped connections or DNS hiccups) are now retried using the same `maxRetries` and exponential delay as retryable HTTP status codes. Previously, a thrown fetch error would propagate immediately on the first failure regardless of the retry configuration. Caller-initiated aborts continue to surface immediately without being retried.
+
 ## 2.0.2-next.0
 
 ### Patch Changes

package/dist/gitlab/GitLabIntegration.cjs.js

@@ -42,9 +42,7 @@ class GitLabIntegration {
     return this.fetchImpl(input, init);
   }
   createFetchStrategy() {
-    let fetchFn = async (url, options) => {
-      return fetch(url, { ...options, mode: "same-origin" });
-    };
+    let fetchFn = (url, options) => fetch(url, options);
     const retryConfig = this.integrationConfig.retry;
     if (retryConfig) {
       fetchFn = this.withRetry(fetchFn, retryConfig);
@@ -63,26 +61,55 @@ class GitLabIntegration {
     if (maxRetries <= 0 || retryStatusCodes.length === 0) {
       return fetchFn;
     }
+    const backoffDelay = (a) => Math.min(100 * Math.pow(2, a - 1), 1e4);
     return async (url, options) => {
       const abortSignal = options?.signal;
-      let response;
       let attempt = 0;
       for (; ; ) {
-        response = await fetchFn(url, options);
+        let response;
+        try {
+          response = await fetchFn(url, options);
+        } catch (e) {
+          if (abortSignal?.aborted) throw e;
+          if (attempt++ >= maxRetries) throw e;
+          await sleep(backoffDelay(attempt), abortSignal);
+          if (abortSignal?.aborted) throw e;
+          continue;
+        }
         if (!retryStatusCodes.includes(response.status)) {
-          break;
+          return response;
         }
         if (attempt++ >= maxRetries) {
-          break;
+          return response;
         }
-        const retryAfter = response.headers.get("Retry-After");
-        const delay = retryAfter ? parseInt(retryAfter, 10) * 1e3 : Math.min(100 * Math.pow(2, attempt - 1), 1e4);
+        const delay = parseRetryAfterMs(
+          response.headers.get("Retry-After"),
+          backoffDelay(attempt)
+        );
+        await response.body?.cancel().catch(() => {
+        });
         await sleep(delay, abortSignal);
+        if (abortSignal?.aborted) return response;
       }
-      return response;
     };
   }
 }
+function parseRetryAfterMs(headerValue, fallbackMs) {
+  if (!headerValue) {
+    return fallbackMs;
+  }
+  if (/^\d+$/.test(headerValue)) {
+    return Number(headerValue) * 1e3;
+  }
+  if (headerValue.includes(",")) {
+    const dateMs = Date.parse(headerValue);
+    if (Number.isFinite(dateMs)) {
+      const deltaMs = dateMs - Date.now();
+      return deltaMs > 0 ? deltaMs : 0;
+    }
+  }
+  return fallbackMs;
+}
 async function sleep(durationMs, abortSignal) {
   if (abortSignal?.aborted) {
     return;
@@ -105,6 +132,7 @@ function replaceGitLabUrlType(url, type) {
 }
 
 exports.GitLabIntegration = GitLabIntegration;
+exports.parseRetryAfterMs = parseRetryAfterMs;
 exports.replaceGitLabUrlType = replaceGitLabUrlType;
 exports.sleep = sleep;
 //# sourceMappingURL=GitLabIntegration.cjs.js.map

package/dist/gitlab/GitLabIntegration.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"GitLabIntegration.cjs.js","sources":["../../src/gitlab/GitLabIntegration.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { basicIntegrations, defaultScmResolveUrl } from '../helpers';\nimport { ScmIntegration, ScmIntegrationsFactory } from '../types';\nimport {\n  GitLabIntegrationConfig,\n  readGitLabIntegrationConfigs,\n} from './config';\nimport pThrottle from 'p-throttle';\n\ntype FetchFunction = typeof fetch;\n\n/**\n * A GitLab based integration.\n *\n * @public\n */\nexport class GitLabIntegration implements ScmIntegration {\n  static factory: ScmIntegrationsFactory<GitLabIntegration> = ({ config }) => {\n    const configs = readGitLabIntegrationConfigs(\n      config.getOptionalConfigArray('integrations.gitlab') ?? [],\n    );\n    return basicIntegrations(\n      configs.map(c => new GitLabIntegration(c)),\n      i => i.config.host,\n    );\n  };\n\n  private readonly fetchImpl: FetchFunction;\n\n  constructor(private readonly integrationConfig: GitLabIntegrationConfig) {\n    // Configure fetch strategy based on configuration\n    this.fetchImpl = this.createFetchStrategy();\n  }\n\n  get type(): string {\n    return 'gitlab';\n  }\n\n  get title(): string {\n    return this.integrationConfig.host;\n  }\n\n  get config(): GitLabIntegrationConfig {\n    return this.integrationConfig;\n  }\n\n  resolveUrl(options: {\n    url: string;\n    base: string;\n    lineNumber?: number;\n  }): string {\n    return defaultScmResolveUrl(options);\n  }\n\n  resolveEditUrl(url: string): string {\n    return replaceGitLabUrlType(url, 'edit');\n  }\n\n  fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response> {\n    return this.fetchImpl(input, init);\n  }\n\n  private createFetchStrategy(): FetchFunction {\n    let fetchFn: FetchFunction = async (url, options) => {\n      return fetch(url, { ...options, mode: 'same-origin' });\n    };\n\n    const retryConfig = this.integrationConfig.retry;\n    if (retryConfig) {\n      // Apply retry wrapper if configured\n      fetchFn = this.withRetry(fetchFn, retryConfig);\n\n      // Apply throttling wrapper if configured\n      if (\n        retryConfig.maxApiRequestsPerMinute &&\n        retryConfig.maxApiRequestsPerMinute > 0\n      ) {\n        fetchFn = pThrottle({\n          limit: retryConfig.maxApiRequestsPerMinute,\n          interval: 60_000,\n        })(fetchFn);\n      }\n    }\n\n    return fetchFn;\n  }\n\n  private withRetry(\n    fetchFn: FetchFunction,\n    retryConfig: { maxRetries?: number; retryStatusCodes?: number[] },\n  ): FetchFunction {\n    const maxRetries = retryConfig?.maxRetries ?? 0;\n    const retryStatusCodes = retryConfig?.retryStatusCodes ?? [];\n    if (maxRetries <= 0 || retryStatusCodes.length === 0) {\n      return fetchFn;\n    }\n\n    return async (url, options) => {\n      const abortSignal = options?.signal;\n      let response: Response;\n      let attempt = 0;\n      for (;;) {\n        response = await fetchFn(url, options);\n        // If response is not retryable, return immediately\n        if (!retryStatusCodes.includes(response.status)) {\n          break;\n        }\n\n        // If this was the last allowed attempt, return response\n        if (attempt++ >= maxRetries) {\n          break;\n        }\n        // Determine delay from Retry-After header if present, otherwise exponential backoff\n        const retryAfter = response.headers.get('Retry-After');\n        const delay = retryAfter\n          ? parseInt(retryAfter, 10) * 1000\n          : Math.min(100 * Math.pow(2, attempt - 1), 10000); // Exponential backoff, cap at 10 seconds\n\n        await sleep(delay, abortSignal);\n      }\n\n      return response;\n    };\n  }\n}\n\n/** @internal */\nexport async function sleep(\n  durationMs: number,\n  abortSignal: AbortSignal | null | undefined,\n): Promise<void> {\n  if (abortSignal?.aborted) {\n    return;\n  }\n\n  await new Promise<void>(resolve => {\n    let timeoutHandle: NodeJS.Timeout | undefined = undefined;\n\n    const done = () => {\n      if (timeoutHandle) {\n        clearTimeout(timeoutHandle);\n      }\n      abortSignal?.removeEventListener('abort', done);\n      resolve();\n    };\n\n    timeoutHandle = setTimeout(done, durationMs);\n    abortSignal?.addEventListener('abort', done);\n  });\n}\n\n/**\n * Takes a GitLab URL and replaces the type part (blob, tree etc).\n *\n * @param url - The original URL\n * @param type - The desired type, e.g. 'blob', 'tree', 'edit'\n * @public\n */\nexport function replaceGitLabUrlType(\n  url: string,\n  type: 'blob' | 'tree' | 'edit',\n): string {\n  return url.replace(/\\/\\-\\/(blob|tree|edit)\\//, `/-/${type}/`);\n}\n"],"names":["config","readGitLabIntegrationConfigs","basicIntegrations","defaultScmResolveUrl","pThrottle"],"mappings":";;;;;;;;;;AA8BO,MAAM,iBAAA,CAA4C;AAAA,EAavD,YAA6B,iBAAA,EAA4C;AAA5C,IAAA,IAAA,CAAA,iBAAA,GAAA,iBAAA;AAE3B,IAAA,IAAA,CAAK,SAAA,GAAY,KAAK,mBAAA,EAAoB;AAAA,EAC5C;AAAA,EAfA,OAAO,OAAA,GAAqD,CAAC,UAAEA,UAAO,KAAM;AAC1E,IAAA,MAAM,OAAA,GAAUC,mCAAA;AAAA,MACdD,QAAA,CAAO,sBAAA,CAAuB,qBAAqB,CAAA,IAAK;AAAC,KAC3D;AACA,IAAA,OAAOE,yBAAA;AAAA,MACL,QAAQ,GAAA,CAAI,CAAA,CAAA,KAAK,IAAI,iBAAA,CAAkB,CAAC,CAAC,CAAA;AAAA,MACzC,CAAA,CAAA,KAAK,EAAE,MAAA,CAAO;AAAA,KAChB;AAAA,EACF,CAAA;AAAA,EAEiB,SAAA;AAAA,EAOjB,IAAI,IAAA,GAAe;AACjB,IAAA,OAAO,QAAA;AAAA,EACT;AAAA,EAEA,IAAI,KAAA,GAAgB;AAClB,IAAA,OAAO,KAAK,iBAAA,CAAkB,IAAA;AAAA,EAChC;AAAA,EAEA,IAAI,MAAA,GAAkC;AACpC,IAAA,OAAO,IAAA,CAAK,iBAAA;AAAA,EACd;AAAA,EAEA,WAAW,OAAA,EAIA;AACT,IAAA,OAAOC,6BAAqB,OAAO,CAAA;AAAA,EACrC;AAAA,EAEA,eAAe,GAAA,EAAqB;AAClC,IAAA,OAAO,oBAAA,CAAqB,KAAK,MAAM,CAAA;AAAA,EACzC;AAAA,EAEA,KAAA,CAAM,OAA0B,IAAA,EAAuC;AACrE,IAAA,OAAO,IAAA,CAAK,SAAA,CAAU,KAAA,EAAO,IAAI,CAAA;AAAA,EACnC;AAAA,EAEQ,mBAAA,GAAqC;AAC3C,IAAA,IAAI,OAAA,GAAyB,OAAO,GAAA,EAAK,OAAA,KAAY;AACnD,MAAA,OAAO,MAAM,GAAA,EAAK,EAAE,GAAG,OAAA,EAAS,IAAA,EAAM,eAAe,CAAA;AAAA,IACvD,CAAA;AAEA,IAAA,MAAM,WAAA,GAAc,KAAK,iBAAA,CAAkB,KAAA;AAC3C,IAAA,IAAI,WAAA,EAAa;AAEf,MAAA,OAAA,GAAU,IAAA,CAAK,SAAA,CAAU,OAAA,EAAS,WAAW,CAAA;AAG7C,MAAA,IACE,WAAA,CAAY,uBAAA,IACZ,WAAA,CAAY,uBAAA,GAA0B,CAAA,EACtC;AACA,QAAA,OAAA,GAAUC,0BAAA,CAAU;AAAA,UAClB,OAAO,WAAA,CAAY,uBAAA;AAAA,UACnB,QAAA,EAAU;AAAA,SACX,EAAE,OAAO,CAAA;AAAA,MACZ;AAAA,IACF;AAEA,IAAA,OAAO,OAAA;AAAA,EACT;AAAA,EAEQ,SAAA,CACN,SACA,WAAA,EACe;AACf,IAAA,MAAM,UAAA,GAAa,aAAa,UAAA,IAAc,CAAA;AAC9C,IAAA,MAAM,gBAAA,GAAmB,WAAA,EAAa,gBAAA,IAAoB,EAAC;AAC3D,IAAA,IAAI,UAAA,IAAc,CAAA,IAAK,gBAAA,CAAiB,MAAA,KAAW,CAAA,EAAG;AACpD,MAAA,OAAO,OAAA;AAAA,IACT;AAEA,IAAA,OAAO,OAAO,KAAK,OAAA,KAAY;AAC7B,MAAA,MAAM,cAAc,OAAA,EAAS,MAAA;AAC7B,MAAA,IAAI,QAAA;AACJ,MAAA,IAAI,OAAA,GAAU,CAAA;AACd,MAAA,WAAS;AACP,QAAA,QAAA,GAAW,MAAM,OAAA,CAAQ,GAAA,EAAK,OAAO,CAAA;AAErC,QAAA,IAAI,CAAC,gBAAA,CAAiB,QAAA,CAAS,QAAA,CAAS,MAAM,CAAA,EAAG;AAC/C,UAAA;AAAA,QACF;AAGA,QAAA,IAAI,aAAa,UAAA,EAAY;AAC3B,UAAA;AAAA,QACF;AAEA,QAAA,MAAM,UAAA,GAAa,QAAA,CAAS,OAAA,CAAQ,GAAA,CAAI,aAAa,CAAA;AACrD,QAAA,MAAM,QAAQ,UAAA,GACV,QAAA,CAAS,UAAA,EAAY,EAAE,IAAI,GAAA,GAC3B,IAAA,CAAK,GAAA,CAAI,GAAA,GAAM,KAAK,GAAA,CAAI,CAAA,EAAG,OAAA,GAAU,CAAC,GAAG,GAAK,CAAA;AAElD,QAAA,MAAM,KAAA,CAAM,OAAO,WAAW,CAAA;AAAA,MAChC;AAEA,MAAA,OAAO,QAAA;AAAA,IACT,CAAA;AAAA,EACF;AACF;AAGA,eAAsB,KAAA,CACpB,YACA,WAAA,EACe;AACf,EAAA,IAAI,aAAa,OAAA,EAAS;AACxB,IAAA;AAAA,EACF;AAEA,EAAA,MAAM,IAAI,QAAc,CAAA,OAAA,KAAW;AACjC,IAAA,IAAI,aAAA,GAA4C,MAAA;AAEhD,IAAA,MAAM,OAAO,MAAM;AACjB,MAAA,IAAI,aAAA,EAAe;AACjB,QAAA,YAAA,CAAa,aAAa,CAAA;AAAA,MAC5B;AACA,MAAA,WAAA,EAAa,mBAAA,CAAoB,SAAS,IAAI,CAAA;AAC9C,MAAA,OAAA,EAAQ;AAAA,IACV,CAAA;AAEA,IAAA,aAAA,GAAgB,UAAA,CAAW,MAAM,UAAU,CAAA;AAC3C,IAAA,WAAA,EAAa,gBAAA,CAAiB,SAAS,IAAI,CAAA;AAAA,EAC7C,CAAC,CAAA;AACH;AASO,SAAS,oBAAA,CACd,KACA,IAAA,EACQ;AACR,EAAA,OAAO,GAAA,CAAI,OAAA,CAAQ,0BAAA,EAA4B,CAAA,GAAA,EAAM,IAAI,CAAA,CAAA,CAAG,CAAA;AAC9D;;;;;;"}
+{"version":3,"file":"GitLabIntegration.cjs.js","sources":["../../src/gitlab/GitLabIntegration.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { basicIntegrations, defaultScmResolveUrl } from '../helpers';\nimport { ScmIntegration, ScmIntegrationsFactory } from '../types';\nimport {\n  GitLabIntegrationConfig,\n  readGitLabIntegrationConfigs,\n} from './config';\nimport pThrottle from 'p-throttle';\n\ntype FetchFunction = typeof fetch;\n\n/**\n * A GitLab based integration.\n *\n * @public\n */\nexport class GitLabIntegration implements ScmIntegration {\n  static factory: ScmIntegrationsFactory<GitLabIntegration> = ({ config }) => {\n    const configs = readGitLabIntegrationConfigs(\n      config.getOptionalConfigArray('integrations.gitlab') ?? [],\n    );\n    return basicIntegrations(\n      configs.map(c => new GitLabIntegration(c)),\n      i => i.config.host,\n    );\n  };\n\n  private readonly fetchImpl: FetchFunction;\n\n  constructor(private readonly integrationConfig: GitLabIntegrationConfig) {\n    // Configure fetch strategy based on configuration\n    this.fetchImpl = this.createFetchStrategy();\n  }\n\n  get type(): string {\n    return 'gitlab';\n  }\n\n  get title(): string {\n    return this.integrationConfig.host;\n  }\n\n  get config(): GitLabIntegrationConfig {\n    return this.integrationConfig;\n  }\n\n  resolveUrl(options: {\n    url: string;\n    base: string;\n    lineNumber?: number;\n  }): string {\n    return defaultScmResolveUrl(options);\n  }\n\n  resolveEditUrl(url: string): string {\n    return replaceGitLabUrlType(url, 'edit');\n  }\n\n  fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response> {\n    return this.fetchImpl(input, init);\n  }\n\n  private createFetchStrategy(): FetchFunction {\n    let fetchFn: FetchFunction = (url, options) => fetch(url, options);\n\n    const retryConfig = this.integrationConfig.retry;\n    if (retryConfig) {\n      // Apply retry wrapper if configured\n      fetchFn = this.withRetry(fetchFn, retryConfig);\n\n      // Apply throttling wrapper if configured\n      if (\n        retryConfig.maxApiRequestsPerMinute &&\n        retryConfig.maxApiRequestsPerMinute > 0\n      ) {\n        fetchFn = pThrottle({\n          limit: retryConfig.maxApiRequestsPerMinute,\n          interval: 60_000,\n        })(fetchFn);\n      }\n    }\n\n    return fetchFn;\n  }\n\n  private withRetry(\n    fetchFn: FetchFunction,\n    retryConfig: { maxRetries?: number; retryStatusCodes?: number[] },\n  ): FetchFunction {\n    const maxRetries = retryConfig?.maxRetries ?? 0;\n    const retryStatusCodes = retryConfig?.retryStatusCodes ?? [];\n    if (maxRetries <= 0 || retryStatusCodes.length === 0) {\n      return fetchFn;\n    }\n\n    // Exponential backoff, cap at 10 seconds\n    const backoffDelay = (a: number) =>\n      Math.min(100 * Math.pow(2, a - 1), 10000);\n\n    return async (url, options) => {\n      const abortSignal = options?.signal;\n      let attempt = 0;\n      for (;;) {\n        let response: Response;\n        try {\n          response = await fetchFn(url, options);\n        } catch (e) {\n          // The caller aborted — surface that immediately rather than retrying.\n          if (abortSignal?.aborted) throw e;\n          // No more attempts left — propagate the network error.\n          if (attempt++ >= maxRetries) throw e;\n          await sleep(backoffDelay(attempt), abortSignal);\n          if (abortSignal?.aborted) throw e;\n          continue;\n        }\n\n        // Successful, non-retryable response: return immediately\n        if (!retryStatusCodes.includes(response.status)) {\n          return response;\n        }\n\n        // No more attempts left — return the last (retryable) response.\n        if (attempt++ >= maxRetries) {\n          return response;\n        }\n\n        // Retry-After is either delay-seconds or an HTTP-date (RFC 9110 §10.2.3).\n        const delay = parseRetryAfterMs(\n          response.headers.get('Retry-After'),\n          backoffDelay(attempt),\n        );\n\n        // Release the underlying connection so it can be reused, since we're\n        // about to discard this response in favor of a retry.\n        await response.body?.cancel().catch(() => {});\n\n        await sleep(delay, abortSignal);\n        if (abortSignal?.aborted) return response;\n      }\n    };\n  }\n}\n\n/** @internal */\nexport function parseRetryAfterMs(\n  headerValue: string | null,\n  fallbackMs: number,\n): number {\n  if (!headerValue) {\n    return fallbackMs;\n  }\n\n  // delay-seconds per RFC 9110 is 1*DIGIT\n  if (/^\\d+$/.test(headerValue)) {\n    return Number(headerValue) * 1000;\n  }\n\n  // HTTP-dates (IMF-fixdate) always contain a comma, e.g.\n  // \"Sun, 06 Nov 1994 08:49:37 GMT\" — use that as a prerequisite\n  // to avoid Date.parse interpreting random strings as dates.\n  if (headerValue.includes(',')) {\n    const dateMs = Date.parse(headerValue);\n    if (Number.isFinite(dateMs)) {\n      const deltaMs = dateMs - Date.now();\n      return deltaMs > 0 ? deltaMs : 0;\n    }\n  }\n\n  return fallbackMs;\n}\n\n/** @internal */\nexport async function sleep(\n  durationMs: number,\n  abortSignal: AbortSignal | null | undefined,\n): Promise<void> {\n  if (abortSignal?.aborted) {\n    return;\n  }\n\n  await new Promise<void>(resolve => {\n    let timeoutHandle: NodeJS.Timeout | undefined = undefined;\n\n    const done = () => {\n      if (timeoutHandle) {\n        clearTimeout(timeoutHandle);\n      }\n      abortSignal?.removeEventListener('abort', done);\n      resolve();\n    };\n\n    timeoutHandle = setTimeout(done, durationMs);\n    abortSignal?.addEventListener('abort', done);\n  });\n}\n\n/**\n * Takes a GitLab URL and replaces the type part (blob, tree etc).\n *\n * @param url - The original URL\n * @param type - The desired type, e.g. 'blob', 'tree', 'edit'\n * @public\n */\nexport function replaceGitLabUrlType(\n  url: string,\n  type: 'blob' | 'tree' | 'edit',\n): string {\n  return url.replace(/\\/\\-\\/(blob|tree|edit)\\//, `/-/${type}/`);\n}\n"],"names":["config","readGitLabIntegrationConfigs","basicIntegrations","defaultScmResolveUrl","pThrottle"],"mappings":"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"}

package/dist/gitlab/GitLabIntegration.esm.js

@@ -36,9 +36,7 @@ class GitLabIntegration {
     return this.fetchImpl(input, init);
   }
   createFetchStrategy() {
-    let fetchFn = async (url, options) => {
-      return fetch(url, { ...options, mode: "same-origin" });
-    };
+    let fetchFn = (url, options) => fetch(url, options);
     const retryConfig = this.integrationConfig.retry;
     if (retryConfig) {
       fetchFn = this.withRetry(fetchFn, retryConfig);
@@ -57,26 +55,55 @@ class GitLabIntegration {
     if (maxRetries <= 0 || retryStatusCodes.length === 0) {
       return fetchFn;
     }
+    const backoffDelay = (a) => Math.min(100 * Math.pow(2, a - 1), 1e4);
     return async (url, options) => {
       const abortSignal = options?.signal;
-      let response;
       let attempt = 0;
       for (; ; ) {
-        response = await fetchFn(url, options);
+        let response;
+        try {
+          response = await fetchFn(url, options);
+        } catch (e) {
+          if (abortSignal?.aborted) throw e;
+          if (attempt++ >= maxRetries) throw e;
+          await sleep(backoffDelay(attempt), abortSignal);
+          if (abortSignal?.aborted) throw e;
+          continue;
+        }
         if (!retryStatusCodes.includes(response.status)) {
-          break;
+          return response;
         }
         if (attempt++ >= maxRetries) {
-          break;
+          return response;
         }
-        const retryAfter = response.headers.get("Retry-After");
-        const delay = retryAfter ? parseInt(retryAfter, 10) * 1e3 : Math.min(100 * Math.pow(2, attempt - 1), 1e4);
+        const delay = parseRetryAfterMs(
+          response.headers.get("Retry-After"),
+          backoffDelay(attempt)
+        );
+        await response.body?.cancel().catch(() => {
+        });
         await sleep(delay, abortSignal);
+        if (abortSignal?.aborted) return response;
       }
-      return response;
     };
   }
 }
+function parseRetryAfterMs(headerValue, fallbackMs) {
+  if (!headerValue) {
+    return fallbackMs;
+  }
+  if (/^\d+$/.test(headerValue)) {
+    return Number(headerValue) * 1e3;
+  }
+  if (headerValue.includes(",")) {
+    const dateMs = Date.parse(headerValue);
+    if (Number.isFinite(dateMs)) {
+      const deltaMs = dateMs - Date.now();
+      return deltaMs > 0 ? deltaMs : 0;
+    }
+  }
+  return fallbackMs;
+}
 async function sleep(durationMs, abortSignal) {
   if (abortSignal?.aborted) {
     return;
@@ -98,5 +125,5 @@ function replaceGitLabUrlType(url, type) {
   return url.replace(/\/\-\/(blob|tree|edit)\//, `/-/${type}/`);
 }
 
-export { GitLabIntegration, replaceGitLabUrlType, sleep };
+export { GitLabIntegration, parseRetryAfterMs, replaceGitLabUrlType, sleep };
 //# sourceMappingURL=GitLabIntegration.esm.js.map

package/dist/gitlab/GitLabIntegration.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"GitLabIntegration.esm.js","sources":["../../src/gitlab/GitLabIntegration.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { basicIntegrations, defaultScmResolveUrl } from '../helpers';\nimport { ScmIntegration, ScmIntegrationsFactory } from '../types';\nimport {\n  GitLabIntegrationConfig,\n  readGitLabIntegrationConfigs,\n} from './config';\nimport pThrottle from 'p-throttle';\n\ntype FetchFunction = typeof fetch;\n\n/**\n * A GitLab based integration.\n *\n * @public\n */\nexport class GitLabIntegration implements ScmIntegration {\n  static factory: ScmIntegrationsFactory<GitLabIntegration> = ({ config }) => {\n    const configs = readGitLabIntegrationConfigs(\n      config.getOptionalConfigArray('integrations.gitlab') ?? [],\n    );\n    return basicIntegrations(\n      configs.map(c => new GitLabIntegration(c)),\n      i => i.config.host,\n    );\n  };\n\n  private readonly fetchImpl: FetchFunction;\n\n  constructor(private readonly integrationConfig: GitLabIntegrationConfig) {\n    // Configure fetch strategy based on configuration\n    this.fetchImpl = this.createFetchStrategy();\n  }\n\n  get type(): string {\n    return 'gitlab';\n  }\n\n  get title(): string {\n    return this.integrationConfig.host;\n  }\n\n  get config(): GitLabIntegrationConfig {\n    return this.integrationConfig;\n  }\n\n  resolveUrl(options: {\n    url: string;\n    base: string;\n    lineNumber?: number;\n  }): string {\n    return defaultScmResolveUrl(options);\n  }\n\n  resolveEditUrl(url: string): string {\n    return replaceGitLabUrlType(url, 'edit');\n  }\n\n  fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response> {\n    return this.fetchImpl(input, init);\n  }\n\n  private createFetchStrategy(): FetchFunction {\n    let fetchFn: FetchFunction = async (url, options) => {\n      return fetch(url, { ...options, mode: 'same-origin' });\n    };\n\n    const retryConfig = this.integrationConfig.retry;\n    if (retryConfig) {\n      // Apply retry wrapper if configured\n      fetchFn = this.withRetry(fetchFn, retryConfig);\n\n      // Apply throttling wrapper if configured\n      if (\n        retryConfig.maxApiRequestsPerMinute &&\n        retryConfig.maxApiRequestsPerMinute > 0\n      ) {\n        fetchFn = pThrottle({\n          limit: retryConfig.maxApiRequestsPerMinute,\n          interval: 60_000,\n        })(fetchFn);\n      }\n    }\n\n    return fetchFn;\n  }\n\n  private withRetry(\n    fetchFn: FetchFunction,\n    retryConfig: { maxRetries?: number; retryStatusCodes?: number[] },\n  ): FetchFunction {\n    const maxRetries = retryConfig?.maxRetries ?? 0;\n    const retryStatusCodes = retryConfig?.retryStatusCodes ?? [];\n    if (maxRetries <= 0 || retryStatusCodes.length === 0) {\n      return fetchFn;\n    }\n\n    return async (url, options) => {\n      const abortSignal = options?.signal;\n      let response: Response;\n      let attempt = 0;\n      for (;;) {\n        response = await fetchFn(url, options);\n        // If response is not retryable, return immediately\n        if (!retryStatusCodes.includes(response.status)) {\n          break;\n        }\n\n        // If this was the last allowed attempt, return response\n        if (attempt++ >= maxRetries) {\n          break;\n        }\n        // Determine delay from Retry-After header if present, otherwise exponential backoff\n        const retryAfter = response.headers.get('Retry-After');\n        const delay = retryAfter\n          ? parseInt(retryAfter, 10) * 1000\n          : Math.min(100 * Math.pow(2, attempt - 1), 10000); // Exponential backoff, cap at 10 seconds\n\n        await sleep(delay, abortSignal);\n      }\n\n      return response;\n    };\n  }\n}\n\n/** @internal */\nexport async function sleep(\n  durationMs: number,\n  abortSignal: AbortSignal | null | undefined,\n): Promise<void> {\n  if (abortSignal?.aborted) {\n    return;\n  }\n\n  await new Promise<void>(resolve => {\n    let timeoutHandle: NodeJS.Timeout | undefined = undefined;\n\n    const done = () => {\n      if (timeoutHandle) {\n        clearTimeout(timeoutHandle);\n      }\n      abortSignal?.removeEventListener('abort', done);\n      resolve();\n    };\n\n    timeoutHandle = setTimeout(done, durationMs);\n    abortSignal?.addEventListener('abort', done);\n  });\n}\n\n/**\n * Takes a GitLab URL and replaces the type part (blob, tree etc).\n *\n * @param url - The original URL\n * @param type - The desired type, e.g. 'blob', 'tree', 'edit'\n * @public\n */\nexport function replaceGitLabUrlType(\n  url: string,\n  type: 'blob' | 'tree' | 'edit',\n): string {\n  return url.replace(/\\/\\-\\/(blob|tree|edit)\\//, `/-/${type}/`);\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"GitLabIntegration.esm.js","sources":["../../src/gitlab/GitLabIntegration.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { basicIntegrations, defaultScmResolveUrl } from '../helpers';\nimport { ScmIntegration, ScmIntegrationsFactory } from '../types';\nimport {\n  GitLabIntegrationConfig,\n  readGitLabIntegrationConfigs,\n} from './config';\nimport pThrottle from 'p-throttle';\n\ntype FetchFunction = typeof fetch;\n\n/**\n * A GitLab based integration.\n *\n * @public\n */\nexport class GitLabIntegration implements ScmIntegration {\n  static factory: ScmIntegrationsFactory<GitLabIntegration> = ({ config }) => {\n    const configs = readGitLabIntegrationConfigs(\n      config.getOptionalConfigArray('integrations.gitlab') ?? [],\n    );\n    return basicIntegrations(\n      configs.map(c => new GitLabIntegration(c)),\n      i => i.config.host,\n    );\n  };\n\n  private readonly fetchImpl: FetchFunction;\n\n  constructor(private readonly integrationConfig: GitLabIntegrationConfig) {\n    // Configure fetch strategy based on configuration\n    this.fetchImpl = this.createFetchStrategy();\n  }\n\n  get type(): string {\n    return 'gitlab';\n  }\n\n  get title(): string {\n    return this.integrationConfig.host;\n  }\n\n  get config(): GitLabIntegrationConfig {\n    return this.integrationConfig;\n  }\n\n  resolveUrl(options: {\n    url: string;\n    base: string;\n    lineNumber?: number;\n  }): string {\n    return defaultScmResolveUrl(options);\n  }\n\n  resolveEditUrl(url: string): string {\n    return replaceGitLabUrlType(url, 'edit');\n  }\n\n  fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response> {\n    return this.fetchImpl(input, init);\n  }\n\n  private createFetchStrategy(): FetchFunction {\n    let fetchFn: FetchFunction = (url, options) => fetch(url, options);\n\n    const retryConfig = this.integrationConfig.retry;\n    if (retryConfig) {\n      // Apply retry wrapper if configured\n      fetchFn = this.withRetry(fetchFn, retryConfig);\n\n      // Apply throttling wrapper if configured\n      if (\n        retryConfig.maxApiRequestsPerMinute &&\n        retryConfig.maxApiRequestsPerMinute > 0\n      ) {\n        fetchFn = pThrottle({\n          limit: retryConfig.maxApiRequestsPerMinute,\n          interval: 60_000,\n        })(fetchFn);\n      }\n    }\n\n    return fetchFn;\n  }\n\n  private withRetry(\n    fetchFn: FetchFunction,\n    retryConfig: { maxRetries?: number; retryStatusCodes?: number[] },\n  ): FetchFunction {\n    const maxRetries = retryConfig?.maxRetries ?? 0;\n    const retryStatusCodes = retryConfig?.retryStatusCodes ?? [];\n    if (maxRetries <= 0 || retryStatusCodes.length === 0) {\n      return fetchFn;\n    }\n\n    // Exponential backoff, cap at 10 seconds\n    const backoffDelay = (a: number) =>\n      Math.min(100 * Math.pow(2, a - 1), 10000);\n\n    return async (url, options) => {\n      const abortSignal = options?.signal;\n      let attempt = 0;\n      for (;;) {\n        let response: Response;\n        try {\n          response = await fetchFn(url, options);\n        } catch (e) {\n          // The caller aborted — surface that immediately rather than retrying.\n          if (abortSignal?.aborted) throw e;\n          // No more attempts left — propagate the network error.\n          if (attempt++ >= maxRetries) throw e;\n          await sleep(backoffDelay(attempt), abortSignal);\n          if (abortSignal?.aborted) throw e;\n          continue;\n        }\n\n        // Successful, non-retryable response: return immediately\n        if (!retryStatusCodes.includes(response.status)) {\n          return response;\n        }\n\n        // No more attempts left — return the last (retryable) response.\n        if (attempt++ >= maxRetries) {\n          return response;\n        }\n\n        // Retry-After is either delay-seconds or an HTTP-date (RFC 9110 §10.2.3).\n        const delay = parseRetryAfterMs(\n          response.headers.get('Retry-After'),\n          backoffDelay(attempt),\n        );\n\n        // Release the underlying connection so it can be reused, since we're\n        // about to discard this response in favor of a retry.\n        await response.body?.cancel().catch(() => {});\n\n        await sleep(delay, abortSignal);\n        if (abortSignal?.aborted) return response;\n      }\n    };\n  }\n}\n\n/** @internal */\nexport function parseRetryAfterMs(\n  headerValue: string | null,\n  fallbackMs: number,\n): number {\n  if (!headerValue) {\n    return fallbackMs;\n  }\n\n  // delay-seconds per RFC 9110 is 1*DIGIT\n  if (/^\\d+$/.test(headerValue)) {\n    return Number(headerValue) * 1000;\n  }\n\n  // HTTP-dates (IMF-fixdate) always contain a comma, e.g.\n  // \"Sun, 06 Nov 1994 08:49:37 GMT\" — use that as a prerequisite\n  // to avoid Date.parse interpreting random strings as dates.\n  if (headerValue.includes(',')) {\n    const dateMs = Date.parse(headerValue);\n    if (Number.isFinite(dateMs)) {\n      const deltaMs = dateMs - Date.now();\n      return deltaMs > 0 ? deltaMs : 0;\n    }\n  }\n\n  return fallbackMs;\n}\n\n/** @internal */\nexport async function sleep(\n  durationMs: number,\n  abortSignal: AbortSignal | null | undefined,\n): Promise<void> {\n  if (abortSignal?.aborted) {\n    return;\n  }\n\n  await new Promise<void>(resolve => {\n    let timeoutHandle: NodeJS.Timeout | undefined = undefined;\n\n    const done = () => {\n      if (timeoutHandle) {\n        clearTimeout(timeoutHandle);\n      }\n      abortSignal?.removeEventListener('abort', done);\n      resolve();\n    };\n\n    timeoutHandle = setTimeout(done, durationMs);\n    abortSignal?.addEventListener('abort', done);\n  });\n}\n\n/**\n * Takes a GitLab URL and replaces the type part (blob, tree etc).\n *\n * @param url - The original URL\n * @param type - The desired type, e.g. 'blob', 'tree', 'edit'\n * @public\n */\nexport function replaceGitLabUrlType(\n  url: string,\n  type: 'blob' | 'tree' | 'edit',\n): string {\n  return url.replace(/\\/\\-\\/(blob|tree|edit)\\//, `/-/${type}/`);\n}\n"],"names":[],"mappings":";;;;AA8BO,MAAM,iBAAA,CAA4C;AAAA,EAavD,YAA6B,iBAAA,EAA4C;AAA5C,IAAA,IAAA,CAAA,iBAAA,GAAA,iBAAA;AAE3B,IAAA,IAAA,CAAK,SAAA,GAAY,KAAK,mBAAA,EAAoB;AAAA,EAC5C;AAAA,EAfA,OAAO,OAAA,GAAqD,CAAC,EAAE,QAAO,KAAM;AAC1E,IAAA,MAAM,OAAA,GAAU,4BAAA;AAAA,MACd,MAAA,CAAO,sBAAA,CAAuB,qBAAqB,CAAA,IAAK;AAAC,KAC3D;AACA,IAAA,OAAO,iBAAA;AAAA,MACL,QAAQ,GAAA,CAAI,CAAA,CAAA,KAAK,IAAI,iBAAA,CAAkB,CAAC,CAAC,CAAA;AAAA,MACzC,CAAA,CAAA,KAAK,EAAE,MAAA,CAAO;AAAA,KAChB;AAAA,EACF,CAAA;AAAA,EAEiB,SAAA;AAAA,EAOjB,IAAI,IAAA,GAAe;AACjB,IAAA,OAAO,QAAA;AAAA,EACT;AAAA,EAEA,IAAI,KAAA,GAAgB;AAClB,IAAA,OAAO,KAAK,iBAAA,CAAkB,IAAA;AAAA,EAChC;AAAA,EAEA,IAAI,MAAA,GAAkC;AACpC,IAAA,OAAO,IAAA,CAAK,iBAAA;AAAA,EACd;AAAA,EAEA,WAAW,OAAA,EAIA;AACT,IAAA,OAAO,qBAAqB,OAAO,CAAA;AAAA,EACrC;AAAA,EAEA,eAAe,GAAA,EAAqB;AAClC,IAAA,OAAO,oBAAA,CAAqB,KAAK,MAAM,CAAA;AAAA,EACzC;AAAA,EAEA,KAAA,CAAM,OAA0B,IAAA,EAAuC;AACrE,IAAA,OAAO,IAAA,CAAK,SAAA,CAAU,KAAA,EAAO,IAAI,CAAA;AAAA,EACnC;AAAA,EAEQ,mBAAA,GAAqC;AAC3C,IAAA,IAAI,UAAyB,CAAC,GAAA,EAAK,OAAA,KAAY,KAAA,CAAM,KAAK,OAAO,CAAA;AAEjE,IAAA,MAAM,WAAA,GAAc,KAAK,iBAAA,CAAkB,KAAA;AAC3C,IAAA,IAAI,WAAA,EAAa;AAEf,MAAA,OAAA,GAAU,IAAA,CAAK,SAAA,CAAU,OAAA,EAAS,WAAW,CAAA;AAG7C,MAAA,IACE,WAAA,CAAY,uBAAA,IACZ,WAAA,CAAY,uBAAA,GAA0B,CAAA,EACtC;AACA,QAAA,OAAA,GAAU,SAAA,CAAU;AAAA,UAClB,OAAO,WAAA,CAAY,uBAAA;AAAA,UACnB,QAAA,EAAU;AAAA,SACX,EAAE,OAAO,CAAA;AAAA,MACZ;AAAA,IACF;AAEA,IAAA,OAAO,OAAA;AAAA,EACT;AAAA,EAEQ,SAAA,CACN,SACA,WAAA,EACe;AACf,IAAA,MAAM,UAAA,GAAa,aAAa,UAAA,IAAc,CAAA;AAC9C,IAAA,MAAM,gBAAA,GAAmB,WAAA,EAAa,gBAAA,IAAoB,EAAC;AAC3D,IAAA,IAAI,UAAA,IAAc,CAAA,IAAK,gBAAA,CAAiB,MAAA,KAAW,CAAA,EAAG;AACpD,MAAA,OAAO,OAAA;AAAA,IACT;AAGA,IAAA,MAAM,YAAA,GAAe,CAAC,CAAA,KACpB,IAAA,CAAK,GAAA,CAAI,GAAA,GAAM,IAAA,CAAK,GAAA,CAAI,CAAA,EAAG,CAAA,GAAI,CAAC,CAAA,EAAG,GAAK,CAAA;AAE1C,IAAA,OAAO,OAAO,KAAK,OAAA,KAAY;AAC7B,MAAA,MAAM,cAAc,OAAA,EAAS,MAAA;AAC7B,MAAA,IAAI,OAAA,GAAU,CAAA;AACd,MAAA,WAAS;AACP,QAAA,IAAI,QAAA;AACJ,QAAA,IAAI;AACF,UAAA,QAAA,GAAW,MAAM,OAAA,CAAQ,GAAA,EAAK,OAAO,CAAA;AAAA,QACvC,SAAS,CAAA,EAAG;AAEV,UAAA,IAAI,WAAA,EAAa,SAAS,MAAM,CAAA;AAEhC,UAAA,IAAI,OAAA,EAAA,IAAa,YAAY,MAAM,CAAA;AACnC,UAAA,MAAM,KAAA,CAAM,YAAA,CAAa,OAAO,CAAA,EAAG,WAAW,CAAA;AAC9C,UAAA,IAAI,WAAA,EAAa,SAAS,MAAM,CAAA;AAChC,UAAA;AAAA,QACF;AAGA,QAAA,IAAI,CAAC,gBAAA,CAAiB,QAAA,CAAS,QAAA,CAAS,MAAM,CAAA,EAAG;AAC/C,UAAA,OAAO,QAAA;AAAA,QACT;AAGA,QAAA,IAAI,aAAa,UAAA,EAAY;AAC3B,UAAA,OAAO,QAAA;AAAA,QACT;AAGA,QAAA,MAAM,KAAA,GAAQ,iBAAA;AAAA,UACZ,QAAA,CAAS,OAAA,CAAQ,GAAA,CAAI,aAAa,CAAA;AAAA,UAClC,aAAa,OAAO;AAAA,SACtB;AAIA,QAAA,MAAM,QAAA,CAAS,IAAA,EAAM,MAAA,EAAO,CAAE,MAAM,MAAM;AAAA,QAAC,CAAC,CAAA;AAE5C,QAAA,MAAM,KAAA,CAAM,OAAO,WAAW,CAAA;AAC9B,QAAA,IAAI,WAAA,EAAa,SAAS,OAAO,QAAA;AAAA,MACnC;AAAA,IACF,CAAA;AAAA,EACF;AACF;AAGO,SAAS,iBAAA,CACd,aACA,UAAA,EACQ;AACR,EAAA,IAAI,CAAC,WAAA,EAAa;AAChB,IAAA,OAAO,UAAA;AAAA,EACT;AAGA,EAAA,IAAI,OAAA,CAAQ,IAAA,CAAK,WAAW,CAAA,EAAG;AAC7B,IAAA,OAAO,MAAA,CAAO,WAAW,CAAA,GAAI,GAAA;AAAA,EAC/B;AAKA,EAAA,IAAI,WAAA,CAAY,QAAA,CAAS,GAAG,CAAA,EAAG;AAC7B,IAAA,MAAM,MAAA,GAAS,IAAA,CAAK,KAAA,CAAM,WAAW,CAAA;AACrC,IAAA,IAAI,MAAA,CAAO,QAAA,CAAS,MAAM,CAAA,EAAG;AAC3B,MAAA,MAAM,OAAA,GAAU,MAAA,GAAS,IAAA,CAAK,GAAA,EAAI;AAClC,MAAA,OAAO,OAAA,GAAU,IAAI,OAAA,GAAU,CAAA;AAAA,IACjC;AAAA,EACF;AAEA,EAAA,OAAO,UAAA;AACT;AAGA,eAAsB,KAAA,CACpB,YACA,WAAA,EACe;AACf,EAAA,IAAI,aAAa,OAAA,EAAS;AACxB,IAAA;AAAA,EACF;AAEA,EAAA,MAAM,IAAI,QAAc,CAAA,OAAA,KAAW;AACjC,IAAA,IAAI,aAAA,GAA4C,MAAA;AAEhD,IAAA,MAAM,OAAO,MAAM;AACjB,MAAA,IAAI,aAAA,EAAe;AACjB,QAAA,YAAA,CAAa,aAAa,CAAA;AAAA,MAC5B;AACA,MAAA,WAAA,EAAa,mBAAA,CAAoB,SAAS,IAAI,CAAA;AAC9C,MAAA,OAAA,EAAQ;AAAA,IACV,CAAA;AAEA,IAAA,aAAA,GAAgB,UAAA,CAAW,MAAM,UAAU,CAAA;AAC3C,IAAA,WAAA,EAAa,gBAAA,CAAiB,SAAS,IAAI,CAAA;AAAA,EAC7C,CAAC,CAAA;AACH;AASO,SAAS,oBAAA,CACd,KACA,IAAA,EACQ;AACR,EAAA,OAAO,GAAA,CAAI,OAAA,CAAQ,0BAAA,EAA4B,CAAA,GAAA,EAAM,IAAI,CAAA,CAAA,CAAG,CAAA;AAC9D;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration",
-  "version": "2.0.2-next.0",
+  "version": "2.0.2-next.1",
   "description": "Helpers for managing integrations towards external systems",
   "backstage": {
     "role": "common-library"
@@ -50,8 +50,8 @@
     "p-throttle": "^4.1.1"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "1.11.3-next.0",
-    "@backstage/cli": "0.36.2-next.0",
+    "@backstage/backend-test-utils": "1.11.3-next.1",
+    "@backstage/cli": "0.36.2-next.1",
     "@backstage/config-loader": "1.10.11-next.0",
     "msw": "^1.0.0"
   },