Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Update axios to 1.13.2 (#2432)

Koen3cc20bce9ed5
diff --git a/ui/component/core/package.json b/ui/component/core/package.json
index a01f47386..a3dbc58cd 100644
--- a/ui/component/core/package.json
+++ b/ui/component/core/package.json
@@ -24,7 +24,7 @@
"@openremote/model": "workspace:*",
"@openremote/or-icon": "workspace:*",
"@openremote/rest": "workspace:*",
- "axios": "0.24.0",
+ "axios": "~1.13.2",
"i18next": "^21.5.3",
"i18next-http-backend": "^1.3.1",
"keycloak-js": "^25.0.1",
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 05676a915..d0629a9b2 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -1,7 +1,7 @@
import "url-search-params-polyfill";
import {Console} from "./console";
import rest from "@openremote/rest";
-import {AxiosRequestConfig} from "axios";
+import {InternalAxiosRequestConfig} from "axios";
import {EventProvider, EventProviderFactory, EventProviderStatus, WebSocketEventProvider} from "./event";
import i18next, {InitOptions} from "i18next";
import i18nextBackend from "i18next-http-backend";
@@ -569,7 +569,7 @@ export class Manager implements EventProviderFactory {
// Add interceptor to inject authorization header on each request
rest.addRequestInterceptor(
- (config: AxiosRequestConfig) => {
+ (config: InternalAxiosRequestConfig) => {
if (!config!.headers!.Authorization) {
const authHeader = this.getAuthorizationHeader();
diff --git a/ui/component/or-asset-viewer/package.json b/ui/component/or-asset-viewer/package.json
index b91a25a01..702d55e70 100644
--- a/ui/component/or-asset-viewer/package.json
+++ b/ui/component/or-asset-viewer/package.json
@@ -36,7 +36,7 @@
"lit": "^3.3.1"
},
"devDependencies": {
- "axios": "0.24.0"
+ "axios": "~1.13.2"
},
"publishConfig": {
"access": "public"
diff --git a/ui/component/or-log-viewer/package.json b/ui/component/or-log-viewer/package.json
index eb035084b..1e60b8fb2 100644
--- a/ui/component/or-log-viewer/package.json
+++ b/ui/component/or-log-viewer/package.json
@@ -27,7 +27,7 @@
"@openremote/or-components": "workspace:*",
"@openremote/or-mwc-components": "workspace:*",
"@openremote/or-translate": "workspace:*",
- "axios": "0.24.0",
+ "axios": "~1.13.2",
"http-link-header": "^1.1.3",
"lit": "^3.3.1",
"moment": "^2.29.4"
diff --git a/ui/component/rest/package.json b/ui/component/rest/package.json
index b5a28b30e..7f4773f64 100644
--- a/ui/component/rest/package.json
+++ b/ui/component/rest/package.json
@@ -21,7 +21,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "axios": "0.24.0",
+ "axios": "~1.13.2",
"qs": "^6.8.0"
},
"devDependencies": {
diff --git a/ui/component/rest/src/index.ts b/ui/component/rest/src/index.ts
index ddbcf2642..f5bda9873 100644
--- a/ui/component/rest/src/index.ts
+++ b/ui/component/rest/src/index.ts
@@ -1,4 +1,4 @@
-import axios, {AxiosInstance, AxiosRequestConfig, GenericAxiosResponse, AxiosError} from "axios";
+import axios, {AxiosInstance, GenericAxiosResponse, AxiosError, InternalAxiosRequestConfig} from "axios";
import {ApiClient, RestResponse} from "./restclient";
import Qs from "qs";
@@ -37,7 +37,7 @@ export class RestApi {
this._axiosInstance.defaults.timeout = timeout;
}
- public addRequestInterceptor(interceptor: (config: AxiosRequestConfig) => AxiosRequestConfig) {
+ public addRequestInterceptor(interceptor: (config: InternalAxiosRequestConfig) => InternalAxiosRequestConfig) {
this._axiosInstance.interceptors.request.use(interceptor);
}
diff --git a/yarn.lock b/yarn.lock
index b9e5717d7..0508f8141 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1698,7 +1698,7 @@ __metadata:
"@openremote/or-icon": "workspace:*"
"@openremote/rest": "workspace:*"
"@types/qs": "npm:^6.9.7"
- axios: "npm:0.24.0"
+ axios: "npm:~1.13.2"
i18next: "npm:^21.5.3"
i18next-http-backend: "npm:^1.3.1"
keycloak-js: "npm:^25.0.1"
@@ -1841,7 +1841,7 @@ __metadata:
"@openremote/or-icon": "workspace:*"
"@openremote/or-mwc-components": "workspace:*"
"@openremote/or-translate": "workspace:*"
- axios: "npm:0.24.0"
+ axios: "npm:~1.13.2"
i18next: "npm:^21.5.3"
lit: "npm:^3.3.1"
languageName: unknown
@@ -2062,7 +2062,7 @@ __metadata:
"@openremote/or-components": "workspace:*"
"@openremote/or-mwc-components": "workspace:*"
"@openremote/or-translate": "workspace:*"
- axios: "npm:0.24.0"
+ axios: "npm:~1.13.2"
http-link-header: "npm:^1.1.3"
lit: "npm:^3.3.1"
moment: "npm:^2.29.4"
@@ -2281,7 +2281,7 @@ __metadata:
resolution: "@openremote/rest@workspace:ui/component/rest"
dependencies:
"@types/qs": "npm:^6.9.7"
- axios: "npm:0.24.0"
+ axios: "npm:~1.13.2"
qs: "npm:^6.8.0"
languageName: unknown
linkType: soft
@@ -4640,6 +4640,27 @@ __metadata:
languageName: node
linkType: hard
+"async-function@npm:^1.0.0":
+ version: 1.0.0
+ resolution: "async-function@npm:1.0.0"
+ checksum: 10c0/669a32c2cb7e45091330c680e92eaeb791bc1d4132d827591e499cd1f776ff5a873e77e5f92d0ce795a8d60f10761dec9ddfe7225a5de680f5d357f67b1aac73
+ languageName: node
+ linkType: hard
+
+"async-generator-function@npm:^1.0.0":
+ version: 1.0.0
+ resolution: "async-generator-function@npm:1.0.0"
+ checksum: 10c0/2c50ef856c543ad500d8d8777d347e3c1ba623b93e99c9263ecc5f965c1b12d2a140e2ab6e43c3d0b85366110696f28114649411cbcd10b452a92a2318394186
+ languageName: node
+ linkType: hard
+
+"asynckit@npm:^0.4.0":
+ version: 0.4.0
+ resolution: "asynckit@npm:0.4.0"
+ checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d
+ languageName: node
+ linkType: hard
+
"available-typed-arrays@npm:^1.0.5, available-typed-arrays@npm:^1.0.6":
version: 1.0.6
resolution: "available-typed-arrays@npm:1.0.6"
@@ -4663,12 +4684,14 @@ __metadata:
languageName: node
linkType: hard
-"axios@npm:0.24.0":
- version: 0.24.0
- resolution: "axios@npm:0.24.0"
+"axios@npm:~1.13.2":
+ version: 1.13.2
+ resolution: "axios@npm:1.13.2"
dependencies:
- follow-redirects: "npm:^1.14.4"
- checksum: 10c0/d106561e761bf48633633073626eafb80289eb7c7c27f9fae4fb796939b6ecd2c9f63b596e3b3d872f7c0bec6b2fb117c58456d387e4ca2da7fc07c795a979c3
+ follow-redirects: "npm:^1.15.6"
+ form-data: "npm:^4.0.4"
+ proxy-from-env: "npm:^1.1.0"
+ checksum: 10c0/e8a42e37e5568ae9c7a28c348db0e8cf3e43d06fcbef73f0048669edfe4f71219664da7b6cc991b0c0f01c28a48f037c515263cb79be1f1ae8ff034cd813867b
languageName: node
linkType: hard
@@ -5119,6 +5142,15 @@ __metadata:
languageName: node
linkType: hard
+"combined-stream@npm:^1.0.8":
+ version: 1.0.8
+ resolution: "combined-stream@npm:1.0.8"
+ dependencies:
+ delayed-stream: "npm:~1.0.0"
+ checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5
+ languageName: node
+ linkType: hard
+
"command-line-args@npm:5.1.2":
version: 5.1.2
resolution: "command-line-args@npm:5.1.2"
@@ -5566,6 +5598,13 @@ __metadata:
languageName: node
linkType: hard
+"delayed-stream@npm:~1.0.0":
+ version: 1.0.0
+ resolution: "delayed-stream@npm:1.0.0"
+ checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19
+ languageName: node
+ linkType: hard
+
"depd@npm:2.0.0":
version: 2.0.0
resolution: "depd@npm:2.0.0"
@@ -6041,6 +6080,18 @@ __metadata:
languageName: node
linkType: hard
+"es-set-tostringtag@npm:^2.1.0":
+ version: 2.1.0
+ resolution: "es-set-tostringtag@npm:2.1.0"
+ dependencies:
+ es-errors: "npm:^1.3.0"
+ get-intrinsic: "npm:^1.2.6"
+ has-tostringtag: "npm:^1.0.2"
+ hasown: "npm:^2.0.2"
+ checksum: 10c0/ef2ca9ce49afe3931cb32e35da4dcb6d86ab02592cfc2ce3e49ced199d9d0bb5085fc7e73e06312213765f5efa47cc1df553a6a5154584b21448e9fb8355b1af
+ languageName: node
+ linkType: hard
+
"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
version: 1.0.2
resolution: "es-shim-unscopables@npm:1.0.2"
@@ -6791,7 +6842,7 @@ __metadata:
languageName: node
linkType: hard
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.4":
+"follow-redirects@npm:^1.0.0":
version: 1.15.5
resolution: "follow-redirects@npm:1.15.5"
peerDependenciesMeta:
@@ -6801,6 +6852,16 @@ __metadata:
languageName: node
linkType: hard
+"follow-redirects@npm:^1.15.6":
+ version: 1.15.11
+ resolution: "follow-redirects@npm:1.15.11"
+ peerDependenciesMeta:
+ debug:
+ optional: true
+ checksum: 10c0/d301f430542520a54058d4aeeb453233c564aaccac835d29d15e050beb33f339ad67d9bddbce01739c5dc46a6716dbe3d9d0d5134b1ca203effa11a7ef092343
+ languageName: node
+ linkType: hard
+
"for-each@npm:^0.3.3":
version: 0.3.3
resolution: "for-each@npm:0.3.3"
@@ -6829,6 +6890,19 @@ __metadata:
languageName: node
linkType: hard
+"form-data@npm:^4.0.4":
+ version: 4.0.5
+ resolution: "form-data@npm:4.0.5"
+ dependencies:
+ asynckit: "npm:^0.4.0"
+ combined-stream: "npm:^1.0.8"
+ es-set-tostringtag: "npm:^2.1.0"
+ hasown: "npm:^2.0.2"
+ mime-types: "npm:^2.1.12"
+ checksum: 10c0/dd6b767ee0bbd6d84039db12a0fa5a2028160ffbfaba1800695713b46ae974a5f6e08b3356c3195137f8530dcd9dfcb5d5ae1eeff53d0db1e5aad863b619ce3b
+ languageName: node
+ linkType: hard
+
"forwarded@npm:0.2.0":
version: 0.2.0
resolution: "forwarded@npm:0.2.0"
@@ -7002,6 +7076,27 @@ __metadata:
languageName: node
linkType: hard
+"get-intrinsic@npm:^1.2.6":
+ version: 1.3.1
+ resolution: "get-intrinsic@npm:1.3.1"
+ dependencies:
+ async-function: "npm:^1.0.0"
+ async-generator-function: "npm:^1.0.0"
+ call-bind-apply-helpers: "npm:^1.0.2"
+ es-define-property: "npm:^1.0.1"
+ es-errors: "npm:^1.3.0"
+ es-object-atoms: "npm:^1.1.1"
+ function-bind: "npm:^1.1.2"
+ generator-function: "npm:^2.0.0"
+ get-proto: "npm:^1.0.1"
+ gopd: "npm:^1.2.0"
+ has-symbols: "npm:^1.1.0"
+ hasown: "npm:^2.0.2"
+ math-intrinsics: "npm:^1.1.0"
+ checksum: 10c0/9f4ab0cf7efe0fd2c8185f52e6f637e708f3a112610c88869f8f041bb9ecc2ce44bf285dfdbdc6f4f7c277a5b88d8e94a432374d97cca22f3de7fc63795deb5d
+ languageName: node
+ linkType: hard
+
"get-port@npm:5.1.1":
version: 5.1.1
resolution: "get-port@npm:5.1.1"
@@ -8503,7 +8598,7 @@ __metadata:
languageName: node
linkType: hard
-"mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
version: 2.1.35
resolution: "mime-types@npm:2.1.35"
dependencies:
@@ -9505,6 +9600,13 @@ __metadata:
languageName: node
linkType: hard
+"proxy-from-env@npm:^1.1.0":
+ version: 1.1.0
+ resolution: "proxy-from-env@npm:1.1.0"
+ checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b
+ languageName: node
+ linkType: hard
+
"pump@npm:^3.0.0":
version: 3.0.3
resolution: "pump@npm:3.0.3"