diff --git a/package.json b/package.json index b88310817d..248aee0315 100644 --- a/package.json +++ b/package.json @@ -39,15 +39,15 @@ "cozy-device-helper": "2.7.0", "cozy-doctypes": "1.83.8", "cozy-flags": "3.0.1", - "cozy-harvest-lib": "^14.2.1", + "cozy-harvest-lib": "^15.0.0", "cozy-intent": "^2.3.0", - "cozy-keys-lib": "^4.3.0", + "cozy-keys-lib": "^5.0.0", "cozy-logger": "1.10.0", "cozy-realtime": "4.2.9", "cozy-sharing": "7.1.0", "cozy-stack-client": "^36.2.0", "cozy-tsconfig": "1.2.0", - "cozy-ui": "^86.2.0", + "cozy-ui": "^88.1.1", "date-fns": "2.28.0", "es-abstract": "1.20.2", "form-data": "2.5.1", diff --git a/src/components/AddButton/ActionsBottomSheet.jsx b/src/components/AddButton/ActionsBottomSheet.jsx index 5c969c6a1f..26922bb6e8 100644 --- a/src/components/AddButton/ActionsBottomSheet.jsx +++ b/src/components/AddButton/ActionsBottomSheet.jsx @@ -5,11 +5,11 @@ import { useI18n } from 'cozy-ui/transpiled/react/I18n' import BottomSheet, { BottomSheetItem } from 'cozy-ui/transpiled/react/BottomSheet' -import List from 'cozy-ui/transpiled/react/MuiCozyTheme/List' -import ListItem from 'cozy-ui/transpiled/react/MuiCozyTheme/ListItem' -import ListItemIcon from 'cozy-ui/transpiled/react/MuiCozyTheme/ListItemIcon' +import List from 'cozy-ui/transpiled/react/List' +import ListItem from 'cozy-ui/transpiled/react/ListItem' +import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon' import ListItemText from 'cozy-ui/transpiled/react/ListItemText' -import Divider from 'cozy-ui/transpiled/react/MuiCozyTheme/Divider' +import Divider from 'cozy-ui/transpiled/react/Divider' import Icon from 'cozy-ui/transpiled/react/Icon' import Typography from 'cozy-ui/transpiled/react/Typography' diff --git a/src/components/Applications.jsx b/src/components/Applications.jsx index 39ae377140..5e29df6712 100644 --- a/src/components/Applications.jsx +++ b/src/components/Applications.jsx @@ -3,7 +3,7 @@ import memoize from 'lodash/memoize' import { useQuery } from 'cozy-client' import flag from 'cozy-flags' -import Divider from 'cozy-ui/transpiled/react/MuiCozyTheme/Divider' +import Divider from 'cozy-ui/transpiled/react/Divider' import { useI18n } from 'cozy-ui/transpiled/react' import AppTile from 'components/AppTile' diff --git a/src/components/Banners/UpdateMessage.jsx b/src/components/Banners/UpdateMessage.jsx index e33ed6ae8d..2a1d6b0362 100644 --- a/src/components/Banners/UpdateMessage.jsx +++ b/src/components/Banners/UpdateMessage.jsx @@ -2,8 +2,8 @@ import React, { useState, useCallback } from 'react' import { useI18n } from 'cozy-ui/transpiled/react/I18n' -import Button from 'cozy-ui/transpiled/react/Button' -import Infos from 'cozy-ui/transpiled/react/Infos' +import Button from 'cozy-ui/transpiled/react/deprecated/Button' +import Infos from 'cozy-ui/transpiled/react/deprecated/Infos' import Typography from 'cozy-ui/transpiled/react/Typography' import PropTypes from 'prop-types' diff --git a/src/components/CandidateCategoryTile.jsx b/src/components/CandidateCategoryTile.jsx index 9f80922af8..c7aacfd154 100644 --- a/src/components/CandidateCategoryTile.jsx +++ b/src/components/CandidateCategoryTile.jsx @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import Grid from 'cozy-ui/transpiled/react/MuiCozyTheme/Grid' +import Grid from 'cozy-ui/transpiled/react/Grid' import AppLinker from 'cozy-ui/transpiled/react/AppLinker' import { useClient, generateWebLink } from 'cozy-client' import AppIcon from 'cozy-ui/transpiled/react/AppIcon' diff --git a/src/components/CandidateServiceTile.jsx b/src/components/CandidateServiceTile.jsx index a8ab06bd7b..ee9320e944 100644 --- a/src/components/CandidateServiceTile.jsx +++ b/src/components/CandidateServiceTile.jsx @@ -1,7 +1,7 @@ import React, { useState } from 'react' import PropTypes from 'prop-types' import get from 'lodash/get' -import Alerter from 'cozy-ui/transpiled/react/Alerter' +import Alerter from 'cozy-ui/transpiled/react/deprecated/Alerter' import { useClient } from 'cozy-client' import useRegistryInformation from 'hooks/useRegistryInformation' import { KonnectorSuggestionModal } from 'cozy-harvest-lib' diff --git a/src/components/EmptyServicesListTip.jsx b/src/components/EmptyServicesListTip.jsx index 489d97b031..32e5bb08cf 100644 --- a/src/components/EmptyServicesListTip.jsx +++ b/src/components/EmptyServicesListTip.jsx @@ -1,6 +1,6 @@ import React from 'react' -import { Media, Img, Bd } from 'cozy-ui/transpiled/react/Media' +import { Media, Img, Bd } from 'cozy-ui/transpiled/react/deprecated/Media' import ArrowIllustration from 'assets/images/drawing-arrow-up.svg' import { useI18n } from 'cozy-ui/transpiled/react' import Typography from 'cozy-ui/transpiled/react/Typography' diff --git a/src/components/Failure.jsx b/src/components/Failure.jsx index 49a9d110f3..e129674617 100644 --- a/src/components/Failure.jsx +++ b/src/components/Failure.jsx @@ -1,7 +1,7 @@ import React from 'react' import Stack from 'cozy-ui/transpiled/react/Stack' -import Button from 'cozy-ui/transpiled/react/Button' +import Button from 'cozy-ui/transpiled/react/deprecated/Button' import Icon from 'cozy-ui/transpiled/react/Icon' import EmptyIcon from 'assets/icons/color/default.svg' import { useI18n } from 'cozy-ui/transpiled/react' diff --git a/src/components/HeroHeader/CornerButton.jsx b/src/components/HeroHeader/CornerButton.jsx index 578755808e..8242d9b4d4 100644 --- a/src/components/HeroHeader/CornerButton.jsx +++ b/src/components/HeroHeader/CornerButton.jsx @@ -1,6 +1,6 @@ import React from 'react' import cx from 'classnames' -import Button, { ButtonLink } from 'cozy-ui/transpiled/react/Button' +import Button, { ButtonLink } from 'cozy-ui/transpiled/react/deprecated/Button' import { useCozyTheme } from 'cozy-ui/transpiled/react/CozyTheme' import useBreakpoints from 'cozy-ui/transpiled/react/hooks/useBreakpoints' import { makeStyles } from 'cozy-ui/transpiled/react/styles' diff --git a/src/components/KonnectorErrors.jsx b/src/components/KonnectorErrors.jsx index c59be3e54a..2d7afcc9f9 100644 --- a/src/components/KonnectorErrors.jsx +++ b/src/components/KonnectorErrors.jsx @@ -7,16 +7,16 @@ import { useClient, models } from 'cozy-client' import { useNavigate } from 'react-router-dom' import AppIcon from 'cozy-ui/transpiled/react/AppIcon' -import Button from 'cozy-ui/transpiled/react/Button' +import Button from 'cozy-ui/transpiled/react/deprecated/Button' import CrossButton from 'cozy-ui/transpiled/react/Icons/Cross' -import Divider from 'cozy-ui/transpiled/react/MuiCozyTheme/Divider' +import Divider from 'cozy-ui/transpiled/react/Divider' import Icon from 'cozy-ui/transpiled/react/Icon' import IconButton from 'cozy-ui/transpiled/react/IconButton' -import Infos from 'cozy-ui/transpiled/react/Infos' -import InfosCarrousel from 'cozy-ui/transpiled/react/InfosCarrousel' +import Infos from 'cozy-ui/transpiled/react/deprecated/Infos' +import InfosCarrousel from 'cozy-ui/transpiled/react/deprecated/InfosCarrousel' import Typography from 'cozy-ui/transpiled/react/Typography' import useBreakpoints from 'cozy-ui/transpiled/react/hooks/useBreakpoints' -import { Media, Bd } from 'cozy-ui/transpiled/react/Media' +import { Media, Bd } from 'cozy-ui/transpiled/react/deprecated/Media' import { getErrorLocaleBound, KonnectorJobError } from 'cozy-harvest-lib' import { useI18n } from 'cozy-ui/transpiled/react/I18n' diff --git a/src/components/KonnectorSuccess.jsx b/src/components/KonnectorSuccess.jsx index 8e2199b495..1b281eabad 100644 --- a/src/components/KonnectorSuccess.jsx +++ b/src/components/KonnectorSuccess.jsx @@ -4,7 +4,7 @@ import sortBy from 'lodash/sortBy' import React, { Component } from 'react' import PropTypes from 'prop-types' -import Button from 'cozy-ui/transpiled/react/Button' +import Button from 'cozy-ui/transpiled/react/deprecated/Button' import { translate } from 'cozy-ui/transpiled/react/I18n' import styles from 'styles/konnectorSuccess.styl' diff --git a/src/components/MoveModal.jsx b/src/components/MoveModal.jsx index 92ec4996fe..7f1706f7b1 100644 --- a/src/components/MoveModal.jsx +++ b/src/components/MoveModal.jsx @@ -2,7 +2,7 @@ import React, { useState } from 'react' import { useI18n } from 'cozy-ui/transpiled/react/I18n' import { useClient } from 'cozy-client' -import { Button } from 'cozy-ui/transpiled/react/Button' +import { Button } from 'cozy-ui/transpiled/react/deprecated/Button' import { IllustrationDialog } from 'cozy-ui/transpiled/react/CozyDialogs' import { useInstanceSettings } from 'hooks/useInstanceSettings' diff --git a/src/components/Shortcuts/ShortcutsView.jsx b/src/components/Shortcuts/ShortcutsView.jsx index 1b0689db04..9c0403fb98 100644 --- a/src/components/Shortcuts/ShortcutsView.jsx +++ b/src/components/Shortcuts/ShortcutsView.jsx @@ -1,6 +1,6 @@ import React from 'react' -import Divider from 'cozy-ui/transpiled/react/MuiCozyTheme/Divider' +import Divider from 'cozy-ui/transpiled/react/Divider' import { ShortcutLink } from 'components/ShortcutLink' diff --git a/src/components/Shortcuts/__snapshots__/ShortcutsView.spec.jsx.snap b/src/components/Shortcuts/__snapshots__/ShortcutsView.spec.jsx.snap index 447c0e01c8..c15c48bef2 100644 --- a/src/components/Shortcuts/__snapshots__/ShortcutsView.spec.jsx.snap +++ b/src/components/Shortcuts/__snapshots__/ShortcutsView.spec.jsx.snap @@ -9,7 +9,7 @@ Object { class="shortcuts-list-wrapper u-m-auto u-w-100" >

List title

@@ -78,7 +78,7 @@ Object { class="shortcuts-list-wrapper u-m-auto u-w-100" >

List title

@@ -204,7 +204,7 @@ Object { class="shortcuts-list-wrapper u-m-auto u-w-100" >

a

@@ -270,7 +270,7 @@ Object { class="shortcuts-list-wrapper u-m-auto u-w-100" >

c

@@ -339,7 +339,7 @@ Object { class="shortcuts-list-wrapper u-m-auto u-w-100" >

a

@@ -405,7 +405,7 @@ Object { class="shortcuts-list-wrapper u-m-auto u-w-100" >

c

diff --git a/src/containers/App.jsx b/src/containers/App.jsx index 3204462f3a..b30775f99c 100644 --- a/src/containers/App.jsx +++ b/src/containers/App.jsx @@ -7,7 +7,7 @@ import { Q, useClient } from 'cozy-client' import { useWebviewIntent } from 'cozy-intent' import { isFlagshipApp } from 'cozy-device-helper' -import Alerter from 'cozy-ui/transpiled/react/Alerter' +import Alerter from 'cozy-ui/transpiled/react/deprecated/Alerter' import IconSprite from 'cozy-ui/transpiled/react/Icon/Sprite' import Spinner from 'cozy-ui/transpiled/react/Spinner' import { Main } from 'cozy-ui/transpiled/react/Layout' diff --git a/yarn.lock b/yarn.lock index 5be9f0513d..ab0f428604 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8935,20 +8935,13 @@ cozy-client@^36.2.0: sift "^6.0.0" url-search-params-polyfill "^8.0.0" -cozy-device-helper@2.7.0, cozy-device-helper@^2.7.0: +cozy-device-helper@2.7.0, cozy-device-helper@^2.1.0, cozy-device-helper@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/cozy-device-helper/-/cozy-device-helper-2.7.0.tgz#573749997f18e5a1f11f720faec8c9bf2406beeb" integrity sha512-jMzW7s4IDuMivbsP8fo1IWW1z5l0wJ0u440E0fQmdsi+Zm/L9GXFKthLuuceYqXlH6c/APUCfpozJqjFMMHU1A== dependencies: lodash "^4.17.19" -cozy-device-helper@^1.7.5: - version "1.10.0" - resolved "https://registry.yarnpkg.com/cozy-device-helper/-/cozy-device-helper-1.10.0.tgz#86c102d32b012f648dbce36cc6031d3895ee95a2" - integrity sha512-0yqxsgBVlKNs4sI4j1x4Pi5JVsXOh4yf/8aS+KTGZjXHvMcDP1tfUlkWw3JmkWR9qihcBlkaE16TpGxdfsiNSA== - dependencies: - lodash "4.17.19" - cozy-device-helper@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/cozy-device-helper/-/cozy-device-helper-2.6.0.tgz#07d83e6e412244f92bba30a0e04560bf3e1abb79" @@ -8996,10 +8989,10 @@ cozy-flags@3.0.1: dependencies: microee "^0.0.6" -cozy-harvest-lib@^14.2.1: - version "14.2.1" - resolved "https://registry.yarnpkg.com/cozy-harvest-lib/-/cozy-harvest-lib-14.2.1.tgz#afbdf3cce7f50d7a91a2b84fe006893acff1a3bf" - integrity sha512-iT46+PP1aN7bsUFRZlJu66ScLh3/opvaKCrVbgYLDpq10e8UupW+g8P0/Zv6dlyYWxmYhMkGdQXK5kU/n8HzSQ== +cozy-harvest-lib@^15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/cozy-harvest-lib/-/cozy-harvest-lib-15.0.0.tgz#536c68f97d563f0a17488b0f83adfee5ab64f267" + integrity sha512-N+S1k+r3ubvapu+43hdR8iEUF/JxsRlxg4KejPnq+CfCYnE6kBt8Ub81hMgd56m4RvbXhP/jdCsuTj98JFQBVw== dependencies: "@cozy/minilog" "^1.0.0" "@sentry/browser" "^6.0.1" @@ -9037,17 +9030,18 @@ cozy-interapp@^0.5.4: resolved "https://registry.yarnpkg.com/cozy-interapp/-/cozy-interapp-0.5.7.tgz#75cafe1732ad660e2caf1ccf412f302594705f39" integrity sha512-laIL/ATYV9oZnmqS+LMoO9qzk8XjJ1v2/YrA1Po2rI8ia/MDgjYO07424x2RuvHhNOBPGjD+JmqwQ0rNDlLW+Q== -cozy-keys-lib@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/cozy-keys-lib/-/cozy-keys-lib-4.3.0.tgz#21de5bfc1a3147a63076205d2a24f911ffbdd349" - integrity sha512-3QoaGHCyZpDxMzfjDmSo3NY27WOVJ24PYcwVdh9rFa8OdXe9E/1bJVWj2nW/9AmUJKcvGVVKD93n8mS120WNoA== +cozy-keys-lib@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cozy-keys-lib/-/cozy-keys-lib-5.0.0.tgz#7c52c60e620aa5ccaf2c8014418e2b0a1b3b0ea6" + integrity sha512-kl+mtbUqgopASRPW8MG4Lpd1yWgdnjN+klV7jpNe76yEbi/iuWB+xtq528TpTDe8OjieAiq5TnM/N+K1g997dg== dependencies: "@aspnet/signalr" "^1.1.4" "@aspnet/signalr-protocol-msgpack" "^1.1.0" "@cozy/minilog" "^1.0.0" big-integer "^1.6.44" classnames "^2.2.6" - cozy-device-helper "^1.7.5" + cozy-device-helper "^2.1.0" + cozy-logger "^1.10.1" lodash "^4.17.15" lunr "^2.3.6" microee "^0.0.6" @@ -9194,10 +9188,10 @@ cozy-tsconfig@1.2.0: resolved "https://registry.yarnpkg.com/cozy-tsconfig/-/cozy-tsconfig-1.2.0.tgz#17e61f960f139fae4d26cbac2254b9ab632b269e" integrity sha512-TRHnY9goF3FzVlUbP7BcHxuN2XAA4AmppT4fHHZmTKaSwYTByVR1Al+riFMDbce94kJZ1wzl9WNLWQuqzGZ6Cw== -cozy-ui@^86.2.0: - version "86.2.0" - resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-86.2.0.tgz#9edd7693f420912c3c36eb5499f1f2b47e84a610" - integrity sha512-E6WmiCgzNfs1JcvbPt1pdRKtAWQ4TtLSmUfC8nCwN2wrcnapfjcQqfWLZZR+EoxfTkALkZRC5BaxsIfKzUQyiA== +cozy-ui@^88.1.1: + version "88.1.1" + resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-88.1.1.tgz#16d7adf6b0d1c726d2c19efeea6f4c6f405ce71d" + integrity sha512-mVQEooFek56MAYYSmLc7yp+iSXlWLCKF2HgpefcbSQ7x7gDuHNeIhVJ65N24auJ8g1UHVy61WE+JHKOoFFQ/ag== dependencies: "@babel/runtime" "^7.3.4" "@material-ui/core" "4.12.3" @@ -16056,9 +16050,9 @@ msgpack5@^4.0.2: readable-stream "^2.3.6" safe-buffer "^5.1.2" -"mui-bottom-sheet@https://github.com/cozy/mui-bottom-sheet.git#v1.0.9": +"mui-bottom-sheet@git+https://github.com/cozy/mui-bottom-sheet.git#v1.0.9": version "1.0.8" - resolved "https://github.com/cozy/mui-bottom-sheet.git#3dc4c2a245ab39079bc2f73546bccf80847be14c" + resolved "git+https://github.com/cozy/mui-bottom-sheet.git#3dc4c2a245ab39079bc2f73546bccf80847be14c" dependencies: "@juggle/resize-observer" "^3.1.3" jest-environment-jsdom-sixteen "^1.0.3"