From 9291e9a50fcc17603dcf9b14ec8d6eb90c079a0b Mon Sep 17 00:00:00 2001 From: cbrianbet Date: Wed, 2 Oct 2024 18:16:27 +0300 Subject: [PATCH 1/2] updated packages --- package.json | 2 +- src/utils/axiosHeaders.js | 2 +- yarn.lock | 37 +++++++++++++++++++++++++++++-------- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 68912d53..eb23e5d7 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", - "axios": "^0.21.2", + "axios": "1.6.0", "bootstrap": "^4.4.1", "chart.js": "^3.7.1", "dotenv": "^16.0.1", diff --git a/src/utils/axiosHeaders.js b/src/utils/axiosHeaders.js index f311a767..7d723771 100644 --- a/src/utils/axiosHeaders.js +++ b/src/utils/axiosHeaders.js @@ -1,4 +1,4 @@ -import * as axios from 'axios'; +import axios from 'axios'; export function setAuthHeader(token) { axios.defaults.headers.common['Authorization'] = token ? 'Bearer ' + token : ''; diff --git a/yarn.lock b/yarn.lock index 386c25a0..c22333fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3234,12 +3234,14 @@ axe-core@^4.0.2: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.0.tgz#6594db4ee62f78be79e32a7295d21b099b60668d" integrity sha512-1uIESzroqpaTzt9uX48HO+6gfnKu3RwvWdCcWSrX4csMInJfCo1yvKPNXCwXFRpJqRW25tiASb6No0YH57PXqg== -axios@^0.21.2: - version "0.21.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.2.tgz#21297d5084b2aeeb422f5d38e7be4fbb82239017" - integrity sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg== +axios@1.6.0: + version "1.6.0" + resolved "https://registry.npmmirror.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102" + integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg== dependencies: - follow-redirects "^1.14.0" + 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" @@ -4209,9 +4211,9 @@ colors@0.6.2: resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" integrity sha512-OsSVtHK8Ir8r3+Fxw/b4jS1ZLPXkV6ZxDRJQzeD7qo0SqMXWrHDM71DgYzPMHY8SFJ0Ao+nNU2p1MmwdzKqPrw== -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== dependencies: delayed-stream "~1.0.0" @@ -6131,11 +6133,16 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0, follow-redirects@^1.14.0: +follow-redirects@^1.0.0: version "1.14.7" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== +follow-redirects@^1.15.0: + version "1.15.9" + resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== + font-awesome@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" @@ -6171,6 +6178,15 @@ fork-ts-checker-webpack-plugin@4.1.6: tapable "^1.0.0" worker-rpc "^0.1.0" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.npmmirror.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" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -10569,6 +10585,11 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" From 36f662306d6775a821284676fbae7f0ad30db08c Mon Sep 17 00:00:00 2001 From: cbrianbet Date: Thu, 3 Oct 2024 15:20:11 +0300 Subject: [PATCH 2/2] updated packages --- package.json | 14 ++++----- yarn.lock | 84 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index eb23e5d7..36f46296 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "axios": "1.6.0", "bootstrap": "^4.4.1", "chart.js": "^3.7.1", - "dotenv": "^16.0.1", + "dotenv": "^16.4.5", "env-cmd": "^10.1.0", "font-awesome": "^4.7.0", "highcharts": "^8.2.2", @@ -28,10 +28,10 @@ "moment": "^2.29.0", "mui-datatables": "^4.3.0", "oidc-client": "^1.10.1", - "powerbi-client": "^2.22.2", - "powerbi-client-react": "^1.3.5", - "proj4": "^2.6.3", - "prop-types": "^15.7.2", + "powerbi-client": "^2.23.1", + "powerbi-client-react": "^1.4.0", + "proj4": "^2.12.1", + "prop-types": "^15.8.1", "react": "^16.12.0", "react-chartjs-2": "^4.0.1", "react-cookie": "^4.1.1", @@ -41,9 +41,9 @@ "react-datepicker": "^3.8.0", "react-dom": "^16.12.0", "react-export-excel": "^0.5.3", - "react-ga": "^3.3.0", + "react-ga": "^3.3.1", "react-loadable": "^5.5.0", - "react-query": "^3.9.8", + "react-query": "^3.39.3", "react-redux": "^8.0.2", "react-router-dom": "^5.1.2", "react-scripts": "^4.0.3", diff --git a/yarn.lock b/yarn.lock index c22333fa..a1f8f292 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5205,10 +5205,10 @@ dotenv@8.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== -dotenv@^16.0.1: - version "16.0.1" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d" - integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ== +dotenv@^16.4.5: + version "16.4.5" + resolved "https://registry.npmmirror.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" + integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== duplexer@^0.1.1: version "0.1.2" @@ -8074,7 +8074,7 @@ js-sha3@0.8.0: "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^3.13.1: @@ -8491,7 +8491,7 @@ loglevel@^1.6.8: loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.npmmirror.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== dependencies: js-tokens "^3.0.0 || ^4.0.0" @@ -9161,8 +9161,8 @@ oauth-sign@~0.9.0: object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + resolved "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-copy@^0.1.0: version "0.1.0" @@ -10397,15 +10397,15 @@ postcss@^8.1.0: nanoid "^3.1.22" source-map "^0.6.1" -powerbi-client-react@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/powerbi-client-react/-/powerbi-client-react-1.3.5.tgz#652f5077505a73c1524a7a9c5e75e2131b47e566" - integrity sha512-YqLpkus9UD6YxRe3W+Kcnao6lRv/Do2XZilx4UWRWlXS+roQ3QI6Dm8KsxUpvMYo636x4mzAjj3FOymQwoLi4w== +powerbi-client-react@^1.4.0: + version "1.4.0" + resolved "https://registry.npmmirror.com/powerbi-client-react/-/powerbi-client-react-1.4.0.tgz#23a47735c9ca7ccfc306ed8649984972a5d73860" + integrity sha512-AfS96lP+emEc4drguCUqLG0s4cFa15OM9eqDaP1sJZ+ca0V+FdvFeI1bD6EyC3smPlpRcl862uSzYexVeUxdIQ== dependencies: lodash.isequal "^4.5.0" powerbi-client "^2.21.1" -powerbi-client@^2.21.1, powerbi-client@^2.22.2: +powerbi-client@^2.21.1: version "2.22.2" resolved "https://registry.yarnpkg.com/powerbi-client/-/powerbi-client-2.22.2.tgz#fd0a6b5aa4bb86c9420cb543b05e2c6ad5ed09ef" integrity sha512-NPVdTzaxOPgY9wfPPi8nvAcbHI3qyRkv82NCPO+AdpnoMglC0yONoEcb+x0a0Qf/XcsutXBbLwS+fgKGHFEOxw== @@ -10415,11 +10415,26 @@ powerbi-client@^2.21.1, powerbi-client@^2.22.2: powerbi-router "^0.1" window-post-message-proxy "^0.2" +powerbi-client@^2.23.1: + version "2.23.1" + resolved "https://registry.npmmirror.com/powerbi-client/-/powerbi-client-2.23.1.tgz#8e19177907522b5f122b1c82b0f0baca6ac98fae" + integrity sha512-r04gDDq8YkrkZjSwOw4UBgzPwudXnA+x8B9ekVE7XDlhTDC7tujbcT15Z+iLDrx+49Bj4qVez0PgjA9CgEFpGw== + dependencies: + http-post-message "^0.2" + powerbi-models "^1.14.0" + powerbi-router "^0.1" + window-post-message-proxy "^0.2.7" + powerbi-models@^1.12.3: version "1.12.6" resolved "https://registry.yarnpkg.com/powerbi-models/-/powerbi-models-1.12.6.tgz#941d91e0fb14b767d21e60ed45728d7640d03827" integrity sha512-S+cDAPAtUl2YJLtT250MFR8cRG/mOsTzmL3CUemM/kV9t+QoGnAmkvrhp43tfQ0vjac3FFku6didEL+Ce6rDDg== +powerbi-models@^1.14.0: + version "1.15.2" + resolved "https://registry.npmmirror.com/powerbi-models/-/powerbi-models-1.15.2.tgz#94ae7b1537e7bc21b08c50ed63e04591129c3590" + integrity sha512-UcBLtBB2wa8pL412DxyVZvv/bKiUVJfLTCXAuGmIqnOkoA/EnYDUM3B8oS2piN1azyEN8pjN353rE9DeARCJtA== + powerbi-router@^0.1: version "0.1.5" resolved "https://registry.yarnpkg.com/powerbi-router/-/powerbi-router-0.1.5.tgz#dd2d2d0474f8cb76690a85f6a51d8ca9fea93a32" @@ -10516,13 +10531,13 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -proj4@^2.6.3: - version "2.7.2" - resolved "https://registry.yarnpkg.com/proj4/-/proj4-2.7.2.tgz#faa42e5965aa275af5438ba2da8c59d1cc501137" - integrity sha512-x/EboBmIq48a9FED0Z9zWCXkd8VIpXHLsyEXljGtsnzeztC41bFjPjJ0S//wBbNLDnDYRe0e6c3FSSiqMCebDA== +proj4@^2.12.1: + version "2.12.1" + resolved "https://registry.npmmirror.com/proj4/-/proj4-2.12.1.tgz#1a5422a9273cbf17df8e2e9af91aced63bebded7" + integrity sha512-vmhP3hmstjXjzFwg8QXJwpoj4n7GVrXk3ZW3DzNK/Ur4cuwXq7ZiMXaWYvLYLQbX8n4MXgbwTr4lthOUZltBpA== dependencies: mgrs "1.0.0" - wkt-parser "^1.2.4" + wkt-parser "^1.3.3" promise-inflight@^1.0.1: version "1.0.1" @@ -10563,7 +10578,7 @@ prop-types@^15.5.0, prop-types@^15.5.8, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.5.9, prop-types@^15.8.1: version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + resolved "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" @@ -10895,10 +10910,10 @@ react-export-excel@^0.5.3: file-saver "1.3.8" xlsx "git+https://github.com/securedeveloper/js-xlsx.git" -react-ga@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-3.3.0.tgz#c91f407198adcb3b49e2bc5c12b3fe460039b3ca" - integrity sha512-o8RScHj6Lb8cwy3GMrVH6NJvL+y0zpJvKtc0+wmH7Bt23rszJmnqEQxRbyrqUzk9DTJIHoP42bfO5rswC9SWBQ== +react-ga@^3.3.1: + version "3.3.1" + resolved "https://registry.npmmirror.com/react-ga/-/react-ga-3.3.1.tgz#d8e1f4e05ec55ed6ff944dcb14b99011dfaf9504" + integrity sha512-4Vc0W5EvXAXUN/wWyxvsAKDLLgtJ3oLmhYYssx+YzphJpejtOst6cbIHCIyF50Fdxuf5DDKqRYny24yJ2y7GFQ== react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: version "16.13.1" @@ -10958,10 +10973,10 @@ react-popper@^1.3.6, react-popper@^1.3.7, react-popper@^1.3.8: typed-styles "^0.0.7" warning "^4.0.2" -react-query@^3.9.8: - version "3.16.0" - resolved "https://registry.yarnpkg.com/react-query/-/react-query-3.16.0.tgz#8de1556aabb3d200d0f8eeb74ce2b0b3dd0a0a51" - integrity sha512-YOvI8mO9WG+r4XsyJinjlDMiV5IewUWUcTv2J7z6bIP3KOFvgT6k6HM8vQouz4hPnme7Ktq9j5e7LarUqgJXFQ== +react-query@^3.39.3: + version "3.39.3" + resolved "https://registry.npmmirror.com/react-query/-/react-query-3.39.3.tgz#4cea7127c6c26bdea2de5fb63e51044330b03f35" + integrity sha512-nLfLz7GiohKTJDuT4us4X3h/8unOh+00MLb2yJoGTPjxKs2bc1iDhkNx2bd5MKklXnOD3NrVZ+J2UXujA5In4g== dependencies: "@babel/runtime" "^7.5.5" broadcast-channel "^3.4.1" @@ -13584,10 +13599,17 @@ window-post-message-proxy@^0.2: dependencies: es6-promise "^3.1.2" -wkt-parser@^1.2.4: - version "1.3.2" - resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.3.2.tgz#deeff04a21edc5b170a60da418e9ed1d1ab0e219" - integrity sha512-A26BOOo7sHAagyxG7iuRhnKMO7Q3mEOiOT4oGUmohtN/Li5wameeU4S6f8vWw6NADTVKljBs8bzA8JPQgSEMVQ== +window-post-message-proxy@^0.2.7: + version "0.2.9" + resolved "https://registry.npmmirror.com/window-post-message-proxy/-/window-post-message-proxy-0.2.9.tgz#53a4d1749995920bc7c54fb0dff7c8feed205cb5" + integrity sha512-hHmF5dvY27wy4EKN9c5qukPtzlbrdUzkMiCHud4gYKXCFAiGOBhCfi/dVBvwbUf0qrEGwFNnqkvk6DE54sdlcw== + dependencies: + es6-promise "^3.1.2" + +wkt-parser@^1.3.3: + version "1.3.3" + resolved "https://registry.npmmirror.com/wkt-parser/-/wkt-parser-1.3.3.tgz#46b4e3032dd9c86907f7e630b57e3c6ea2bb772b" + integrity sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw== word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3"