Bump axios from 0.21.1 to 1.8.2

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-            node-version: 12
+            node-version: 22
       - run: yarn install --ignore-scripts
       - run: yarn run lint
 
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node-version: [12]
+        node-version: [22]
         os: [ubuntu-latest]
 
     steps:

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [6.48.1-beta.4] - 2025-05-04
+
 ## [6.49.1] - 2025-04-30
 ### Fixed
 - Add yarn.lock changes from previous release
@@ -20,6 +22,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix `yarn gen` script
 - Update node-version on publish workflows
 
+## [6.48.1-beta.3] - 2025-04-28
+
+## [6.48.1-beta.2] - 2025-03-31
+
+## [6.48.1-beta.1] - 2025-03-31
+
+## [6.48.1-beta.0] - 2025-03-31
+
+## [6.48.1-beta] - 2025-03-19
+
 ## [6.48.0] - 2024-10-23
 ### Added
 - resolveAll to `MineWinsConflictsResolver` to handle an array of conflicts.
@@ -1856,7 +1868,7 @@ instead
 - `HttpClient` now adds `'Accept-Encoding': 'gzip'` header by default.
 
 
-[Unreleased]: https://github.com/vtex/node-vtex-api/compare/v6.45.22...HEAD
+[Unreleased]: https://github.com/vtex/node-vtex-api/compare/v6.48.1-beta.4...HEAD
 [6.45.15]: https://github.com/vtex/node-vtex-api/compare/v6.45.14...v6.45.15
 [6.45.14]: https://github.com/vtex/node-vtex-api/compare/v6.45.13...v6.45.14
 [6.45.13]: https://github.com/vtex/node-vtex-api/compare/v6.45.12...v6.45.13
@@ -1869,3 +1881,10 @@ instead
 [6.45.21-beta]: https://github.com/vtex/node-vtex-api/compare/v6.45.20...v6.45.21-beta
 [6.45.20]: https://github.com/vtex/node-vtex-api/compare/v6.45.20-beta...v6.45.20
 [6.45.20-beta]: https://github.com/vtex/node-vtex-api/compare/v6.45.19...v6.45.20-beta
+
+[6.48.1-beta.4]: https://github.com/vtex/node-vtex-api/compare/v6.48.1-beta.3...v6.48.1-beta.4
+[6.48.1-beta.3]: https://github.com/vtex/node-vtex-api/compare/v6.48.1-beta.2...v6.48.1-beta.3
+[6.48.1-beta.2]: https://github.com/vtex/node-vtex-api/compare/v6.48.1-beta.1...v6.48.1-beta.2
+[6.48.1-beta.1]: https://github.com/vtex/node-vtex-api/compare/v6.48.1-beta.0...v6.48.1-beta.1
+[6.48.1-beta.0]: https://github.com/vtex/node-vtex-api/compare/v6.48.1-beta...v6.48.1-beta.0
+[6.48.1-beta]: https://github.com/vtex/node-vtex-api/compare/v6.48.0...v6.48.1-beta

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtex/api",
-  "version": "6.49.1",
+  "version": "6.48.1-beta.4",
   "description": "VTEX I/O API client",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -55,7 +55,7 @@
     "agentkeepalive": "^4.0.2",
     "apollo-server-errors": "^2.2.1",
     "archiver": "^3.0.0",
-    "axios": "^0.21.1",
+    "axios": "^1.8.4",
     "axios-retry": "^3.1.2",
     "bluebird": "^3.5.4",
     "chalk": "^2.4.2",

src/HttpClient/HttpClient.ts

@@ -130,7 +130,7 @@ export class HttpClient {
 
   public getRaw = <T = any>(url: string, config: RequestConfig = {}): Promise<IOResponse<T>> => {
     const cacheableConfig = this.getConfig(url, config)
-    return this.request(cacheableConfig)
+    return this.request(cacheableConfig) as any
   }
 
   public getWithBody = <T = any>(url: string, data?: any, config: RequestConfig = {}): Promise<T> => {
@@ -198,12 +198,12 @@ export class HttpClient {
 
   public head = (url: string, config: RequestConfig = {}): Promise<IOResponse<void>> => {
     const headConfig: RequestConfig = { ...config, url, method: 'head' }
-    return this.request(headConfig)
+    return this.request(headConfig) as any
   }
 
   public delete = <T = void>(url: string, config?: RequestConfig): Promise<IOResponse<T>> => {
     const deleteConfig: RequestConfig = { ...config, url, method: 'delete' }
-    return this.request(deleteConfig)
+    return this.request(deleteConfig) as any
   }
 
   protected request = async (config: RequestConfig): Promise<AxiosResponse> => {

src/HttpClient/middlewares/cache.ts

@@ -15,7 +15,7 @@ const cacheableStatusCodes = [200, 203, 204, 206, 300, 301, 404, 405, 410, 414,
 
 export const cacheKey = (config: AxiosRequestConfig) => {
   const {baseURL = '', url = '', params, headers} = config
-  const locale = headers[LOCALE_HEADER]
+  const locale = headers?.[LOCALE_HEADER]
 
   const encodedBaseURL = baseURL.replace(/\//g, '\\')
   const encodedURL = url.replace(/\//g, '\\')
@@ -97,7 +97,7 @@ export const cacheMiddleware = ({ type, storage, asyncSet }: CacheOptions) => {
     const { rootSpan: span, tracer, logger } = ctx.tracing ?? {}
 
     const key = cacheKey(ctx.config)
-    const segmentToken = ctx.config.headers[SEGMENT_HEADER]
+    const segmentToken = ctx.config.headers?.[SEGMENT_HEADER]
     const keyWithSegment = key + segmentToken
 
     span?.log({
@@ -153,7 +153,10 @@ export const cacheMiddleware = ({ type, storage, asyncSet }: CacheOptions) => {
       span?.setTag(CACHE_RESULT_TAG, CacheResult.STALE)
       const validateStatus = addNotModified(ctx.config.validateStatus!)
       if (cachedEtag && validateStatus(response.status as number)) {
-        ctx.config.headers['if-none-match'] = cachedEtag
+        ctx.config.headers = {
+          ...ctx.config.headers,
+          'if-none-match': cachedEtag
+        }
         ctx.config.validateStatus = validateStatus
       }
     } else {
@@ -177,7 +180,7 @@ export const cacheMiddleware = ({ type, storage, asyncSet }: CacheOptions) => {
     }
 
     const {data, headers, status} = ctx.response as AxiosResponse
-    const {age, etag, maxAge: headerMaxAge, noStore, noCache} = parseCacheHeaders(headers)
+    const {age, etag, maxAge: headerMaxAge, noStore, noCache} = parseCacheHeaders(headers as any)
 
     const {forceMaxAge} = ctx.config
     const maxAge = forceMaxAge && cacheableStatusCodes.includes(status) ? Math.max(forceMaxAge, headerMaxAge) : headerMaxAge
@@ -229,7 +232,7 @@ export const cacheMiddleware = ({ type, storage, asyncSet }: CacheOptions) => {
             etag,
             expiration,
             response: {data: cacheableData, headers, status},
-            responseEncoding,
+            responseEncoding: responseEncoding as any,
             responseType,
           })
         if (asyncSet) {

src/HttpClient/middlewares/metrics.ts

@@ -13,6 +13,7 @@ import {
 import { TIMEOUT_CODE } from '../../utils/retry'
 import { statusLabel } from '../../utils/status'
 import { MiddlewareContext } from '../typings'
+import { AxiosError } from 'axios'
 
 interface MetricsOpts {
   metrics?: MetricsAccumulator

src/HttpClient/middlewares/recorder.ts

@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios'
 import { MiddlewareContext } from '../typings'
 import {
   Recorder,
@@ -13,11 +14,11 @@ export const recorderMiddleware = (recorder: Recorder) =>
     try {
       await next()
       if (ctx.response) {
-        (recorder as Recorder).record(ctx.response.headers)
+        (recorder as Recorder).record(ctx.response.headers as any)
       }
     } catch (err: any) {
       if (err.response && err.response.headers && err.response.status === 404) {
-        (recorder as Recorder).record(err.response.headers)
+        (recorder as Recorder).record(err.response.headers as any)
       }
       throw err
     }

src/HttpClient/middlewares/request/index.ts

@@ -1,5 +1,5 @@
 import { AxiosRequestConfig } from 'axios'
-import buildFullPath from 'axios/lib/core/buildFullPath'
+import buildFullPath from '../../../utils/buildFullPath'
 import { Limit } from 'p-limit'
 import { stringify } from 'qs'
 import { toLower } from 'ramda'
@@ -47,7 +47,7 @@ export const defaultsMiddleware = ({ baseURL, rawHeaders, params, timeout, retri
       ...ctx.config,
       headers: {
         ...headers,
-        ...renameBy(toLower, ctx.config.headers),
+        ...renameBy(toLower, ctx.config.headers as any),
       },
       params: {
         ...params,

src/HttpClient/middlewares/request/setupAxios/interceptors/tracing/index.ts

@@ -1,4 +1,4 @@
-import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'
+import { AxiosError, AxiosInstance, AxiosResponse, AxiosRequestConfig } from 'axios'
 import { FORMAT_HTTP_HEADERS, Span } from 'opentracing'
 import { createSpanReference, ErrorReport } from '../../../../../../tracing'
 import { SpanReferenceTypes } from '../../../../../../tracing/spanReference/SpanReferenceTypes'
@@ -9,6 +9,7 @@ interface AxiosRequestTracingContext extends MiddlewaresTracingContext {
   requestSpan?: Span
 }
 
+// Modificado para usar AxiosRequestConfig em vez de InternalAxiosRequestConfig
 interface TraceableAxiosRequestConfig extends AxiosRequestConfig {
   tracing?: AxiosRequestTracingContext
 }
@@ -31,7 +32,6 @@ const preRequestInterceptor = (http: AxiosInstance) => (
   }
 
   const { tracer, rootSpan, requestSpanNameSuffix } = config.tracing
-
   const spanName = requestSpanNameSuffix ? `${requestSpanPrefix}:${requestSpanNameSuffix}` : requestSpanPrefix
 
   const span = rootSpan
@@ -44,6 +44,7 @@ const preRequestInterceptor = (http: AxiosInstance) => (
 
   config.tracing.requestSpan = span
   tracer.inject(span, FORMAT_HTTP_HEADERS, config.headers)
+
   return config
 }
 
@@ -55,6 +56,7 @@ const onResponseSuccess = (response: TraceableAxiosResponse): TraceableAxiosResp
   const requestSpan = response.config.tracing?.requestSpan
   injectResponseInfoOnSpan(requestSpan, response)
   requestSpan?.finish()
+
   return response
 }
 
@@ -67,17 +69,26 @@ const onResponseError = (err: ExtendedAxiosError) => {
   injectResponseInfoOnSpan(requestSpan, err.response)
   ErrorReport.create({ originalError: err }).injectOnSpan(requestSpan, err.config.tracing.logger)
   requestSpan.finish()
+
   return Promise.reject(err)
 }
 
 export const addTracingPreRequestInterceptor = (http: AxiosInstance) => {
-  const requestTracingInterceptor = http.interceptors.request.use(preRequestInterceptor(http), undefined)
+  // Usando type assertion para compatibilidade com TypeScript 3.9.7
+  const requestTracingInterceptor = http.interceptors.request.use(
+    preRequestInterceptor(http) as any,
+    undefined
+  )
 
   return { requestTracingInterceptor }
 }
 
 export const addTracingResponseInterceptor = (http: AxiosInstance) => {
-  const responseTracingInterceptor = http.interceptors.response.use(onResponseSuccess, onResponseError)
+  // Usando type assertion para compatibilidade com TypeScript 3.9.7
+  const responseTracingInterceptor = http.interceptors.response.use(
+    onResponseSuccess as any,
+    onResponseError as any
+  )
 
   return { responseTracingInterceptor }
 }

src/HttpClient/middlewares/request/setupAxios/interceptors/tracing/spanSetup.ts

@@ -1,5 +1,5 @@
 import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'
-import buildFullPath from 'axios/lib/core/buildFullPath'
+import buildFullPath from '../../../../../../utils/buildFullPath'
 import { Span } from 'opentracing'
 import { ROUTER_CACHE_HEADER } from '../../../../../../constants'
 import { CustomHttpTags, OpentracingTags } from '../../../../../../tracing/Tags'
@@ -12,7 +12,7 @@ export const injectRequestInfoOnSpan = (span: Span | undefined, http: AxiosInsta
     [OpentracingTags.HTTP_URL]: buildFullPath(config.baseURL, http.getUri(config)),
   })
 
-  span?.log({ 'request-headers': cloneAndSanitizeHeaders(config.headers) })
+  span?.log({ 'request-headers': cloneAndSanitizeHeaders(config.headers as any) })
 }
 
 // Response may be undefined in case of client timeout, invalid URL, ...

src/HttpClient/middlewares/tracing.ts

@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios'
 import { MiddlewaresTracingContext, RequestConfig } from '..'
 import { IOContext } from '../../service/worker/runtime/typings'
 import { ErrorReport, getTraceInfo } from '../../tracing'

src/HttpClient/typings.ts

@@ -1,4 +1,4 @@
-import { AxiosRequestConfig, AxiosResponse } from 'axios'
+import { AxiosRequestConfig, AxiosResponse, RawAxiosResponseHeaders } from 'axios'
 import { Middleware } from 'koa-compose'
 import { Span } from 'opentracing'
 
@@ -48,7 +48,7 @@ export interface RequestConfig extends AxiosRequestConfig, RequestTracingConfig
   memoizeable?: boolean
   inflightKey?: InflightKeyGenerator
   forceMaxAge?: number
-  responseEncoding?: BufferEncoding
+  responseEncoding?: BufferEncoding | string
   nullIfNotFound?: boolean
   ignoreRecorder?: boolean
 }