@redocly/cli 1.27.1 → 1.28.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @redocly/cli
 
+## 1.28.0
+
+### Minor Changes
+
+- Switched to using native `fetch` API instead of `node-fetch` dependency, improving performance and reducing bundle size.
+
+### Patch Changes
+
+- Updated @redocly/openapi-core to v1.28.0.
+
+## 1.27.2
+
+### Patch Changes
+
+- Updated the `sideNavStyle` configuration schema to include the `path-only` option.
+- Updated @redocly/openapi-core to v1.27.2.
+
 ## 1.27.1
 
 ### Patch Changes

package/README.md

@@ -28,7 +28,7 @@ Then you can use it as `redocly [command] [options]`, for example:
 redocly lint path-to-root-file.yaml
 ```
 
-The minimum required versions of Node.js and NPM are 14.19.0 and 7.0.0 respectively.
+The minimum required versions of Node.js and NPM are 18.17.0 and 10.8.2 respectively.
 
 ### Docker
 

package/lib/__tests__/commands/push-region.test.js

@@ -4,26 +4,59 @@ const openapi_core_1 = require("@redocly/openapi-core");
 const push_1 = require("../../commands/push");
 const login_1 = require("../../commands/login");
 const config_1 = require("../fixtures/config");
-jest.mock('fs');
-jest.mock('node-fetch', () => ({
-    default: jest.fn(() => ({
-        ok: true,
-        json: jest.fn().mockResolvedValue({}),
-    })),
+const node_stream_1 = require("node:stream");
+// Mock fs operations
+jest.mock('fs', () => ({
+    ...jest.requireActual('fs'),
+    createReadStream: () => {
+        const readable = new node_stream_1.Readable();
+        readable.push('test data');
+        readable.push(null);
+        return readable;
+    },
+    statSync: () => ({ size: 9 }),
+    readFileSync: () => Buffer.from('test data'),
+    existsSync: () => false,
+    readdirSync: () => [],
 }));
+openapi_core_1.getMergedConfig.mockImplementation((config) => config);
+// Mock OpenAPI core
 jest.mock('@redocly/openapi-core');
 jest.mock('../../commands/login');
 jest.mock('../../utils/miscellaneous');
-openapi_core_1.getMergedConfig.mockImplementation((config) => config);
 const mockPromptClientToken = login_1.promptClientToken;
 describe('push-with-region', () => {
     const redoclyClient = require('@redocly/openapi-core').__redoclyClient;
     redoclyClient.isAuthorizedWithRedoclyByRegion = jest.fn().mockResolvedValue(false);
+    const originalFetch = fetch;
     beforeAll(() => {
+        // Mock global fetch
+        global.fetch = jest.fn(() => Promise.resolve({
+            ok: true,
+            status: 200,
+            json: () => Promise.resolve({}),
+            headers: new Headers(),
+            statusText: 'OK',
+            redirected: false,
+            type: 'default',
+            url: '',
+            clone: () => ({}),
+            body: new ReadableStream(),
+            bodyUsed: false,
+            arrayBuffer: async () => new ArrayBuffer(0),
+            blob: async () => new Blob(),
+            formData: async () => new FormData(),
+            text: async () => '',
+        }));
+    });
+    afterAll(() => {
+        global.fetch = originalFetch;
+    });
+    beforeEach(() => {
         jest.spyOn(process.stdout, 'write').mockImplementation(() => true);
     });
     it('should call login with default domain when region is US', async () => {
-        redoclyClient.domain = 'redoc.ly';
+        redoclyClient.domain = 'redocly.com';
         await (0, push_1.handlePush)({
             argv: {
                 upsert: true,
@@ -39,6 +72,8 @@ describe('push-with-region', () => {
     });
     it('should call login with EU domain when region is EU', async () => {
         redoclyClient.domain = 'eu.redocly.com';
+        // Update config for EU region
+        const euConfig = { ...config_1.ConfigFixture, region: 'eu' };
         await (0, push_1.handlePush)({
             argv: {
                 upsert: true,
@@ -46,7 +81,7 @@ describe('push-with-region', () => {
                 destination: '@org/my-api@1.0.0',
                 branchName: 'test',
             },
-            config: config_1.ConfigFixture,
+            config: euConfig,
             version: 'cli-version',
         });
         expect(mockPromptClientToken).toBeCalledTimes(1);

package/lib/__tests__/commands/push.test.js

@@ -6,21 +6,54 @@ const miscellaneous_1 = require("../../utils/miscellaneous");
 const push_1 = require("../../commands/push");
 const config_1 = require("../fixtures/config");
 const colorette_1 = require("colorette");
-jest.mock('fs');
-jest.mock('node-fetch', () => ({
-    default: jest.fn(() => ({
-        ok: true,
-        json: jest.fn().mockResolvedValue({}),
-    })),
+const node_stream_1 = require("node:stream");
+// Mock fs operations
+jest.mock('fs', () => ({
+    ...jest.requireActual('fs'),
+    createReadStream: jest.fn(() => {
+        const readable = new node_stream_1.Readable();
+        readable.push('test data');
+        readable.push(null);
+        return readable;
+    }),
+    statSync: jest.fn(() => ({ isDirectory: () => false, size: 10 })),
+    readFileSync: jest.fn(() => Buffer.from('test data')),
+    existsSync: jest.fn(() => false),
+    readdirSync: jest.fn(() => []),
 }));
 jest.mock('@redocly/openapi-core');
 jest.mock('../../utils/miscellaneous');
+// Mock fetch
+const mockFetch = jest.fn(() => Promise.resolve({
+    ok: true,
+    status: 200,
+    json: () => Promise.resolve({}),
+    headers: new Headers(),
+    statusText: 'OK',
+    redirected: false,
+    type: 'default',
+    url: '',
+    clone: () => ({}),
+    body: null,
+    bodyUsed: false,
+    arrayBuffer: async () => new ArrayBuffer(0),
+    blob: async () => new Blob(),
+    formData: async () => new FormData(),
+    text: async () => '',
+}));
+const originalFetch = global.fetch;
 openapi_core_1.getMergedConfig.mockImplementation((config) => config);
 describe('push', () => {
     const redoclyClient = require('@redocly/openapi-core').__redoclyClient;
+    beforeAll(() => {
+        global.fetch = mockFetch;
+    });
     beforeEach(() => {
         jest.spyOn(process.stdout, 'write').mockImplementation(() => true);
     });
+    afterAll(() => {
+        global.fetch = originalFetch;
+    });
     it('pushes definition', async () => {
         await (0, push_1.handlePush)({
             argv: {

package/lib/__tests__/fetch-with-timeout.test.js

@@ -2,11 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const abort_controller_1 = require("abort-controller");
 const fetch_with_timeout_1 = require("../utils/fetch-with-timeout");
-const node_fetch_1 = require("node-fetch");
 const openapi_core_1 = require("@redocly/openapi-core");
 const https_proxy_agent_1 = require("https-proxy-agent");
-jest.mock('node-fetch');
 jest.mock('@redocly/openapi-core');
+const signalInstance = new abort_controller_1.default().signal;
+const mockFetch = jest.fn(() => Promise.resolve({
+    ok: true,
+    status: 200,
+    json: () => Promise.resolve({}),
+    headers: new Headers(),
+    statusText: 'OK',
+    redirected: false,
+    type: 'default',
+    url: '',
+    clone: () => ({}),
+    body: null,
+    bodyUsed: false,
+    arrayBuffer: async () => new ArrayBuffer(0),
+    blob: async () => new Blob(),
+    formData: async () => new FormData(),
+    text: async () => '',
+    signal: signalInstance,
+    dispatcher: undefined,
+}));
+const originalFetch = global.fetch;
+global.fetch = mockFetch;
 describe('fetchWithTimeout', () => {
     beforeAll(() => {
         // @ts-ignore
@@ -16,29 +36,29 @@ describe('fetchWithTimeout', () => {
     beforeEach(() => {
         openapi_core_1.getProxyAgent.mockReturnValueOnce(undefined);
     });
-    afterEach(() => {
-        jest.clearAllMocks();
+    afterAll(() => {
+        global.fetch = originalFetch;
     });
-    it('should call node-fetch with signal', async () => {
+    it('should call fetch with signal', async () => {
         await (0, fetch_with_timeout_1.default)('url', { timeout: 1000 });
         expect(global.setTimeout).toHaveBeenCalledTimes(1);
-        expect(node_fetch_1.default).toHaveBeenCalledWith('url', {
-            signal: new abort_controller_1.default().signal,
-            agent: undefined,
-        });
+        expect(global.fetch).toHaveBeenCalledWith('url', expect.objectContaining({
+            signal: expect.any(AbortSignal),
+            dispatcher: undefined,
+        }));
         expect(global.clearTimeout).toHaveBeenCalledTimes(1);
     });
-    it('should call node-fetch with proxy agent', async () => {
+    it('should call fetch with proxy agent', async () => {
         openapi_core_1.getProxyAgent.mockRestore();
         const proxyAgent = new https_proxy_agent_1.HttpsProxyAgent('http://localhost');
         openapi_core_1.getProxyAgent.mockReturnValueOnce(proxyAgent);
         await (0, fetch_with_timeout_1.default)('url');
-        expect(node_fetch_1.default).toHaveBeenCalledWith('url', { agent: proxyAgent });
+        expect(global.fetch).toHaveBeenCalledWith('url', { dispatcher: proxyAgent });
     });
-    it('should call node-fetch without signal when timeout is not passed', async () => {
+    it('should call fetch without signal when timeout is not passed', async () => {
         await (0, fetch_with_timeout_1.default)('url');
         expect(global.setTimeout).not.toHaveBeenCalled();
-        expect(node_fetch_1.default).toHaveBeenCalledWith('url', { agent: undefined });
+        expect(global.fetch).toHaveBeenCalledWith('url', { agent: undefined });
         expect(global.clearTimeout).not.toHaveBeenCalled();
     });
 });

package/lib/__tests__/wrapper.test.js

@@ -6,11 +6,19 @@ const wrapper_1 = require("../wrapper");
 const lint_1 = require("../commands/lint");
 const push_1 = require("../commands/push");
 const openapi_core_1 = require("@redocly/openapi-core");
-jest.mock('node-fetch');
+const mockFetch = jest.fn();
+const originalFetch = global.fetch;
 jest.mock('../utils/miscellaneous', () => ({
     sendTelemetry: jest.fn(),
     loadConfigAndHandleErrors: jest.fn(),
 }));
+beforeAll(() => {
+    global.fetch = mockFetch;
+});
+afterAll(() => {
+    jest.resetAllMocks();
+    global.fetch = originalFetch;
+});
 jest.mock('../commands/lint', () => ({
     handleLint: jest.fn().mockImplementation(({ collectSpecData }) => {
         collectSpecData({ openapi: '3.1.0' });

package/lib/cms/api/__tests__/api.client.test.js

@@ -1,14 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_fetch_1 = require("node-fetch");
-const FormData = require("form-data");
 const colorette_1 = require("colorette");
 const api_client_1 = require("../api-client");
-jest.mock('node-fetch', () => ({
-    default: jest.fn(),
-}));
+const originalFetch = global.fetch;
+beforeAll(() => {
+    // Reset fetch mock before each test
+    global.fetch = jest.fn();
+});
+afterAll(() => {
+    // Restore original fetch after each test
+    global.fetch = originalFetch;
+});
 function mockFetchResponse(response) {
-    node_fetch_1.default.mockResolvedValue(response);
+    global.fetch.mockResolvedValue(response);
 }
 describe('ApiClient', () => {
     const testToken = 'test-token';
@@ -31,7 +35,7 @@ describe('ApiClient', () => {
                 }),
             });
             const result = await apiClient.remotes.getDefaultBranch(testOrg, testProject);
-            expect(node_fetch_1.default).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/source`, {
+            expect(global.fetch).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/source`, {
                 method: 'GET',
                 headers: {
                     'Content-Type': 'application/json',
@@ -89,7 +93,7 @@ describe('ApiClient', () => {
                 json: jest.fn().mockResolvedValue(responseMock),
             });
             const result = await apiClient.remotes.upsert(testOrg, testProject, remotePayload);
-            expect(node_fetch_1.default).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/remotes`, {
+            expect(global.fetch).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/remotes`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
@@ -167,29 +171,29 @@ describe('ApiClient', () => {
         });
         it('should push to remote', async () => {
             let passedFormData = new FormData();
-            node_fetch_1.default.mockImplementationOnce(async (_, options) => {
+            fetch.mockImplementationOnce(async (_, options) => {
                 passedFormData = options.body;
                 return {
                     ok: true,
                     json: jest.fn().mockResolvedValue(responseMock),
                 };
             });
-            const formData = new FormData();
+            const formData = new globalThis.FormData();
             formData.append('remoteId', testRemoteId);
             formData.append('commit[message]', pushPayload.commit.message);
             formData.append('commit[author][name]', pushPayload.commit.author.name);
             formData.append('commit[author][email]', pushPayload.commit.author.email);
             formData.append('commit[branchName]', pushPayload.commit.branchName);
-            formData.append('files[some-file.yaml]', filesMock[0].stream);
+            formData.append('files[some-file.yaml]', new Blob([filesMock[0].stream]));
             const result = await apiClient.remotes.push(testOrg, testProject, pushPayload, filesMock);
-            expect(node_fetch_1.default).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/pushes`, expect.objectContaining({
+            expect(fetch).toHaveBeenCalledWith(`${testDomain}/api/orgs/${testOrg}/projects/${testProject}/pushes`, expect.objectContaining({
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${testToken}`,
                     'user-agent': expectedUserAgent,
                 },
             }));
-            expect(JSON.stringify(passedFormData).replace(new RegExp(passedFormData.getBoundary(), 'g'), '')).toEqual(JSON.stringify(formData).replace(new RegExp(formData.getBoundary(), 'g'), ''));
+            expect(passedFormData).toEqual(formData);
             expect(result).toEqual(responseMock);
         });
         it('should throw parsed error if response is not ok', async () => {

package/lib/cms/api/api-client.d.ts

@@ -1,6 +1,6 @@
 import { type FetchWithTimeoutOptions } from '../../utils/fetch-with-timeout';
-import type { Response } from 'node-fetch';
 import type { ReadStream } from 'fs';
+import type { Readable } from 'node:stream';
 import type { ListRemotesResponse, PushResponse, UpsertRemoteResponse } from './types';
 interface BaseApiClient {
     request(url: string, options: FetchWithTimeoutOptions): Promise<Response>;
@@ -72,4 +72,5 @@ export type PushPayload = {
     };
     isMainBranch?: boolean;
 };
+export declare function streamToBuffer(stream: ReadStream | Readable): Promise<Buffer>;
 export {};

package/lib/cms/api/api-client.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReuniteApi = exports.ReuniteApiError = void 0;
+exports.streamToBuffer = streamToBuffer;
 const colorette_1 = require("colorette");
-const FormData = require("form-data");
 const fetch_with_timeout_1 = require("../../utils/fetch-with-timeout");
 class ReuniteApiError extends Error {
     constructor(message, status) {
@@ -120,7 +120,7 @@ class RemotesApi {
         }
     }
     async push(organizationId, projectId, payload, files) {
-        const formData = new FormData();
+        const formData = new globalThis.FormData();
         formData.append('remoteId', payload.remoteId);
         formData.append('commit[message]', payload.commit.message);
         formData.append('commit[author][name]', payload.commit.author.name);
@@ -132,7 +132,10 @@ class RemotesApi {
         payload.commit.repository && formData.append('commit[repositoryId]', payload.commit.repository);
         payload.commit.createdAt && formData.append('commit[createdAt]', payload.commit.createdAt);
         for (const file of files) {
-            formData.append(`files[${file.path}]`, file.stream);
+            const blob = Buffer.isBuffer(file.stream)
+                ? new Blob([file.stream])
+                : new Blob([await streamToBuffer(file.stream)]);
+            formData.append(`files[${file.path}]`, blob, file.path);
         }
         payload.isMainBranch && formData.append('isMainBranch', 'true');
         try {
@@ -223,3 +226,10 @@ class ReuniteApi {
     }
 }
 exports.ReuniteApi = ReuniteApi;
+async function streamToBuffer(stream) {
+    const chunks = [];
+    for await (const chunk of stream) {
+        chunks.push(chunk);
+    }
+    return Buffer.concat(chunks);
+}

package/lib/commands/push.js

@@ -7,7 +7,6 @@ exports.getDestinationProps = getDestinationProps;
 exports.getApiRoot = getApiRoot;
 const fs = require("fs");
 const path = require("path");
-const node_fetch_1 = require("node-fetch");
 const perf_hooks_1 = require("perf_hooks");
 const colorette_1 = require("colorette");
 const crypto_1 = require("crypto");
@@ -16,6 +15,7 @@ const utils_1 = require("@redocly/openapi-core/lib/utils");
 const miscellaneous_1 = require("../utils/miscellaneous");
 const login_1 = require("./login");
 const push_1 = require("../cms/commands/push");
+const api_client_1 = require("../cms/api/api-client");
 const DEFAULT_VERSION = 'latest';
 exports.DESTINATION_REGEX = 
 // eslint-disable-next-line no-useless-escape
@@ -279,17 +279,23 @@ function getApiRoot({ name, version, config: { apis }, }) {
     const api = apis?.[`${name}@${version}`] || (version === DEFAULT_VERSION && apis?.[name]);
     return api?.root;
 }
-function uploadFileToS3(url, filePathOrBuffer) {
+async function uploadFileToS3(url, filePathOrBuffer) {
     const fileSizeInBytes = typeof filePathOrBuffer === 'string'
         ? fs.statSync(filePathOrBuffer).size
         : filePathOrBuffer.byteLength;
     const readStream = typeof filePathOrBuffer === 'string' ? fs.createReadStream(filePathOrBuffer) : filePathOrBuffer;
-    return (0, node_fetch_1.default)(url, {
+    const requestOptions = {
         method: 'PUT',
         headers: {
             'Content-Length': fileSizeInBytes.toString(),
         },
-        body: readStream,
-        agent: (0, openapi_core_1.getProxyAgent)(),
-    });
+        body: Buffer.isBuffer(readStream)
+            ? new Blob([readStream])
+            : new Blob([await (0, api_client_1.streamToBuffer)(readStream)]),
+    };
+    const proxyAgent = (0, openapi_core_1.getProxyAgent)();
+    if (proxyAgent) {
+        requestOptions.dispatcher = proxyAgent;
+    }
+    return fetch(url, requestOptions);
 }

package/lib/commands/split/index.d.ts

@@ -1,4 +1,4 @@
-import type { Oas3PathItem, Referenced } from './types';
+import type { Oas3PathItem, Referenced } from '@redocly/openapi-core/lib/typings/openapi';
 import type { CommandArgs } from '../../wrapper';
 import type { VerifyConfigOptions } from '../../types';
 export type SplitOptions = {

package/lib/commands/split/types.d.ts

@@ -1,5 +1,5 @@
-import { Oas3Schema, Oas3_1Schema, Oas3Definition, Oas3_1Definition, Oas3Components, Oas3PathItem, Oas3Paths, Oas3ComponentName, Oas3_1Webhooks, Oas2Definition, Referenced } from '@redocly/openapi-core';
-export { Oas3_1Definition, Oas3Definition, Oas2Definition, Oas3Components, Oas3Paths, Oas3PathItem, Oas3ComponentName, Oas3_1Schema, Oas3Schema, Oas3_1Webhooks, Referenced, };
+import type { Oas2Definition } from '@redocly/openapi-core';
+import type { Oas3_1Definition, Oas3Definition } from '@redocly/openapi-core/lib/typings/openapi';
 export type Definition = Oas3_1Definition | Oas3Definition | Oas2Definition;
 export interface ComponentsFiles {
     [schemas: string]: any;

package/lib/utils/fetch-with-timeout.d.ts

@@ -1,7 +1,6 @@
-import { type RequestInit } from 'node-fetch';
 export declare const DEFAULT_FETCH_TIMEOUT = 3000;
 export type FetchWithTimeoutOptions = RequestInit & {
     timeout?: number;
 };
-declare const _default: (url: string, { timeout, ...options }?: FetchWithTimeoutOptions) => Promise<import("node-fetch").Response>;
+declare const _default: (url: string, { timeout, ...options }?: FetchWithTimeoutOptions) => Promise<Response>;
 export default _default;

package/lib/utils/fetch-with-timeout.js

@@ -1,25 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_FETCH_TIMEOUT = void 0;
-const node_fetch_1 = require("node-fetch");
-const abort_controller_1 = require("abort-controller");
 const openapi_core_1 = require("@redocly/openapi-core");
 exports.DEFAULT_FETCH_TIMEOUT = 3000;
 exports.default = async (url, { timeout, ...options } = {}) => {
     if (!timeout) {
-        return (0, node_fetch_1.default)(url, {
+        return fetch(url, {
             ...options,
-            agent: (0, openapi_core_1.getProxyAgent)(),
+            dispatcher: (0, openapi_core_1.getProxyAgent)(),
         });
     }
-    const controller = new abort_controller_1.default();
+    const controller = new globalThis.AbortController();
     const timeoutId = setTimeout(() => {
         controller.abort();
     }, timeout);
-    const res = await (0, node_fetch_1.default)(url, {
+    const res = await fetch(url, {
         signal: controller.signal,
         ...options,
-        agent: (0, openapi_core_1.getProxyAgent)(),
+        dispatcher: (0, openapi_core_1.getProxyAgent)(),
     });
     clearTimeout(timeoutId);
     return res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/cli",
-  "version": "1.27.1",
+  "version": "1.28.0",
   "description": "",
   "license": "MIT",
   "bin": {
@@ -8,8 +8,8 @@
     "redocly": "bin/cli.js"
   },
   "engines": {
-    "node": ">=14.19.0",
-    "npm": ">=7.0.0"
+    "node": ">=18.17.0",
+    "npm": ">=10.8.2"
   },
   "engineStrict": true,
   "scripts": {
@@ -36,7 +36,7 @@
     "Roman Hotsiy <roman@redocly.com> (https://redocly.com/)"
   ],
   "dependencies": {
-    "@redocly/openapi-core": "1.27.1",
+    "@redocly/openapi-core": "1.28.0",
     "abort-controller": "^3.0.0",
     "chokidar": "^3.5.1",
     "colorette": "^1.2.0",
@@ -46,7 +46,6 @@
     "glob": "^7.1.6",
     "handlebars": "^4.7.6",
     "mobx": "^6.0.4",
-    "node-fetch": "^2.6.1",
     "pluralize": "^8.0.0",
     "react": "^17.0.0 || ^18.2.0",
     "react-dom": "^17.0.0 || ^18.2.0",

package/src/__tests__/commands/push-region.test.ts

@@ -2,32 +2,71 @@ import { getMergedConfig } from '@redocly/openapi-core';
 import { handlePush } from '../../commands/push';
 import { promptClientToken } from '../../commands/login';
 import { ConfigFixture } from '../fixtures/config';
+import { Readable } from 'node:stream';
 
-jest.mock('fs');
-jest.mock('node-fetch', () => ({
-  default: jest.fn(() => ({
-    ok: true,
-    json: jest.fn().mockResolvedValue({}),
-  })),
+// Mock fs operations
+jest.mock('fs', () => ({
+  ...jest.requireActual('fs'),
+  createReadStream: () => {
+    const readable = new Readable();
+    readable.push('test data');
+    readable.push(null);
+    return readable;
+  },
+  statSync: () => ({ size: 9 }),
+  readFileSync: () => Buffer.from('test data'),
+  existsSync: () => false,
+  readdirSync: () => [],
 }));
+
+(getMergedConfig as jest.Mock).mockImplementation((config) => config);
+
+// Mock OpenAPI core
 jest.mock('@redocly/openapi-core');
 jest.mock('../../commands/login');
 jest.mock('../../utils/miscellaneous');
 
-(getMergedConfig as jest.Mock).mockImplementation((config) => config);
-
 const mockPromptClientToken = promptClientToken as jest.MockedFunction<typeof promptClientToken>;
 
 describe('push-with-region', () => {
   const redoclyClient = require('@redocly/openapi-core').__redoclyClient;
   redoclyClient.isAuthorizedWithRedoclyByRegion = jest.fn().mockResolvedValue(false);
 
+  const originalFetch = fetch;
+
   beforeAll(() => {
+    // Mock global fetch
+    global.fetch = jest.fn(() =>
+      Promise.resolve({
+        ok: true,
+        status: 200,
+        json: () => Promise.resolve({}),
+        headers: new Headers(),
+        statusText: 'OK',
+        redirected: false,
+        type: 'default',
+        url: '',
+        clone: () => ({} as Response),
+        body: new ReadableStream(),
+        bodyUsed: false,
+        arrayBuffer: async () => new ArrayBuffer(0),
+        blob: async () => new Blob(),
+        formData: async () => new FormData(),
+        text: async () => '',
+      } as Response)
+    );
+  });
+
+  afterAll(() => {
+    global.fetch = originalFetch;
+  });
+
+  beforeEach(() => {
     jest.spyOn(process.stdout, 'write').mockImplementation(() => true);
   });
 
   it('should call login with default domain when region is US', async () => {
-    redoclyClient.domain = 'redoc.ly';
+    redoclyClient.domain = 'redocly.com';
     await handlePush({
       argv: {
         upsert: true,
@@ -38,12 +77,16 @@ describe('push-with-region', () => {
       config: ConfigFixture as any,
       version: 'cli-version',
     });
+
     expect(mockPromptClientToken).toBeCalledTimes(1);
     expect(mockPromptClientToken).toHaveBeenCalledWith(redoclyClient.domain);
   });
 
   it('should call login with EU domain when region is EU', async () => {
     redoclyClient.domain = 'eu.redocly.com';
+    // Update config for EU region
+    const euConfig = { ...ConfigFixture, region: 'eu' };
+
     await handlePush({
       argv: {
         upsert: true,
@@ -51,9 +94,10 @@ describe('push-with-region', () => {
         destination: '@org/my-api@1.0.0',
         branchName: 'test',
       },
-      config: ConfigFixture as any,
+      config: euConfig as any,
       version: 'cli-version',
     });
+
     expect(mockPromptClientToken).toBeCalledTimes(1);
     expect(mockPromptClientToken).toHaveBeenCalledWith(redoclyClient.domain);
   });