From a3ffc56d835ce51a5c2e81e77f7d0773b0036b15 Mon Sep 17 00:00:00 2001 From: Jeramy Soucy Date: Thu, 5 Dec 2024 18:39:28 -0500 Subject: [PATCH] =?UTF-8?q?[7.17]=20Upgrade=20axios=201.7.4=20=E2=86=92=20?= =?UTF-8?q?1.7.9=20(#202774)=20(#203040)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Backport This will backport the following commits from `main` to `7.17`: - [Upgrade axios 1.7.4 → 1.7.9 (#202774)](https://github.com/elastic/kibana/pull/202774) ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> --- package.json | 3 +- packages/kbn-pm/dist/index.js | 288 +++++++++++++++++----------------- yarn.lock | 8 +- 3 files changed, 152 insertions(+), 147 deletions(-) diff --git a/package.json b/package.json index 3db68ec0ef26f..58e42a49f4b2a 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,6 @@ "**/@types/react": "^16.14.25", "**/@types/react-dom": "^16.9.8", "**/@typescript-eslint/utils": "5.62.0", - "**/axios": "1.7.4", "**/chokidar": "^3.4.3", "**/d3-scale/**/d3-color": "npm:@elastic/kibana-d3-color@1.4.2", "**/follow-redirects": "^1.15.6", @@ -193,7 +192,7 @@ "ansi-regex": "^5.0.1", "antlr4ts": "^0.5.0-alpha.3", "archiver": "^5.3.1", - "axios": "1.7.4", + "axios": "^1.7.9", "base64-js": "^1.3.1", "bluebird": "3.5.5", "brace": "0.11.1", diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index 845fa12a488f0..8901643a039e4 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -12897,9 +12897,9 @@ class Axios { return await this._request(configOrUrl, config); } catch (err) { if (err instanceof Error) { - let dummy; + let dummy = {}; - Error.captureStackTrace ? Error.captureStackTrace(dummy = {}) : (dummy = new Error()); + Error.captureStackTrace ? Error.captureStackTrace(dummy) : (dummy = new Error()); // slice off the Error: ... line const stack = dummy.stack ? dummy.stack.replace(/^.+\n/, '') : ''; @@ -12954,6 +12954,11 @@ class Axios { } } + _helpers_validator_js__WEBPACK_IMPORTED_MODULE_6__["default"].assertOptions(config, { + baseUrl: validators.spelling('baseURL'), + withXsrfToken: validators.spelling('withXSRFToken') + }, true); + // Set config.method config.method = (config.method || this.defaults.method || 'get').toLowerCase(); @@ -13122,7 +13127,7 @@ function encode(val) { * * @param {string} url The base of the url (e.g., http://www.google.com) * @param {object} [params] The params to be appended - * @param {?object} options + * @param {?(object|Function)} options * * @returns {string} The formatted url */ @@ -13134,6 +13139,12 @@ function buildURL(url, params, options) { const _encode = options && options.encode || encode; + if (_utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isFunction(options)) { + options = { + serialize: options + }; + } + const serializeFn = options && options.serialize; let serializedParams; @@ -13492,7 +13503,10 @@ function AxiosError(message, code, config, request, response) { code && (this.code = code); config && (this.config = config); request && (this.request = request); - response && (this.response = response); + if (response) { + this.response = response; + this.status = response.status ? response.status : null; + } } _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].inherits(AxiosError, Error, { @@ -13512,7 +13526,7 @@ _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].inherits(AxiosError, Error, { // Axios config: _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].toJSONObject(this.config), code: this.code, - status: this.response && this.response.status ? this.response.status : null + status: this.status }; } }); @@ -15595,9 +15609,12 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hasBrowserEnv", function() { return hasBrowserEnv; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hasStandardBrowserWebWorkerEnv", function() { return hasStandardBrowserWebWorkerEnv; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hasStandardBrowserEnv", function() { return hasStandardBrowserEnv; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "navigator", function() { return _navigator; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "origin", function() { return origin; }); const hasBrowserEnv = typeof window !== 'undefined' && typeof document !== 'undefined'; +const _navigator = typeof navigator === 'object' && navigator || undefined; + /** * Determine if we're running in a standard browser environment * @@ -15615,10 +15632,8 @@ const hasBrowserEnv = typeof window !== 'undefined' && typeof document !== 'unde * * @returns {boolean} */ -const hasStandardBrowserEnv = ( - (product) => { - return hasBrowserEnv && ['ReactNative', 'NativeScript', 'NS'].indexOf(product) < 0 - })(typeof navigator !== 'undefined' && navigator.product); +const hasStandardBrowserEnv = hasBrowserEnv && + (!_navigator || ['ReactNative', 'NativeScript', 'NS'].indexOf(_navigator.product) < 0); /** * Determine if we're running in a standard browser webWorker environment @@ -16389,7 +16404,7 @@ function dispatchBeforeRedirect(options, responseDetails) { function setProxy(options, configProxy, location) { let proxy = configProxy; if (!proxy && proxy !== false) { - const proxyUrl = Object(proxy_from_env__WEBPACK_IMPORTED_MODULE_4__["getProxyForUrl"])(location); + const proxyUrl = proxy_from_env__WEBPACK_IMPORTED_MODULE_4___default.a.getProxyForUrl(location); if (proxyUrl) { proxy = new URL(proxyUrl); } @@ -16535,7 +16550,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 parsed = new URL(fullPath, _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].hasBrowserEnv ? _platform_index_js__WEBPACK_IMPORTED_MODULE_14__["default"].origin : undefined); + 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]; if (protocol === 'data:') { @@ -16620,7 +16635,7 @@ const buildAddressEntry = (address, family) => resolveFamily(_utils_js__WEBPACK_ } catch (e) { } } - } else if (_utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isBlob(data)) { + } else if (_utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isBlob(data) || _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isFile(data)) { data.size && headers.setContentType(data.type || 'application/octet-stream'); headers.setContentLength(data.size || 0); data = stream__WEBPACK_IMPORTED_MODULE_16___default.a.Readable.from(Object(_helpers_readBlob_js__WEBPACK_IMPORTED_MODULE_21__["default"])(data)); @@ -16733,7 +16748,7 @@ const buildAddressEntry = (address, family) => resolveFamily(_utils_js__WEBPACK_ if (config.socketPath) { options.socketPath = config.socketPath; } else { - options.hostname = parsed.hostname; + options.hostname = parsed.hostname.startsWith("[") ? parsed.hostname.slice(1, -1) : parsed.hostname; options.port = parsed.port; setProxy(options, config.proxy, protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path); } @@ -16875,7 +16890,7 @@ const buildAddressEntry = (address, family) => resolveFamily(_utils_js__WEBPACK_ } const err = new _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_12__["default"]( - 'maxContentLength size of ' + config.maxContentLength + ' exceeded', + 'stream has been aborted', _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_12__["default"].ERR_BAD_RESPONSE, config, lastRequest @@ -18778,7 +18793,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.4"; +const VERSION = "1.7.9"; /***/ }), /* 239 */ @@ -19033,7 +19048,7 @@ __webpack_require__.r(__webpack_exports__); const BOUNDARY_ALPHABET = _utils_js__WEBPACK_IMPORTED_MODULE_2__["default"].ALPHABET.ALPHA_DIGIT + '-_'; -const textEncoder = new util__WEBPACK_IMPORTED_MODULE_0__["TextEncoder"](); +const textEncoder = typeof TextEncoder === 'function' ? new TextEncoder() : new util__WEBPACK_IMPORTED_MODULE_0___default.a.TextEncoder(); const CRLF = '\r\n'; const CRLF_BYTES = textEncoder.encode(CRLF); @@ -19692,75 +19707,21 @@ __webpack_require__.r(__webpack_exports__); "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony import */ var _utils_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(179); -/* harmony import */ var _platform_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(213); - - - - - -/* harmony default export */ __webpack_exports__["default"] = (_platform_index_js__WEBPACK_IMPORTED_MODULE_1__["default"].hasStandardBrowserEnv ? - -// Standard browser envs have full support of the APIs needed to test -// whether the request URL is of the same origin as current location. - (function standardBrowserEnv() { - const msie = /(msie|trident)/i.test(navigator.userAgent); - const urlParsingNode = document.createElement('a'); - let originURL; - - /** - * Parse a URL to discover its components - * - * @param {String} url The URL to be parsed - * @returns {Object} - */ - function resolveURL(url) { - let href = url; - - if (msie) { - // IE needs attribute set twice to normalize properties - urlParsingNode.setAttribute('href', href); - href = urlParsingNode.href; - } +/* harmony import */ var _platform_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(213); - urlParsingNode.setAttribute('href', href); - // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils - return { - href: urlParsingNode.href, - protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '', - host: urlParsingNode.host, - search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '', - hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', - hostname: urlParsingNode.hostname, - port: urlParsingNode.port, - pathname: (urlParsingNode.pathname.charAt(0) === '/') ? - urlParsingNode.pathname : - '/' + urlParsingNode.pathname - }; - } +/* harmony default export */ __webpack_exports__["default"] = (_platform_index_js__WEBPACK_IMPORTED_MODULE_0__["default"].hasStandardBrowserEnv ? ((origin, isMSIE) => (url) => { + url = new URL(url, _platform_index_js__WEBPACK_IMPORTED_MODULE_0__["default"].origin); - originURL = resolveURL(window.location.href); - - /** - * Determine if a URL shares the same origin as the current location - * - * @param {String} requestURL The URL to test - * @returns {boolean} True if URL shares the same origin, otherwise false - */ - return function isURLSameOrigin(requestURL) { - const parsed = (_utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isString(requestURL)) ? resolveURL(requestURL) : requestURL; - return (parsed.protocol === originURL.protocol && - parsed.host === originURL.host); - }; - })() : - - // Non standard browser envs (web workers, react-native) lack needed support. - (function nonStandardBrowserEnv() { - return function isURLSameOrigin() { - return true; - }; - })()); + return ( + origin.protocol === url.protocol && + origin.host === url.host && + (isMSIE || origin.port === url.port) + ); +})( + new URL(_platform_index_js__WEBPACK_IMPORTED_MODULE_0__["default"].origin), + _platform_index_js__WEBPACK_IMPORTED_MODULE_0__["default"].navigator && /(msie|trident)/i.test(_platform_index_js__WEBPACK_IMPORTED_MODULE_0__["default"].navigator.userAgent) +) : () => true); /***/ }), @@ -19845,7 +19806,7 @@ function mergeConfig(config1, config2) { config2 = config2 || {}; const config = {}; - function getMergedValue(target, source, caseless) { + function getMergedValue(target, source, prop, caseless) { if (_utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isPlainObject(target) && _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isPlainObject(source)) { return _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].merge.call({caseless}, target, source); } else if (_utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isPlainObject(source)) { @@ -19857,11 +19818,11 @@ function mergeConfig(config1, config2) { } // eslint-disable-next-line consistent-return - function mergeDeepProperties(a, b, caseless) { + function mergeDeepProperties(a, b, prop , caseless) { if (!_utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isUndefined(b)) { - return getMergedValue(a, b, caseless); + return getMergedValue(a, b, prop , caseless); } else if (!_utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].isUndefined(a)) { - return getMergedValue(undefined, a, caseless); + return getMergedValue(undefined, a, prop , caseless); } } @@ -19919,7 +19880,7 @@ function mergeConfig(config1, config2) { socketPath: defaultToConfig2, responseEncoding: defaultToConfig2, validateStatus: mergeDirectKeys, - headers: (a, b) => mergeDeepProperties(headersToObject(a), headersToObject(b), true) + headers: (a, b , prop) => mergeDeepProperties(headersToObject(a), headersToObject(b),prop, true) }; _utils_js__WEBPACK_IMPORTED_MODULE_0__["default"].forEach(Object.keys(Object.assign({}, config1, config2)), function computeConfigValue(prop) { @@ -20018,7 +19979,11 @@ const getBodyLength = async (body) => { } if(_utils_js__WEBPACK_IMPORTED_MODULE_1__["default"].isSpecCompliantForm(body)) { - return (await new Request(body).arrayBuffer()).byteLength; + const _request = new Request(_platform_index_js__WEBPACK_IMPORTED_MODULE_0__["default"].origin, { + method: 'POST', + body, + }); + return (await _request.arrayBuffer()).byteLength; } if(_utils_js__WEBPACK_IMPORTED_MODULE_1__["default"].isArrayBufferView(body) || _utils_js__WEBPACK_IMPORTED_MODULE_1__["default"].isArrayBuffer(body)) { @@ -20058,18 +20023,13 @@ const resolveBodyLength = async (headers, body) => { responseType = responseType ? (responseType + '').toLowerCase() : 'text'; - let [composedSignal, stopTimeout] = (signal || cancelToken || timeout) ? - Object(_helpers_composeSignals_js__WEBPACK_IMPORTED_MODULE_3__["default"])([signal, cancelToken], timeout) : []; + let composedSignal = Object(_helpers_composeSignals_js__WEBPACK_IMPORTED_MODULE_3__["default"])([signal, cancelToken && cancelToken.toAbortSignal()], timeout); - let finished, request; + let request; - const onFinish = () => { - !finished && setTimeout(() => { - composedSignal && composedSignal.unsubscribe(); - }); - - finished = true; - } + const unsubscribe = composedSignal && composedSignal.unsubscribe && (() => { + composedSignal.unsubscribe(); + }); let requestContentLength; @@ -20096,7 +20056,7 @@ const resolveBodyLength = async (headers, body) => { Object(_helpers_progressEventReducer_js__WEBPACK_IMPORTED_MODULE_6__["progressEventReducer"])(Object(_helpers_progressEventReducer_js__WEBPACK_IMPORTED_MODULE_6__["asyncDecorator"])(onUploadProgress)) ); - data = Object(_helpers_trackStream_js__WEBPACK_IMPORTED_MODULE_4__["trackStream"])(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush, encodeText); + data = Object(_helpers_trackStream_js__WEBPACK_IMPORTED_MODULE_4__["trackStream"])(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush); } } @@ -20104,6 +20064,9 @@ const resolveBodyLength = async (headers, body) => { withCredentials = withCredentials ? 'include' : 'omit'; } + // Cloudflare Workers throws when credentials are defined + // see https://github.com/cloudflare/workerd/issues/902 + const isCredentialsSupported = "credentials" in Request.prototype; request = new Request(url, { ...fetchOptions, signal: composedSignal, @@ -20111,14 +20074,14 @@ const resolveBodyLength = async (headers, body) => { headers: headers.normalize().toJSON(), body: data, duplex: "half", - credentials: withCredentials + credentials: isCredentialsSupported ? withCredentials : undefined }); let response = await fetch(request); const isStreamResponse = supportsResponseStream && (responseType === 'stream' || responseType === 'response'); - if (supportsResponseStream && (onDownloadProgress || isStreamResponse)) { + if (supportsResponseStream && (onDownloadProgress || (isStreamResponse && unsubscribe))) { const options = {}; ['status', 'statusText', 'headers'].forEach(prop => { @@ -20135,8 +20098,8 @@ const resolveBodyLength = async (headers, body) => { response = new Response( Object(_helpers_trackStream_js__WEBPACK_IMPORTED_MODULE_4__["trackStream"])(response.body, DEFAULT_CHUNK_SIZE, onProgress, () => { flush && flush(); - isStreamResponse && onFinish(); - }, encodeText), + unsubscribe && unsubscribe(); + }), options ); } @@ -20145,9 +20108,7 @@ const resolveBodyLength = async (headers, body) => { let responseData = await resolvers[_utils_js__WEBPACK_IMPORTED_MODULE_1__["default"].findKey(resolvers, responseType) || 'text'](response, config); - !isStreamResponse && onFinish(); - - stopTimeout && stopTimeout(); + !isStreamResponse && unsubscribe && unsubscribe(); return await new Promise((resolve, reject) => { Object(_core_settle_js__WEBPACK_IMPORTED_MODULE_8__["default"])(resolve, reject, { @@ -20160,7 +20121,7 @@ const resolveBodyLength = async (headers, body) => { }) }) } catch (err) { - onFinish(); + unsubscribe && unsubscribe(); if (err && err.name === 'TypeError' && /fetch/i.test(err.message)) { throw Object.assign( @@ -20186,49 +20147,52 @@ const resolveBodyLength = async (headers, body) => { __webpack_require__.r(__webpack_exports__); /* harmony import */ var _cancel_CanceledError_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(221); /* harmony import */ var _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(185); +/* harmony import */ var _utils_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(179); + const composeSignals = (signals, timeout) => { - let controller = new AbortController(); + const {length} = (signals = signals ? signals.filter(Boolean) : []); - let aborted; + if (timeout || length) { + let controller = new AbortController(); - const onabort = function (cancel) { - if (!aborted) { - aborted = true; - unsubscribe(); - const err = cancel instanceof Error ? cancel : this.reason; - controller.abort(err instanceof _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_1__["default"] ? err : new _cancel_CanceledError_js__WEBPACK_IMPORTED_MODULE_0__["default"](err instanceof Error ? err.message : err)); - } - } + let aborted; - let timer = timeout && setTimeout(() => { - onabort(new _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_1__["default"](`timeout ${timeout} of ms exceeded`, _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_1__["default"].ETIMEDOUT)) - }, timeout) + const onabort = function (reason) { + if (!aborted) { + aborted = true; + unsubscribe(); + const err = reason instanceof Error ? reason : this.reason; + controller.abort(err instanceof _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_1__["default"] ? err : new _cancel_CanceledError_js__WEBPACK_IMPORTED_MODULE_0__["default"](err instanceof Error ? err.message : err)); + } + } - const unsubscribe = () => { - if (signals) { - timer && clearTimeout(timer); + let timer = timeout && setTimeout(() => { timer = null; - signals.forEach(signal => { - signal && - (signal.removeEventListener ? signal.removeEventListener('abort', onabort) : signal.unsubscribe(onabort)); - }); - signals = null; + onabort(new _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_1__["default"](`timeout ${timeout} of ms exceeded`, _core_AxiosError_js__WEBPACK_IMPORTED_MODULE_1__["default"].ETIMEDOUT)) + }, timeout) + + const unsubscribe = () => { + if (signals) { + timer && clearTimeout(timer); + timer = null; + signals.forEach(signal => { + signal.unsubscribe ? signal.unsubscribe(onabort) : signal.removeEventListener('abort', onabort); + }); + signals = null; + } } - } - signals.forEach((signal) => signal && signal.addEventListener && signal.addEventListener('abort', onabort)); + signals.forEach((signal) => signal.addEventListener('abort', onabort)); - const {signal} = controller; + const {signal} = controller; - signal.unsubscribe = unsubscribe; + signal.unsubscribe = () => _utils_js__WEBPACK_IMPORTED_MODULE_2__["default"].asap(unsubscribe); - return [signal, () => { - timer && clearTimeout(timer); - timer = null; - }]; + return signal; + } } /* harmony default export */ __webpack_exports__["default"] = (composeSignals); @@ -20262,14 +20226,34 @@ const streamChunk = function* (chunk, chunkSize) { } } -const readBytes = async function* (iterable, chunkSize, encode) { - for await (const chunk of iterable) { - yield* streamChunk(ArrayBuffer.isView(chunk) ? chunk : (await encode(String(chunk))), chunkSize); +const readBytes = async function* (iterable, chunkSize) { + for await (const chunk of readStream(iterable)) { + yield* streamChunk(chunk, chunkSize); } } -const trackStream = (stream, chunkSize, onProgress, onFinish, encode) => { - const iterator = readBytes(stream, chunkSize, encode); +const readStream = async function* (stream) { + if (stream[Symbol.asyncIterator]) { + yield* stream; + return; + } + + const reader = stream.getReader(); + try { + for (;;) { + const {done, value} = await reader.read(); + if (done) { + break; + } + yield value; + } + } finally { + await reader.cancel(); + } +} + +const trackStream = (stream, chunkSize, onProgress, onFinish) => { + const iterator = readBytes(stream, chunkSize); let bytes = 0; let done; @@ -20374,6 +20358,14 @@ validators.transitional = function transitional(validator, version, message) { }; }; +validators.spelling = function spelling(correctSpelling) { + return (value, opt) => { + // eslint-disable-next-line no-console + console.warn(`${opt} is likely a misspelling of ${correctSpelling}`); + return true; + } +}; + /** * Assert object's properties type * @@ -20524,6 +20516,20 @@ class CancelToken { } } + toAbortSignal() { + const controller = new AbortController(); + + const abort = (err) => { + controller.abort(err); + }; + + this.subscribe(abort); + + controller.signal.unsubscribe = () => this.unsubscribe(abort); + + return controller.signal; + } + /** * Returns an object that contains a new `CancelToken` and a function that, when called, * cancels the `CancelToken`. diff --git a/yarn.lock b/yarn.lock index 2d6e507325009..d9c708a7b7905 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8260,10 +8260,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.7.4, axios@^1.6.0, axios@^1.6.2, axios@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2" - integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw== +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== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0"