chore: changes after review

Author: DmitryAnansky

.github/workflows/smoke.yaml

@@ -182,6 +182,34 @@ jobs:
           node-version: 18
       - run: bash ./__tests__/smoke/run-smoke.sh "yarn add redoc ./redocly-cli.tgz" "yarn"
 
+  run-smoke--npm--node-22--windows:
+    needs: prepare-smoke
+    runs-on: windows-latest
+    steps:
+      - uses: actions/cache@v3
+        with:
+          path: __tests__/smoke/
+          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
+          enableCrossOsArchive: true
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 22
+      - run: bash ./__tests__/smoke/run-smoke.sh "npm i redocly-cli.tgz" "npm run"
+
+  run-smoke--yarn--node-22--windows:
+    needs: prepare-smoke
+    runs-on: windows-latest
+    steps:
+      - uses: actions/cache@v3
+        with:
+          path: __tests__/smoke/
+          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
+          enableCrossOsArchive: true
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 22
+      - run: bash ./__tests__/smoke/run-smoke.sh "yarn add ./redocly-cli.tgz" "yarn"
+
   run-smoke--npm--node-18--windows:
     needs: prepare-smoke
     runs-on: windows-latest

package-lock.json

@@ -5,7 +5,7 @@
   "private": true,
   "engines": {
     "node": ">=18.17.0",
-    "npm": ">=7.0.0"
+    "npm": ">=10.8.2"
   },
   "engineStrict": true,
   "scripts": {

package.json

@@ -9,7 +9,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "npm": ">=7.0.0"
+    "npm": ">=10.8.2"
   },
   "engineStrict": true,
   "scripts": {

packages/cli/package.json

@@ -6,10 +6,6 @@ import { ConfigFixture } from '../fixtures/config';
 import { yellow } from 'colorette';
 import { Readable } from 'node:stream';
 
-jest.mock('fs');
-jest.mock('@redocly/openapi-core');
-jest.mock('../../utils/miscellaneous');
-
 // Mock fs operations
 jest.mock('fs', () => ({
   ...jest.requireActual('fs'),
@@ -25,6 +21,9 @@ jest.mock('fs', () => ({
   readdirSync: jest.fn(() => []),
 }));
 
+jest.mock('@redocly/openapi-core');
+jest.mock('../../utils/miscellaneous');
+
 // Mock fetch
 const mockFetch = jest.fn(() =>
   Promise.resolve({
@@ -46,7 +45,7 @@ const mockFetch = jest.fn(() =>
   } as Response)
 );
 
-global.fetch = mockFetch;
+const originalFetch = global.fetch;
 
 (getMergedConfig as jest.Mock).mockImplementation((config) => config);
 
@@ -55,12 +54,17 @@ describe('push', () => {
 
   beforeEach(() => {
     jest.spyOn(process.stdout, 'write').mockImplementation(() => true);
+    global.fetch = mockFetch;
   });
 
   afterEach(() => {
     mockFetch.mockClear();
   });
 
+  afterAll(() => {
+    global.fetch = originalFetch;
+  });
+
   it('pushes definition', async () => {
     await handlePush({
       argv: {

packages/cli/src/__tests__/commands/push.test.ts

@@ -5,13 +5,13 @@ import fetchWithTimeout, {
 } from '../../utils/fetch-with-timeout';
 
 import type { ReadStream } from 'fs';
+import type { Readable } from 'node:stream';
 import type {
   ListRemotesResponse,
   ProjectSourceResponse,
   PushResponse,
   UpsertRemoteResponse,
 } from './types';
-import type { Readable } from 'stream';
 
 interface BaseApiClient {
   request(url: string, options: FetchWithTimeoutOptions): Promise<Response>;

packages/cli/src/cms/api/api-client.ts

@@ -23,11 +23,11 @@ import { promptClientToken } from './login';
 import { handlePush as handleCMSPush } from '../cms/commands/push';
 import { streamToBuffer } from '../cms/api/api-client';
 
+import type { Readable } from 'node:stream';
+import type { Agent } from 'node:http';
 import type { Config, BundleOutputFormat, Region } from '@redocly/openapi-core';
 import type { CommandArgs } from '../wrapper';
 import type { VerifyConfigOptions } from '../types';
-import type { Readable } from 'node:stream';
-import type { Agent } from 'node:http';
 
 const DEFAULT_VERSION = 'latest';
 

packages/cli/src/commands/push.ts

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "engines": {
     "node": ">=18.17.0",
-    "npm": ">=7.0.0"
+    "npm": ">=10.8.2"
   },
   "engineStrict": true,
   "license": "MIT",