From a4ca53b2a699234f6f63de105aac4224ae4a9104 Mon Sep 17 00:00:00 2001 From: Valerii Sidorenko Date: Tue, 12 Mar 2024 10:49:23 +0100 Subject: [PATCH 1/2] fix: add absent deps, update axios --- package-lock.json | 121 +++++++++++++++--------------------------- package.json | 7 ++- tsconfig.package.json | 3 +- 3 files changed, 50 insertions(+), 81 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8957faa815..e23346e451 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "ydb-embedded-ui", "version": "5.2.1", "dependencies": { - "@gravity-ui/axios-wrapper": "^1.3.0", + "@gravity-ui/axios-wrapper": "^1.4.1", "@gravity-ui/chartkit": "^4.20.1", "@gravity-ui/components": "^2.12.0", "@gravity-ui/date-utils": "^1.4.2", @@ -19,7 +19,7 @@ "@gravity-ui/react-data-table": "^1.2.0", "@gravity-ui/uikit": "^5.30.1", "@reduxjs/toolkit": "^2.2.1", - "axios": "^0.21.2", + "axios": "^1.6.7", "bem-cn-lite": "^4.1.0", "copy-to-clipboard": "^3.3.3", "crc-32": "^1.2.2", @@ -40,6 +40,7 @@ "react-split": "^2.0.14", "redux": "^5.0.1", "redux-location-state": "^2.8.2", + "tslib": "^2.6.2", "url": "^0.11.0", "use-query-params": "^2.2.1", "web-vitals": "^1.1.2", @@ -72,6 +73,7 @@ "npm-run-all": "^4.1.5", "postcss": "^8.4.6", "prettier": "^2.5.1", + "prop-types": "^15.8.1", "react": "^17.0.2", "react-app-rewired": "^2.1.11", "react-dom": "^17.0.2", @@ -82,6 +84,7 @@ "typescript": "^4.5.5" }, "peerDependencies": { + "prop-types": "^15.8.1", "react": "^17.0.2", "react-dom": "^17.0.2" } @@ -2945,12 +2948,6 @@ "cosmiconfig": ">=6" } }, - "node_modules/@endemolshinegroup/cosmiconfig-typescript-loader/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -3066,11 +3063,11 @@ "dev": true }, "node_modules/@gravity-ui/axios-wrapper": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@gravity-ui/axios-wrapper/-/axios-wrapper-1.3.0.tgz", - "integrity": "sha512-5hR8aGLfRG1hyxFG4CxANSdX//Z6ADzs+mFj9M0sbf0NYynVAid7G3+/44234B/g5GK7jxrycLPMvlQ/sIlWRw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@gravity-ui/axios-wrapper/-/axios-wrapper-1.4.1.tgz", + "integrity": "sha512-SbWoFtobG0WbodgWR9mTaUhfjWIEjHvx9NJpMFYV4cqEQug0Mr9yTKYOTUhEPRF27z5NxmbMZR+Dj99+8BNAUg==", "peerDependencies": { - "axios": "^0.21.2", + "axios": "^1.3.4", "lodash": "^4.17.11" } }, @@ -3418,11 +3415,6 @@ "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0" } }, - "node_modules/@gravity-ui/navigation/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" - }, "node_modules/@gravity-ui/paranoid": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@gravity-ui/paranoid/-/paranoid-1.4.0.tgz", @@ -3524,11 +3516,6 @@ "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0" } }, - "node_modules/@gravity-ui/uikit/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" - }, "node_modules/@gravity-ui/yagr": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/@gravity-ui/yagr/-/yagr-4.2.3.tgz", @@ -6698,8 +6685,7 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "devOptional": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "node_modules/at-least-node": { "version": "1.0.0", @@ -6792,11 +6778,26 @@ } }, "node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dependencies": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.15.4", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" } }, "node_modules/axobject-query": { @@ -7373,12 +7374,6 @@ "tslib": "^2.0.3" } }, - "node_modules/camel-case/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -7911,7 +7906,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "devOptional": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -9333,7 +9327,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "devOptional": true, "engines": { "node": ">=0.4.0" } @@ -9632,12 +9625,6 @@ "tslib": "^2.0.3" } }, - "node_modules/dot-case/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", @@ -16727,12 +16714,6 @@ "tslib": "^2.0.3" } }, - "node_modules/lower-case/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -16993,7 +16974,6 @@ "version": "1.51.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", - "devOptional": true, "engines": { "node": ">= 0.6" } @@ -17002,7 +16982,6 @@ "version": "2.1.34", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", - "devOptional": true, "dependencies": { "mime-db": "1.51.0" }, @@ -17264,12 +17243,6 @@ "tslib": "^2.0.3" } }, - "node_modules/no-case/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -17962,12 +17935,6 @@ "tslib": "^2.0.3" } }, - "node_modules/param-case/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -18023,12 +17990,6 @@ "tslib": "^2.0.3" } }, - "node_modules/pascal-case/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -19733,6 +19694,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -22058,12 +22024,6 @@ "tslib": "^2.1.0" } }, - "node_modules/rxjs/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, "node_modules/safe-array-concat": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", @@ -24101,10 +24061,9 @@ } }, "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -24121,6 +24080,12 @@ "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", diff --git a/package.json b/package.json index 05fb6d5daf..94c4d4f67f 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "url": "git@github.com:ydb-platform/ydb-embedded-ui.git" }, "dependencies": { - "@gravity-ui/axios-wrapper": "^1.3.0", + "@gravity-ui/axios-wrapper": "^1.4.1", "@gravity-ui/chartkit": "^4.20.1", "@gravity-ui/components": "^2.12.0", "@gravity-ui/date-utils": "^1.4.2", @@ -21,7 +21,7 @@ "@gravity-ui/react-data-table": "^1.2.0", "@gravity-ui/uikit": "^5.30.1", "@reduxjs/toolkit": "^2.2.1", - "axios": "^0.21.2", + "axios": "^1.6.7", "bem-cn-lite": "^4.1.0", "copy-to-clipboard": "^3.3.3", "crc-32": "^1.2.2", @@ -42,6 +42,7 @@ "react-split": "^2.0.14", "redux": "^5.0.1", "redux-location-state": "^2.8.2", + "tslib": "^2.6.2", "url": "^0.11.0", "use-query-params": "^2.2.1", "web-vitals": "^1.1.2", @@ -140,6 +141,7 @@ "npm-run-all": "^4.1.5", "postcss": "^8.4.6", "prettier": "^2.5.1", + "prop-types": "^15.8.1", "react": "^17.0.2", "react-app-rewired": "^2.1.11", "react-dom": "^17.0.2", @@ -150,6 +152,7 @@ "typescript": "^4.5.5" }, "peerDependencies": { + "prop-types": "^15.8.1", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/tsconfig.package.json b/tsconfig.package.json index f0dcf74cb3..850a68967d 100644 --- a/tsconfig.package.json +++ b/tsconfig.package.json @@ -3,7 +3,8 @@ "compilerOptions": { "outDir": "dist", "declaration": true, - "noEmit": false + "noEmit": false, + "importHelpers": true }, "exclude": ["src/setup*", "src/index.tsx", "**/__tests__", "**/tests"] } From 2c5d77aab54a468ac670c195f7b2ed9acac61de2 Mon Sep 17 00:00:00 2001 From: Valerii Sidorenko Date: Tue, 12 Mar 2024 11:13:13 +0100 Subject: [PATCH 2/2] fix: tests --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 94c4d4f67f..31d1f42e5a 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,8 @@ ], "testEnvironment": "jsdom", "moduleNameMapper": { - "\\.(css|less|scss|sass)$": "jest-transform-css" + "\\.(css|less|scss|sass)$": "jest-transform-css", + "^axios$": "axios/dist/node/axios.cjs" } }, "browserslist": {