mirror of
https://github.com/elastic/kibana.git
synced 2025-06-27 18:51:07 -04:00
# Backport This will backport the following commits from `main` to `7.17`: - [[deps] Upgrade axios to 1.8.2 (#213901)](https://github.com/elastic/kibana/pull/213901) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Alex Szabo","email":"alex.szabo@elastic.co"},"sourceCommit":{"committedDate":"2025-03-12T11:05:02Z","message":"[deps] Upgrade axios to 1.8.2 (#213901)\n\n## Summary\nUpgades axios to 1.8.2, including in transitive dependencies","sha":"0172dd99cfc3cbda40a7cdf1c4e5131ed07e1da3","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v9.0.0","backport:all-open","v8.18.0","v9.1.0","v8.19.0","v8.16.6","v8.17.4"],"title":"[deps] Upgrade axios to 1.8.2","number":213901,"url":"https://github.com/elastic/kibana/pull/213901","mergeCommit":{"message":"[deps] Upgrade axios to 1.8.2 (#213901)\n\n## Summary\nUpgades axios to 1.8.2, including in transitive dependencies","sha":"0172dd99cfc3cbda40a7cdf1c4e5131ed07e1da3"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214113","number":214113,"state":"MERGED","mergeCommit":{"sha":"658b6ec2b9720018d0f6033150293b3d0b8d7724","message":"[9.0] [deps] Upgrade axios to 1.8.2 (#213901) (#214113)\n\n# Backport\n\nThis will backport the following commits from `main` to `9.0`:\n- [[deps] Upgrade axios to 1.8.2\n(#213901)](https://github.com/elastic/kibana/pull/213901)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Alex Szabo <alex.szabo@elastic.co>"}},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214111","number":214111,"state":"MERGED","mergeCommit":{"sha":"5a3f44dce84fc7358f4eb1e6e1d7669fb699fefe","message":"[8.18] [deps] Upgrade axios to 1.8.2 (#213901) (#214111)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.18`:\n- [[deps] Upgrade axios to 1.8.2\n(#213901)](https://github.com/elastic/kibana/pull/213901)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Alex Szabo <alex.szabo@elastic.co>"}},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/213901","number":213901,"mergeCommit":{"message":"[deps] Upgrade axios to 1.8.2 (#213901)\n\n## Summary\nUpgades axios to 1.8.2, including in transitive dependencies","sha":"0172dd99cfc3cbda40a7cdf1c4e5131ed07e1da3"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214112","number":214112,"state":"MERGED","mergeCommit":{"sha":"acf9ca56f6a5acd39bfc48458ec25aa641bea481","message":"[8.x] [deps] Upgrade axios to 1.8.2 (#213901) (#214112)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.x`:\n- [[deps] Upgrade axios to 1.8.2\n(#213901)](https://github.com/elastic/kibana/pull/213901)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Alex Szabo <alex.szabo@elastic.co>"}},{"branch":"8.16","label":"v8.16.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214109","number":214109,"state":"MERGED","mergeCommit":{"sha":"dcf7274e890489000bfa6b9b2d8f7e55b76def0b","message":"[8.16] [deps] Upgrade axios to 1.8.2 (#213901) (#214109)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.16`:\n- [[deps] Upgrade axios to 1.8.2\n(#213901)](https://github.com/elastic/kibana/pull/213901)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Alex Szabo <alex.szabo@elastic.co>"}},{"branch":"8.17","label":"v8.17.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214110","number":214110,"state":"MERGED","mergeCommit":{"sha":"cadf38ab81f810f3324dadabab1dcc81da6f3ec8","message":"[8.17] [deps] Upgrade axios to 1.8.2 (#213901) (#214110)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.17`:\n- [[deps] Upgrade axios to 1.8.2\n(#213901)](https://github.com/elastic/kibana/pull/213901)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Alex Szabo <alex.szabo@elastic.co>"}}]}] BACKPORT--> --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
parent
197a510f50
commit
48c80d2ee7
3 changed files with 56 additions and 38 deletions
|
@ -192,7 +192,7 @@
|
|||
"ansi-regex": "^5.0.1",
|
||||
"antlr4ts": "^0.5.0-alpha.3",
|
||||
"archiver": "^5.3.1",
|
||||
"axios": "^1.7.9",
|
||||
"axios": "^1.8.2",
|
||||
"base64-js": "^1.3.1",
|
||||
"bluebird": "3.5.5",
|
||||
"brace": "0.11.1",
|
||||
|
|
84
packages/kbn-pm/dist/index.js
vendored
84
packages/kbn-pm/dist/index.js
vendored
|
@ -12667,26 +12667,6 @@ const toFiniteNumber = (value, defaultValue) => {
|
|||
return value != null && Number.isFinite(value = +value) ? value : defaultValue;
|
||||
}
|
||||
|
||||
const ALPHA = 'abcdefghijklmnopqrstuvwxyz'
|
||||
|
||||
const DIGIT = '0123456789';
|
||||
|
||||
const ALPHABET = {
|
||||
DIGIT,
|
||||
ALPHA,
|
||||
ALPHA_DIGIT: ALPHA + ALPHA.toUpperCase() + DIGIT
|
||||
}
|
||||
|
||||
const generateString = (size = 16, alphabet = ALPHABET.ALPHA_DIGIT) => {
|
||||
let str = '';
|
||||
const {length} = alphabet;
|
||||
while (size--) {
|
||||
str += alphabet[Math.random() * length|0]
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/**
|
||||
* If the thing is a FormData object, return true, otherwise return false.
|
||||
*
|
||||
|
@ -12814,8 +12794,6 @@ const asap = typeof queueMicrotask !== 'undefined' ?
|
|||
findKey,
|
||||
global: _global,
|
||||
isContextDefined,
|
||||
ALPHABET,
|
||||
generateString,
|
||||
isSpecCompliantForm,
|
||||
toJSONObject,
|
||||
isAsyncFn,
|
||||
|
@ -12954,6 +12932,15 @@ class Axios {
|
|||
}
|
||||
}
|
||||
|
||||
// Set config.allowAbsoluteUrls
|
||||
if (config.allowAbsoluteUrls !== undefined) {
|
||||
// do nothing
|
||||
} else if (this.defaults.allowAbsoluteUrls !== undefined) {
|
||||
config.allowAbsoluteUrls = this.defaults.allowAbsoluteUrls;
|
||||
} else {
|
||||
config.allowAbsoluteUrls = true;
|
||||
}
|
||||
|
||||
_helpers_validator_js__WEBPACK_IMPORTED_MODULE_6__["default"].assertOptions(config, {
|
||||
baseUrl: validators.spelling('baseURL'),
|
||||
withXsrfToken: validators.spelling('withXSRFToken')
|
||||
|
@ -13049,7 +13036,7 @@ class Axios {
|
|||
|
||||
getUri(config) {
|
||||
config = Object(_mergeConfig_js__WEBPACK_IMPORTED_MODULE_4__["default"])(this.defaults, config);
|
||||
const fullPath = Object(_buildFullPath_js__WEBPACK_IMPORTED_MODULE_5__["default"])(config.baseURL, config.url);
|
||||
const fullPath = Object(_buildFullPath_js__WEBPACK_IMPORTED_MODULE_5__["default"])(config.baseURL, config.url, config.allowAbsoluteUrls);
|
||||
return Object(_helpers_buildURL_js__WEBPACK_IMPORTED_MODULE_1__["default"])(fullPath, config.params, config.paramsSerializer);
|
||||
}
|
||||
}
|
||||
|
@ -15570,18 +15557,46 @@ __webpack_require__.r(__webpack_exports__);
|
|||
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _classes_URLSearchParams_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(215);
|
||||
/* harmony import */ var _classes_FormData_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(186);
|
||||
/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(136);
|
||||
/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_0__);
|
||||
/* harmony import */ var _classes_URLSearchParams_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
|
||||
/* harmony import */ var _classes_FormData_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(186);
|
||||
|
||||
|
||||
|
||||
|
||||
const ALPHA = 'abcdefghijklmnopqrstuvwxyz'
|
||||
|
||||
const DIGIT = '0123456789';
|
||||
|
||||
const ALPHABET = {
|
||||
DIGIT,
|
||||
ALPHA,
|
||||
ALPHA_DIGIT: ALPHA + ALPHA.toUpperCase() + DIGIT
|
||||
}
|
||||
|
||||
const generateString = (size = 16, alphabet = ALPHABET.ALPHA_DIGIT) => {
|
||||
let str = '';
|
||||
const {length} = alphabet;
|
||||
const randomValues = new Uint32Array(size);
|
||||
crypto__WEBPACK_IMPORTED_MODULE_0___default.a.randomFillSync(randomValues);
|
||||
for (let i = 0; i < size; i++) {
|
||||
str += alphabet[randomValues[i] % length];
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
|
||||
/* harmony default export */ __webpack_exports__["default"] = ({
|
||||
isNode: true,
|
||||
classes: {
|
||||
URLSearchParams: _classes_URLSearchParams_js__WEBPACK_IMPORTED_MODULE_0__["default"],
|
||||
FormData: _classes_FormData_js__WEBPACK_IMPORTED_MODULE_1__["default"],
|
||||
URLSearchParams: _classes_URLSearchParams_js__WEBPACK_IMPORTED_MODULE_1__["default"],
|
||||
FormData: _classes_FormData_js__WEBPACK_IMPORTED_MODULE_2__["default"],
|
||||
Blob: typeof Blob !== 'undefined' && Blob || null
|
||||
},
|
||||
ALPHABET,
|
||||
generateString,
|
||||
protocols: [ 'http', 'https', 'file', 'data' ]
|
||||
});
|
||||
|
||||
|
@ -16549,7 +16564,7 @@ const buildAddressEntry = (address, family) => resolveFamily(_utils_js__WEBPACK_
|
|||
}
|
||||
|
||||
// Parse url
|
||||
const fullPath = Object(_core_buildFullPath_js__WEBPACK_IMPORTED_MODULE_2__["default"])(config.baseURL, config.url);
|
||||
const fullPath = Object(_core_buildFullPath_js__WEBPACK_IMPORTED_MODULE_2__["default"])(config.baseURL, config.url, config.allowAbsoluteUrls);
|
||||
const parsed = new URL(fullPath, _platform_index_js__WEBPACK_IMPORTED_MODULE_14__["default"].hasBrowserEnv ? _platform_index_js__WEBPACK_IMPORTED_MODULE_14__["default"].origin : undefined);
|
||||
const protocol = parsed.protocol || supportedProtocols[0];
|
||||
|
||||
|
@ -17077,8 +17092,9 @@ __webpack_require__.r(__webpack_exports__);
|
|||
*
|
||||
* @returns {string} The combined full path
|
||||
*/
|
||||
function buildFullPath(baseURL, requestedURL) {
|
||||
if (baseURL && !Object(_helpers_isAbsoluteURL_js__WEBPACK_IMPORTED_MODULE_0__["default"])(requestedURL)) {
|
||||
function buildFullPath(baseURL, requestedURL, allowAbsoluteUrls) {
|
||||
let isRelativeUrl = !Object(_helpers_isAbsoluteURL_js__WEBPACK_IMPORTED_MODULE_0__["default"])(requestedURL);
|
||||
if (baseURL && isRelativeUrl || allowAbsoluteUrls == false) {
|
||||
return Object(_helpers_combineURLs_js__WEBPACK_IMPORTED_MODULE_1__["default"])(baseURL, requestedURL);
|
||||
}
|
||||
return requestedURL;
|
||||
|
@ -18793,7 +18809,7 @@ module.exports = require("zlib");
|
|||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VERSION", function() { return VERSION; });
|
||||
const VERSION = "1.7.9";
|
||||
const VERSION = "1.8.2";
|
||||
|
||||
/***/ }),
|
||||
/* 239 */
|
||||
|
@ -19041,12 +19057,14 @@ __webpack_require__.r(__webpack_exports__);
|
|||
/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stream__WEBPACK_IMPORTED_MODULE_1__);
|
||||
/* harmony import */ var _utils_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(179);
|
||||
/* harmony import */ var _readBlob_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(243);
|
||||
/* harmony import */ var _platform_index_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(213);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
const BOUNDARY_ALPHABET = _utils_js__WEBPACK_IMPORTED_MODULE_2__["default"].ALPHABET.ALPHA_DIGIT + '-_';
|
||||
|
||||
const BOUNDARY_ALPHABET = _platform_index_js__WEBPACK_IMPORTED_MODULE_4__["default"].ALPHABET.ALPHA_DIGIT + '-_';
|
||||
|
||||
const textEncoder = typeof TextEncoder === 'function' ? new TextEncoder() : new util__WEBPACK_IMPORTED_MODULE_0___default.a.TextEncoder();
|
||||
|
||||
|
@ -19106,7 +19124,7 @@ const formDataToStream = (form, headersHandler, options) => {
|
|||
const {
|
||||
tag = 'form-data-boundary',
|
||||
size = 25,
|
||||
boundary = tag + '-' + _utils_js__WEBPACK_IMPORTED_MODULE_2__["default"].generateString(size, BOUNDARY_ALPHABET)
|
||||
boundary = tag + '-' + _platform_index_js__WEBPACK_IMPORTED_MODULE_4__["default"].generateString(size, BOUNDARY_ALPHABET)
|
||||
} = options || {};
|
||||
|
||||
if(!_utils_js__WEBPACK_IMPORTED_MODULE_2__["default"].isFormData(form)) {
|
||||
|
|
|
@ -8270,10 +8270,10 @@ axe-core@^4.2.0:
|
|||
resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0"
|
||||
integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==
|
||||
|
||||
axios@^1.6.0, axios@^1.6.2, axios@^1.7.4, axios@^1.7.9:
|
||||
version "1.7.9"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
|
||||
integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
|
||||
axios@^1.6.0, axios@^1.6.2, axios@^1.7.4, axios@^1.8.2:
|
||||
version "1.8.2"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
|
||||
integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
|
||||
dependencies:
|
||||
follow-redirects "^1.15.6"
|
||||
form-data "^4.0.0"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue