Skip to content

Commit

Permalink
Merge branch 'master' into UIU-2936
Browse files Browse the repository at this point in the history
  • Loading branch information
@alisher-epam
alisher-epam authored Sep 12, 2023
2 parents 105716d + 6009fd7 commit defaa88
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 82 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
* User can't pay the fee/fine. Refs UIU-2930.
* Sort proxies and sponsors by user display name. Refs UIU-2799.
* Add dropdown to specify user type: Patron or Staff. Refs UIU-2936.
* *BREAKING* bump `react-intl` to `v6.4.4`. Refs UIU-2946.

## [9.0.0](https://github.com/folio-org/ui-users/tree/v9.0.0) (2023-02-20)
[Full Changelog](https://github.com/folio-org/ui-users/compare/v8.1.0...v9.0.0)
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@
"@folio/jest-config-stripes": "^2.0.0",
"@folio/stripes": "^9.0.0",
"@folio/stripes-cli": "^3.0.0",
"@formatjs/cli": "^6.0.4",
"@formatjs/cli": "^6.1.3",
"core-js": "^3.6.4",
"eslint": "^7.32.0",
"eslint-import-resolver-alias": "^1.1.2",
Expand All @@ -1045,7 +1045,7 @@
"moment": "^2.24.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intl": "^5.8.0",
"react-intl": "^6.4.4",
"react-query": "^3.39.0",
"react-redux": "^8.0.5",
"react-router": "^5",
Expand Down Expand Up @@ -1073,7 +1073,7 @@
"moment": "^2.24.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intl": "^5.8.0",
"react-intl": "^6.4.4",
"react-query": "^3.39.0",
"react-redux": "^8.0.5",
"react-router": "^5.2.0",
Expand Down
163 changes: 84 additions & 79 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1460,9 +1460,9 @@
prop-types "^15.6.0"

"@folio/stripes-cli@^3.0.0":
version "3.0.100000328"
resolved "https://repository.folio.org/repository/npm-folioci/@folio/stripes-cli/-/stripes-cli-3.0.100000328.tgz#b17707aa7e50cefa367abb0be64412e52f088d10"
integrity sha512-ftttz9vXg/6QrJa62A4dt9SAa2UDHyCc4tvYkJFlW7hcwMkUGiNbh7BYxZrl4KjDlgqDHFjM33yt3PpKjsST3A==
version "3.0.100000331"
resolved "https://repository.folio.org/repository/npm-folioci/@folio/stripes-cli/-/stripes-cli-3.0.100000331.tgz#431c100b6e02f442a868fe8d32b3532f6f5e9f48"
integrity sha512-548VFke6Z5gW6WrVTGhkvxOFC/4E1S1b9ubOzw+LUq0+e2qbw0FamOKSKWBocBtwXWN8vvw4RPqu4ldCcen0BA==
dependencies:
"@folio/stripes-testing" "^3.0.0"
"@folio/stripes-webpack" "^5.0.0"
Expand Down Expand Up @@ -1765,80 +1765,80 @@
"@folio/stripes-util" "~6.0.0"
redux "^4.2.1"

"@formatjs/cli@^6.0.4":
"@formatjs/cli@^6.1.3":
version "6.1.3"
resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-6.1.3.tgz#b4b95259398e222ec6c06cf5f23f76d987f53e96"
integrity sha512-PdTXZTY8LqxwmvFqdifn89gjXnPUpGtGyFs0BnoeLuOuxZFSnBfIs5WQCVMaJnr1+0vNNlXyT0VAIAwjRpf6BA==

"@formatjs/ecma402-abstract@1.11.4":
version "1.11.4"
resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz#b962dfc4ae84361f9f08fbce411b4e4340930eda"
integrity sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==
"@formatjs/ecma402-abstract@1.17.0":
version "1.17.0"
resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.17.0.tgz#2ce191a3bde4c65c6684e03fa247062a4a294b9e"
integrity sha512-6ueQTeJZtwKjmh23bdkq/DMqH4l4bmfvtQH98blOSbiXv/OUiyijSW6jU22IT8BNM1ujCaEvJfTtyCYVH38EMQ==
dependencies:
"@formatjs/intl-localematcher" "0.2.25"
tslib "^2.1.0"
"@formatjs/intl-localematcher" "0.4.0"
tslib "^2.4.0"

"@formatjs/fast-memoize@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz#e6f5aee2e4fd0ca5edba6eba7668e2d855e0fc21"
integrity sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==
"@formatjs/fast-memoize@2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b"
integrity sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==
dependencies:
tslib "^2.1.0"
tslib "^2.4.0"

"@formatjs/icu-messageformat-parser@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz#a54293dd7f098d6a6f6a084ab08b6d54a3e8c12d"
integrity sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==
"@formatjs/icu-messageformat-parser@2.6.0":
version "2.6.0"
resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.6.0.tgz#b0d58ce8c8f472969c96b5cd0b3ad5522d3a02b7"
integrity sha512-yT6at0qc0DANw9qM/TU8RZaCtfDXtj4pZM/IC2WnVU80yAcliS3KVDiuUt4jSQAeFL9JS5bc2hARnFmjPdA6qw==
dependencies:
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/icu-skeleton-parser" "1.3.6"
tslib "^2.1.0"
"@formatjs/ecma402-abstract" "1.17.0"
"@formatjs/icu-skeleton-parser" "1.6.0"
tslib "^2.4.0"

"@formatjs/icu-skeleton-parser@1.3.6":
version "1.3.6"
resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz#4ce8c0737d6f07b735288177049e97acbf2e8964"
integrity sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==
"@formatjs/icu-skeleton-parser@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.6.0.tgz#0728be8b6b3656f1a4b8e6e5b0e02dffffc23c6c"
integrity sha512-eMmxNpoX/J1IPUjPGSZwo0Wh+7CEvdEMddP2Jxg1gQJXfGfht/FdW2D5XDFj3VMbOTUQlDIdZJY7uC6O6gjPoA==
dependencies:
"@formatjs/ecma402-abstract" "1.11.4"
tslib "^2.1.0"
"@formatjs/ecma402-abstract" "1.17.0"
tslib "^2.4.0"

"@formatjs/intl-displaynames@5.4.3":
version "5.4.3"
resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-5.4.3.tgz#e468586694350c722c7efab1a31fcde68aeaed8b"
integrity sha512-4r12A3mS5dp5hnSaQCWBuBNfi9Amgx2dzhU4lTFfhSxgb5DOAiAbMpg6+7gpWZgl4ahsj3l2r/iHIjdmdXOE2Q==
"@formatjs/intl-displaynames@6.5.0":
version "6.5.0"
resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.5.0.tgz#32737088e7d943fb3e22140e64bb634e0ba05fcf"
integrity sha512-sg/nR8ILEdUl+2sWu6jc1nQ5s04yucGlH1RVfatW8TSJ5uG3Yy3vgigi8NNC/BuhcncUNPWqSpTCSI1hA+rhiw==
dependencies:
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/intl-localematcher" "0.2.25"
tslib "^2.1.0"
"@formatjs/ecma402-abstract" "1.17.0"
"@formatjs/intl-localematcher" "0.4.0"
tslib "^2.4.0"

"@formatjs/intl-listformat@6.5.3":
version "6.5.3"
resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-6.5.3.tgz#f29da613a8062dc3e4e3d847ba890c3ea745f051"
integrity sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==
"@formatjs/intl-listformat@7.4.0":
version "7.4.0"
resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.4.0.tgz#fa8ac535d82fc716f052f2fd60eeaa7331362357"
integrity sha512-ifupb+balZUAF/Oh3QyGRqPRWGSKwWoMPR0cYZEG7r61SimD+m38oFQqVx/3Fp7LfQFF11m7IS+MlxOo2sKINA==
dependencies:
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/intl-localematcher" "0.2.25"
tslib "^2.1.0"
"@formatjs/ecma402-abstract" "1.17.0"
"@formatjs/intl-localematcher" "0.4.0"
tslib "^2.4.0"

"@formatjs/intl-localematcher@0.2.25":
version "0.2.25"
resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz#60892fe1b271ec35ba07a2eb018a2dd7bca6ea3a"
integrity sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==
"@formatjs/intl-localematcher@0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.4.0.tgz#63bbc37a7c3545a1bf1686072e51d9a3aed98d6b"
integrity sha512-bRTd+rKomvfdS4QDlVJ6TA/Jx1F2h/TBVO5LjvhQ7QPPHp19oPNMIum7W2CMEReq/zPxpmCeB31F9+5gl/qtvw==
dependencies:
tslib "^2.1.0"
tslib "^2.4.0"

"@formatjs/intl@2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.2.1.tgz#6daf4dabed055b17f467f0aa1bc073a626bc9189"
integrity sha512-vgvyUOOrzqVaOFYzTf2d3+ToSkH2JpR7x/4U1RyoHQLmvEaTQvXJ7A2qm1Iy3brGNXC/+/7bUlc3lpH+h/LOJA==
dependencies:
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/fast-memoize" "1.2.1"
"@formatjs/icu-messageformat-parser" "2.1.0"
"@formatjs/intl-displaynames" "5.4.3"
"@formatjs/intl-listformat" "6.5.3"
intl-messageformat "9.13.0"
tslib "^2.1.0"
"@formatjs/intl@2.9.0":
version "2.9.0"
resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.9.0.tgz#e1335572af3ca8a53e136a78e866f1851a9718c2"
integrity sha512-Ym0trUoC/VO6wQu4YHa0H1VR2tEixFRmwZgADkDLm7nD+vv1Ob+/88mUAoT0pwvirFqYKgUKEwp1tFepqyqvVA==
dependencies:
"@formatjs/ecma402-abstract" "1.17.0"
"@formatjs/fast-memoize" "2.2.0"
"@formatjs/icu-messageformat-parser" "2.6.0"
"@formatjs/intl-displaynames" "6.5.0"
"@formatjs/intl-listformat" "7.4.0"
intl-messageformat "10.5.0"
tslib "^2.4.0"

"@graphql-typed-document-node/core@^3.1.1":
version "3.2.0"
Expand Down Expand Up @@ -6729,15 +6729,15 @@ interpret@^1.4.0:
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==

intl-messageformat@9.13.0:
version "9.13.0"
resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.13.0.tgz#97360b73bd82212e4f6005c712a4a16053165468"
integrity sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==
intl-messageformat@10.5.0:
version "10.5.0"
resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.0.tgz#86d11b15913ac954075b25253f5e669359f89538"
integrity sha512-AvojYuOaRb6r2veOKfTVpxH9TrmjSdc5iR9R5RgBwrDZYSmAAFVT+QLbW3C4V7Qsg0OguMp67Q/EoUkxZzXRGw==
dependencies:
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/fast-memoize" "1.2.1"
"@formatjs/icu-messageformat-parser" "2.1.0"
tslib "^2.1.0"
"@formatjs/ecma402-abstract" "1.17.0"
"@formatjs/fast-memoize" "2.2.0"
"@formatjs/icu-messageformat-parser" "2.6.0"
tslib "^2.4.0"

invariant@^2.2.4:
version "2.2.4"
Expand Down Expand Up @@ -9167,7 +9167,7 @@ postcss-calc@^9.0.1:
postcss-selector-parser "^6.0.11"
postcss-value-parser "^4.2.0"

"postcss-color-function@github:folio-org/postcss-color-function":
postcss-color-function@folio-org/postcss-color-function:
version "4.1.0"
resolved "https://codeload.github.com/folio-org/postcss-color-function/tar.gz/c128aad740ae740fb571c4b6493f467dd51efe85"
dependencies:
Expand Down Expand Up @@ -9662,21 +9662,21 @@ react-highlight-words@^0.20.0:
memoize-one "^4.0.0"
prop-types "^15.5.8"

react-intl@^5.8.0:
version "5.25.1"
resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.25.1.tgz#68a73aefc485c9bf70062381ae7f6f4791680879"
integrity sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==
react-intl@^6.4.4:
version "6.4.4"
resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.4.4.tgz#14b45ce046bfbb60c0e6d392d8ddc30e9ead5a4f"
integrity sha512-/C9Sl/5//ohfkNG6AWlJuf4BhTXsbzyk93K62A4zRhSPANyOGpKZ+fWhN+TLfFd5YjDUHy+exU/09y0w1bO4Xw==
dependencies:
"@formatjs/ecma402-abstract" "1.11.4"
"@formatjs/icu-messageformat-parser" "2.1.0"
"@formatjs/intl" "2.2.1"
"@formatjs/intl-displaynames" "5.4.3"
"@formatjs/intl-listformat" "6.5.3"
"@formatjs/ecma402-abstract" "1.17.0"
"@formatjs/icu-messageformat-parser" "2.6.0"
"@formatjs/intl" "2.9.0"
"@formatjs/intl-displaynames" "6.5.0"
"@formatjs/intl-listformat" "7.4.0"
"@types/hoist-non-react-statics" "^3.3.1"
"@types/react" "16 || 17 || 18"
hoist-non-react-statics "^3.3.2"
intl-messageformat "9.13.0"
tslib "^2.1.0"
intl-messageformat "10.5.0"
tslib "^2.4.0"

react-is@^16.13.1, react-is@^16.3.2, react-is@^16.4.2, react-is@^16.6.0, react-is@^16.7.0:
version "16.13.1"
Expand Down Expand Up @@ -11190,6 +11190,11 @@ tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==

tslib@^2.4.0:
version "2.6.2"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

tsutils@^3.21.0:
version "3.21.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
Expand Down

0 comments on commit defaa88

Please sign in to comment.