diff --git a/web/package.json b/web/package.json index 58d6b175c..1f8f9c4b4 100644 --- a/web/package.json +++ b/web/package.json @@ -101,7 +101,7 @@ "ajv": "^8.8.2", "anti-trojan-source": "^1.4.0", "aspen-decorations": "^1.0.2", - "axios": "^0.21.1", + "axios": "^1.4.0", "babelify": "~10.0.0", "bignumber.js": "^9.0.1", "bootstrap": "^4.3.1", diff --git a/web/regression/javascript/debugger/debugger_input_args_spec.js b/web/regression/javascript/debugger/debugger_input_args_spec.js index a1fe996fb..c0310ed1e 100644 --- a/web/regression/javascript/debugger/debugger_input_args_spec.js +++ b/web/regression/javascript/debugger/debugger_input_args_spec.js @@ -15,7 +15,7 @@ import '../helper/enzyme.helper'; import jasmineEnzyme from 'jasmine-enzyme'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import url_for from 'sources/url_for'; import pgAdmin from 'sources/pgadmin'; diff --git a/web/regression/javascript/debugger/debugger_spec.js b/web/regression/javascript/debugger/debugger_spec.js index 4249810f7..248886e6e 100644 --- a/web/regression/javascript/debugger/debugger_spec.js +++ b/web/regression/javascript/debugger/debugger_spec.js @@ -17,7 +17,7 @@ import React from 'react'; import { createMount } from '@material-ui/core/test-utils'; import jasmineEnzyme from 'jasmine-enzyme'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import url_for from 'sources/url_for'; import pgAdmin from 'sources/pgadmin'; diff --git a/web/regression/javascript/debugger/debugger_stack_spec.js b/web/regression/javascript/debugger/debugger_stack_spec.js index e6215a4a9..7f125e3fe 100644 --- a/web/regression/javascript/debugger/debugger_stack_spec.js +++ b/web/regression/javascript/debugger/debugger_stack_spec.js @@ -17,7 +17,7 @@ import React from 'react'; import { createMount } from '@material-ui/core/test-utils'; import jasmineEnzyme from 'jasmine-enzyme'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import url_for from 'sources/url_for'; import pgAdmin from 'sources/pgadmin'; diff --git a/web/regression/javascript/debugger/debugger_tool_bar_spec.js b/web/regression/javascript/debugger/debugger_tool_bar_spec.js index d2c8991c3..99eb4820d 100644 --- a/web/regression/javascript/debugger/debugger_tool_bar_spec.js +++ b/web/regression/javascript/debugger/debugger_tool_bar_spec.js @@ -17,7 +17,7 @@ import React from 'react'; import { createMount } from '@material-ui/core/test-utils'; import jasmineEnzyme from 'jasmine-enzyme'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import url_for from 'sources/url_for'; import pgAdmin from 'sources/pgadmin'; diff --git a/web/regression/javascript/erd/ui_components/ERDTool.spec.js b/web/regression/javascript/erd/ui_components/ERDTool.spec.js index 94be2ce63..b520b6e90 100644 --- a/web/regression/javascript/erd/ui_components/ERDTool.spec.js +++ b/web/regression/javascript/erd/ui_components/ERDTool.spec.js @@ -2,7 +2,7 @@ import React from 'react'; import {mount} from 'enzyme'; import '../../helper/enzyme.helper'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import ERDCore from 'pgadmin.tools.erd/erd_tool/ERDCore'; import * as erdModule from 'pgadmin.tools.erd/ERDModule'; diff --git a/web/regression/javascript/file_manager/FileManager.spec.js b/web/regression/javascript/file_manager/FileManager.spec.js index 73dc3f9fb..557ddbc23 100644 --- a/web/regression/javascript/file_manager/FileManager.spec.js +++ b/web/regression/javascript/file_manager/FileManager.spec.js @@ -14,7 +14,7 @@ import { createMount } from '@material-ui/core/test-utils'; import Theme from '../../../pgadmin/static/js/Theme'; import FileManager, { FileManagerUtils, getComparator } from '../../../pgadmin/misc/file_manager/static/js/components/FileManager'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import getApiInstance from '../../../pgadmin/static/js/api_instance'; import * as pgUtils from '../../../pgadmin/static/js/utils'; diff --git a/web/regression/javascript/processes/BgProcessManager.spec.js b/web/regression/javascript/processes/BgProcessManager.spec.js index 07bbeb5cd..d7bc6f1ce 100644 --- a/web/regression/javascript/processes/BgProcessManager.spec.js +++ b/web/regression/javascript/processes/BgProcessManager.spec.js @@ -1,5 +1,5 @@ import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import BgProcessManager, { BgProcessManagerProcessState } from '../../../pgadmin/misc/bgprocess/static/js/BgProcessManager'; import * as BgProcessNotify from '../../../pgadmin/misc/bgprocess/static/js/BgProcessNotify'; diff --git a/web/regression/javascript/processes/ProcessDetails.spec.js b/web/regression/javascript/processes/ProcessDetails.spec.js index d5ea35e5d..d665dd802 100644 --- a/web/regression/javascript/processes/ProcessDetails.spec.js +++ b/web/regression/javascript/processes/ProcessDetails.spec.js @@ -13,7 +13,7 @@ import '../helper/enzyme.helper'; import { createMount } from '@material-ui/core/test-utils'; import Theme from '../../../pgadmin/static/js/Theme'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import ProcessDetails from '../../../pgadmin/misc/bgprocess/static/js/ProcessDetails'; import BgProcessManager, { BgProcessManagerProcessState } from '../../../pgadmin/misc/bgprocess/static/js/BgProcessManager'; import pgAdmin from 'sources/pgadmin'; diff --git a/web/regression/javascript/schema_diff/schema_diff_spec.js b/web/regression/javascript/schema_diff/schema_diff_spec.js index 10330326e..6db49a717 100644 --- a/web/regression/javascript/schema_diff/schema_diff_spec.js +++ b/web/regression/javascript/schema_diff/schema_diff_spec.js @@ -17,7 +17,7 @@ import React from 'react'; import { createMount } from '@material-ui/core/test-utils'; import jasmineEnzyme from 'jasmine-enzyme'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import pgWindow from 'sources/window'; import url_for from 'sources/url_for'; diff --git a/web/regression/javascript/search_objects/SearchObject.spec.js b/web/regression/javascript/search_objects/SearchObject.spec.js index 7ca684829..f4711a91c 100644 --- a/web/regression/javascript/search_objects/SearchObject.spec.js +++ b/web/regression/javascript/search_objects/SearchObject.spec.js @@ -14,7 +14,7 @@ import '../helper/enzyme.helper'; import { createMount } from '@material-ui/core/test-utils'; import Theme from '../../../pgadmin/static/js/Theme'; import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import pgAdmin from 'sources/pgadmin'; import SearchObjects from '../../../pgadmin/tools/search_objects/static/js/SearchObjects'; import { TreeNode } from '../../../pgadmin/static/js/tree/tree_nodes'; diff --git a/web/regression/javascript/table/enable_disable_triggers_spec.js b/web/regression/javascript/table/enable_disable_triggers_spec.js index 593dfc9ef..da38d3fc9 100644 --- a/web/regression/javascript/table/enable_disable_triggers_spec.js +++ b/web/regression/javascript/table/enable_disable_triggers_spec.js @@ -8,7 +8,7 @@ ////////////////////////////////////////////////////////////// import MockAdapter from 'axios-mock-adapter'; -import axios from 'axios/index'; +import axios from 'axios'; import { enableTriggers, disableTriggers, diff --git a/web/yarn.lock b/web/yarn.lock index 293973c97..75b8c0726 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -3675,6 +3675,13 @@ __metadata: languageName: node linkType: hard +"asynckit@npm:^0.4.0": + version: 0.4.0 + resolution: "asynckit@npm:0.4.0" + checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be + languageName: node + linkType: hard + "attr-accept@npm:^2.2.2": version: 2.2.2 resolution: "attr-accept@npm:2.2.2" @@ -3719,12 +3726,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.21.1": - version: 0.21.4 - resolution: "axios@npm:0.21.4" +"axios@npm:^1.4.0": + version: 1.4.0 + resolution: "axios@npm:1.4.0" dependencies: - follow-redirects: ^1.14.0 - checksum: 44245f24ac971e7458f3120c92f9d66d1fc695e8b97019139de5b0cc65d9b8104647db01e5f46917728edfc0cfd88eb30fc4c55e6053eef4ace76768ce95ff3c + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 7fb6a4313bae7f45e89d62c70a800913c303df653f19eafec88e56cea2e3821066b8409bc68be1930ecca80e861c52aa787659df0ffec6ad4d451c7816b9386b languageName: node linkType: hard @@ -4849,6 +4858,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: ~1.0.0 + checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c + languageName: node + linkType: hard + "commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.8.1": version: 2.20.3 resolution: "commander@npm:2.20.3" @@ -5719,6 +5737,13 @@ __metadata: languageName: node linkType: hard +"delayed-stream@npm:~1.0.0": + version: 1.0.0 + resolution: "delayed-stream@npm:1.0.0" + checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020 + languageName: node + linkType: hard + "delegates@npm:^1.0.0": version: 1.0.0 resolution: "delegates@npm:1.0.0" @@ -6999,7 +7024,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: @@ -7028,6 +7053,17 @@ __metadata: languageName: node linkType: hard +"form-data@npm:^4.0.0": + version: 4.0.0 + resolution: "form-data@npm:4.0.0" + dependencies: + asynckit: ^0.4.0 + combined-stream: ^1.0.8 + mime-types: ^2.1.12 + checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c + languageName: node + linkType: hard + "fraction.js@npm:^4.2.0": version: 4.2.0 resolution: "fraction.js@npm:4.2.0" @@ -9914,7 +9950,7 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.1.27, 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.24, mime-types@npm:~2.1.34": version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: @@ -11944,6 +11980,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: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + "pseudomap@npm:^1.0.2": version: 1.0.2 resolution: "pseudomap@npm:1.0.2" @@ -13089,7 +13132,7 @@ __metadata: anti-trojan-source: ^1.4.0 aspen-decorations: ^1.0.2 autoprefixer: ^10.2.4 - axios: ^0.21.1 + axios: ^1.4.0 axios-mock-adapter: ^1.17.0 babel-loader: ^8.1.0 babelify: ~10.0.0