This is an automated email from the ASF dual-hosted git repository.
pierrejeambrun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new a295ef3cb0 Bump axios from 0.26.0 to 1.6.0 in /airflow/www/ (#35624)
a295ef3cb0 is described below
commit a295ef3cb056254b70ea6f31cc44cc0dc9040984
Author: Pierre Jeambrun <[email protected]>
AuthorDate: Tue Nov 14 22:32:04 2023 +0800
Bump axios from 0.26.0 to 1.6.0 in /airflow/www/ (#35624)
* Bump axios from 0.26.0 to 1.6.0 in /airflow/www/
* Fix tests
---
airflow/www/jest.config.js | 35 +++++++++++-----------
airflow/www/package.json | 2 +-
airflow/www/static/js/utils/useErrorToast.test.tsx | 4 +--
airflow/www/yarn.lock | 34 +++++++++++++++------
4 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/airflow/www/jest.config.js b/airflow/www/jest.config.js
index 11f8da1c4c..84e1ced6d1 100644
--- a/airflow/www/jest.config.js
+++ b/airflow/www/jest.config.js
@@ -32,29 +32,30 @@ const config = {
transformIgnorePatterns: [
`node_modules/(?!${[
// specify modules that needs to be transformed for jest. (esm modules)
- "react-markdown",
- "vfile",
- "vfile-message",
- "unist",
- "unified",
+ "axios",
"bail",
+ "ccount",
+ "character-entities",
+ "comma-separated-tokens",
+ "decode-named-character-reference",
+ "escape-string-regexp",
+ "hast",
"is-plain-obj",
- "trough",
- "remark-parse",
+ "markdown-table",
"mdast",
"micromark",
- "decode-named-character-reference",
- "character-entities",
- "remark-rehype",
- "trim-lines",
"property-information",
- "hast",
- "space-separated-tokens",
- "comma-separated-tokens",
+ "react-markdown",
"remark-gfm",
- "ccount",
- "escape-string-regexp",
- "markdown-table",
+ "remark-parse",
+ "remark-rehype",
+ "space-separated-tokens",
+ "trim-lines",
+ "trough",
+ "unified",
+ "unist",
+ "vfile",
+ "vfile-message",
].join("|")})`,
],
};
diff --git a/airflow/www/package.json b/airflow/www/package.json
index 8651ca59ba..12b25445ba 100644
--- a/airflow/www/package.json
+++ b/airflow/www/package.json
@@ -105,7 +105,7 @@
"@emotion/styled": "^11",
"@visx/group": "^2.10.0",
"@visx/shape": "^2.12.2",
- "axios": "^0.26.0",
+ "axios": "^1.6.0",
"bootstrap-3-typeahead": "^4.0.2",
"camelcase-keys": "^7.0.0",
"chakra-react-select": "^4.0.0",
diff --git a/airflow/www/static/js/utils/useErrorToast.test.tsx
b/airflow/www/static/js/utils/useErrorToast.test.tsx
index 5241bb1259..27954853f1 100644
--- a/airflow/www/static/js/utils/useErrorToast.test.tsx
+++ b/airflow/www/static/js/utils/useErrorToast.test.tsx
@@ -19,7 +19,7 @@
/* global describe, test, expect */
-import type { AxiosError } from "axios";
+import type { AxiosError, AxiosResponse } from "axios";
import { getErrorDescription } from "./useErrorToast";
describe("Test getErrorDescription()", () => {
@@ -36,7 +36,7 @@ describe("Test getErrorDescription()", () => {
statusText: "BadRequest",
headers: {},
config: {},
- };
+ } as AxiosResponse;
axiosError.isAxiosError = true;
// if response.data is defined
diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock
index e1cd85d3ff..bea73a3aac 100644
--- a/airflow/www/yarn.lock
+++ b/airflow/www/yarn.lock
@@ -4131,12 +4131,14 @@ axe-core@^4.3.5:
resolved
"https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.2.tgz#dcf7fb6dea866166c3eab33d68208afe4d5f670c";
integrity
sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==
-axios@^0.26.0:
- version "0.26.0"
- resolved
"https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz#9a318f1c69ec108f8cd5f3c3d390366635e13928";
- integrity
sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==
+axios@^1.6.0:
+ version "1.6.1"
+ resolved
"https://registry.yarnpkg.com/axios/-/axios-1.6.1.tgz#76550d644bf0a2d469a01f9244db6753208397d7";
+ integrity
sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==
dependencies:
- follow-redirects "^1.14.8"
+ follow-redirects "^1.15.0"
+ form-data "^4.0.0"
+ proxy-from-env "^1.1.0"
axobject-query@^2.2.0:
version "2.2.0"
@@ -6438,10 +6440,10 @@ focus-lock@^0.11.6:
dependencies:
tslib "^2.0.3"
-follow-redirects@^1.14.8:
- version "1.14.9"
- resolved
"https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7";
- integrity
sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+follow-redirects@^1.15.0:
+ version "1.15.3"
+ resolved
"https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a";
+ integrity
sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
for-each@^0.3.3:
version "0.3.3"
@@ -6464,6 +6466,15 @@ form-data@^3.0.0:
combined-stream "^1.0.8"
mime-types "^2.1.12"
+form-data@^4.0.0:
+ version "4.0.0"
+ resolved
"https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452";
+ integrity
sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ mime-types "^2.1.12"
+
format@^0.2.0:
version "0.2.2"
resolved
"https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b";
@@ -9763,6 +9774,11 @@ property-information@^6.0.0:
resolved
"https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz#b74f522c31c097b5149e3c3cb8d7f3defd986a1d";
integrity
sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==
+proxy-from-env@^1.1.0:
+ version "1.1.0"
+ resolved
"https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2";
+ integrity
sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
psl@^1.1.33:
version "1.8.0"
resolved
"https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24";
