chore: bump axios to 1.x [PHX-2741] (#1892)

* chore: bump axios to 1.x [PHX-2741] * chore: remove incompatible webpack plugin [NONE] --------- Co-authored-by: Maya Karabuła-Stysiak <4799048+mayakarabula@users.noreply.github.com>
contentful · Aug 1, 2023 · 03c9f40 · 03c9f40
1 parent 5dc5151
commit 03c9f40
Show file tree

Hide file tree

Showing 38 changed files with 434 additions and 1,088 deletions.
diff --git a/.gitignore b/.gitignore
@@ -158,4 +158,6 @@ yarn.lock
 .idea
 
 
-reports
+reports
+
+.tool-versions
diff --git a/lib/adapters/REST/endpoints/api-key.ts b/lib/adapters/REST/endpoints/api-key.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import copy from 'fast-copy'
 import { SetOptional } from 'type-fest'
@@ -27,7 +27,7 @@ export const create: RestEndpoint<'ApiKey', 'create'> = (
   http: AxiosInstance,
   params: GetSpaceParams,
   data: CreateApiKeyProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.post<ApiKeyProps>(http, `/spaces/${params.spaceId}/api_keys`, data, { headers })
 }
@@ -36,7 +36,7 @@ export const createWithId: RestEndpoint<'ApiKey', 'createWithId'> = (
   http: AxiosInstance,
   params: GetSpaceParams & { apiKeyId: string },
   data: CreateApiKeyProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.put<ApiKeyProps>(http, `/spaces/${params.spaceId}/api_keys/${params.apiKeyId}`, data, {
     headers,
@@ -47,7 +47,7 @@ export const update: RestEndpoint<'ApiKey', 'update'> = (
   http: AxiosInstance,
   params: GetSpaceParams & { apiKeyId: string },
   rawData: ApiKeyProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'accessToken' | 'preview_api_key' | 'policies' | 'sys'> =
     copy(rawData)

diff --git a/lib/adapters/REST/endpoints/app-definition.ts b/lib/adapters/REST/endpoints/app-definition.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import * as raw from './raw'
 import copy from 'fast-copy'
@@ -59,7 +59,7 @@ export const update: RestEndpoint<'AppDefinition', 'update'> = (
   http: AxiosInstance,
   params: GetAppDefinitionParams,
   rawData: AppDefinitionProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)
 

diff --git a/lib/adapters/REST/endpoints/app-installation.ts b/lib/adapters/REST/endpoints/app-installation.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import * as raw from './raw'
 import { normalizeSelect, normalizeSpaceId } from './utils'
@@ -49,7 +49,7 @@ export const upsert: RestEndpoint<'AppInstallation', 'upsert'> = (
   http: AxiosInstance,
   params: GetAppInstallationParams & { acceptAllTerms?: boolean },
   rawData: CreateAppInstallationProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data = copy(rawData)
 

diff --git a/lib/adapters/REST/endpoints/asset.ts b/lib/adapters/REST/endpoints/asset.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import { errorHandler } from 'contentful-sdk-core'
 import copy from 'fast-copy'
@@ -20,7 +20,7 @@ export const get: RestEndpoint<'Asset', 'get'> = (
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & { assetId: string } & QueryParams,
   rawData?: unknown,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.get<AssetProps>(
     http,
@@ -36,7 +36,7 @@ export const getMany: RestEndpoint<'Asset', 'getMany'> = (
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & QueryParams,
   rawData?: unknown,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.get<CollectionProp<AssetProps>>(
     http,
@@ -52,7 +52,7 @@ export const update: RestEndpoint<'Asset', 'update'> = (
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & { assetId: string },
   rawData: AssetProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)
   delete data.sys

diff --git a/lib/adapters/REST/endpoints/comment.ts b/lib/adapters/REST/endpoints/comment.ts
@@ -1,4 +1,4 @@
-import { AxiosInstance, AxiosRequestHeaders } from 'axios'
+import { AxiosInstance, RawAxiosRequestHeaders } from 'axios'
 import copy from 'fast-copy'
 import { SetOptional } from 'type-fest'
 import {
@@ -97,7 +97,7 @@ export const update: RestEndpoint<'Comment', 'update'> = (
   http: AxiosInstance,
   params: GetCommentParams,
   rawData: UpdateCommentProps | (Omit<UpdateCommentProps, 'body'> & RichTextCommentBodyPayload),
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)
   delete data.sys

diff --git a/lib/adapters/REST/endpoints/content-type.ts b/lib/adapters/REST/endpoints/content-type.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import copy from 'fast-copy'
 import { SetOptional } from 'type-fest'
@@ -22,7 +22,7 @@ const getContentTypeUrl = (params: GetContentTypeParams) =>
 export const get: RestEndpoint<'ContentType', 'get'> = (
   http: AxiosInstance,
   params: GetContentTypeParams & QueryParams,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.get<ContentTypeProps>(http, getContentTypeUrl(params), {
     params: normalizeSelect(params.query),
@@ -33,7 +33,7 @@ export const get: RestEndpoint<'ContentType', 'get'> = (
 export const getMany: RestEndpoint<'ContentType', 'getMany'> = (
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & QueryParams,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.get<CollectionProp<ContentTypeProps>>(http, getBaseUrl(params), {
     params: params.query,
@@ -45,7 +45,7 @@ export const create: RestEndpoint<'ContentType', 'create'> = (
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams,
   rawData: CreateContentTypeProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data = copy(rawData)
 
@@ -56,7 +56,7 @@ export const createWithId: RestEndpoint<'ContentType', 'createWithId'> = (
   http: AxiosInstance,
   params: GetContentTypeParams,
   rawData: CreateContentTypeProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data = copy(rawData)
 
@@ -67,7 +67,7 @@ export const update: RestEndpoint<'ContentType', 'update'> = (
   http: AxiosInstance,
   params: GetContentTypeParams,
   rawData: ContentTypeProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)
   delete data.sys
@@ -82,7 +82,7 @@ export const update: RestEndpoint<'ContentType', 'update'> = (
 export const del: RestEndpoint<'ContentType', 'delete'> = (
   http: AxiosInstance,
   params: GetContentTypeParams,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.del(http, getContentTypeUrl(params), { headers })
 }
@@ -91,7 +91,7 @@ export const publish: RestEndpoint<'ContentType', 'publish'> = (
   http: AxiosInstance,
   params: GetContentTypeParams,
   rawData: ContentTypeProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.put<ContentTypeProps>(http, getContentTypeUrl(params) + '/published', null, {
     headers: {
@@ -104,7 +104,7 @@ export const publish: RestEndpoint<'ContentType', 'publish'> = (
 export const unpublish: RestEndpoint<'ContentType', 'unpublish'> = (
   http: AxiosInstance,
   params: GetContentTypeParams,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.del<ContentTypeProps>(http, getContentTypeUrl(params) + '/published', { headers })
 }
diff --git a/lib/adapters/REST/endpoints/editor-interface.ts b/lib/adapters/REST/endpoints/editor-interface.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import copy from 'fast-copy'
 import { SetOptional } from 'type-fest'
@@ -36,7 +36,7 @@ export const update: RestEndpoint<'EditorInterface', 'update'> = (
   http: AxiosInstance,
   params: GetEditorInterfaceParams,
   rawData: EditorInterfaceProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)
   delete data.sys

diff --git a/lib/adapters/REST/endpoints/entry.ts b/lib/adapters/REST/endpoints/entry.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import copy from 'fast-copy'
 import { OpPatch } from 'json-patch'
@@ -18,7 +18,7 @@ export const get: RestEndpoint<'Entry', 'get'> = <T extends KeyValueMap = KeyVal
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & { entryId: string } & QueryParams,
   rawData?: unknown,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.get<EntryProps<T>>(
     http,
@@ -36,7 +36,7 @@ export const getPublished: RestEndpoint<'Entry', 'getPublished'> = <
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & QueryParams,
   rawData?: unknown,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.get<CollectionProp<EntryProps<T>>>(
     http,
@@ -52,7 +52,7 @@ export const getMany: RestEndpoint<'Entry', 'getMany'> = <T extends KeyValueMap
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & QueryParams,
   rawData?: unknown,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.get<CollectionProp<EntryProps<T>>>(
     http,
@@ -68,7 +68,7 @@ export const patch: RestEndpoint<'Entry', 'patch'> = <T extends KeyValueMap = Ke
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & { entryId: string; version: number },
   data: OpPatch[],
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.patch<EntryProps<T>>(
     http,
@@ -88,7 +88,7 @@ export const update: RestEndpoint<'Entry', 'update'> = <T extends KeyValueMap =
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & { entryId: string },
   rawData: EntryProps<T>,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)
   delete data.sys

diff --git a/lib/adapters/REST/endpoints/environment-alias.ts b/lib/adapters/REST/endpoints/environment-alias.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import copy from 'fast-copy'
 import { SetOptional } from 'type-fest'
@@ -48,7 +48,7 @@ export const createWithId: RestEndpoint<'EnvironmentAlias', 'createWithId'> = (
   http: AxiosInstance,
   params: GetSpaceEnvAliasParams,
   rawData: CreateEnvironmentAliasProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data = copy(rawData)
   return raw.put<EnvironmentAliasProps>(http, getEnvironmentAliasUrl(params), data, {
@@ -60,7 +60,7 @@ export const update: RestEndpoint<'EnvironmentAlias', 'update'> = (
   http: AxiosInstance,
   params: GetSpaceEnvAliasParams,
   rawData: EnvironmentAliasProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)
   delete data.sys

diff --git a/lib/adapters/REST/endpoints/environment.ts b/lib/adapters/REST/endpoints/environment.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import copy from 'fast-copy'
 import { SetOptional } from 'type-fest'
@@ -35,7 +35,7 @@ export const update: RestEndpoint<'Environment', 'update'> = (
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams,
   rawData: EnvironmentProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)
   delete data.sys
@@ -64,7 +64,7 @@ export const create: RestEndpoint<'Environment', 'create'> = (
   http: AxiosInstance,
   params: GetSpaceParams,
   rawData: CreateEnvironmentProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data = copy(rawData)
   return raw.post<EnvironmentProps>(http, `/spaces/${params.spaceId}/environments`, data, {
@@ -76,7 +76,7 @@ export const createWithId: RestEndpoint<'Environment', 'createWithId'> = (
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams & { sourceEnvironmentId?: string },
   rawData: CreateEnvironmentProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data = copy(rawData)
   return raw.put<EnvironmentProps>(

diff --git a/lib/adapters/REST/endpoints/extension.ts b/lib/adapters/REST/endpoints/extension.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestHeaders } from 'axios'
+import { RawAxiosRequestHeaders } from 'axios'
 import type { AxiosInstance } from 'contentful-sdk-core'
 import copy from 'fast-copy'
 import { SetOptional } from 'type-fest'
@@ -41,7 +41,7 @@ export const create: RestEndpoint<'Extension', 'create'> = (
   http: AxiosInstance,
   params: GetSpaceEnvironmentParams,
   rawData: CreateExtensionProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   return raw.post<ExtensionProps>(http, getBaseUrl(params), rawData, { headers })
 }
@@ -50,7 +50,7 @@ export const createWithId: RestEndpoint<'Extension', 'createWithId'> = (
   http: AxiosInstance,
   params: GetExtensionParams,
   rawData: CreateExtensionProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data = copy(rawData)
 
@@ -61,7 +61,7 @@ export const update: RestEndpoint<'Extension', 'update'> = async (
   http: AxiosInstance,
   params: GetExtensionParams,
   rawData: ExtensionProps,
-  headers?: AxiosRequestHeaders
+  headers?: RawAxiosRequestHeaders
 ) => {
   const data: SetOptional<typeof rawData, 'sys'> = copy(rawData)