From 3541d4aa13a00b4b15bf9fc60e15a59bd01effe9 Mon Sep 17 00:00:00 2001 From: JF-Cozy Date: Wed, 5 Nov 2025 09:57:29 +0100 Subject: [PATCH] feat: Upgrade packages --- package.json | 7 +- src/components/Actions/edit.js | 4 +- src/components/Actions/trash.jsx | 4 +- src/components/Actions/view.js | 4 +- src/components/AppProviders.jsx | 4 +- src/components/Common/StoreButton.jsx | 2 +- .../ContactCard/ContactFields/helpers.js | 2 +- .../ContactsList/ContactListItem.jsx | 8 +- .../ContactsList/ContactsEmptyList.jsx | 2 +- .../ContactsList/Virtualized/Cell.jsx | 2 +- .../Virtualized/VirtualizedList.jsx | 12 ++- .../ContactListItem.spec.js.snap | 16 ++-- src/components/ContentResult.jsx | 4 +- src/components/ContentResult.spec.jsx | 2 +- src/components/Intents/CreateContact.jsx | 2 +- src/components/Modals/ContactFormModal.jsx | 4 +- .../Modals/ContactFormModal/CreateModal.jsx | 4 +- .../Modals/ContactFormModal/EditModal.jsx | 4 +- src/components/Modals/ContactInfoTitle.jsx | 4 +- .../Modals/GroupDeleteConfirmationModal.jsx | 4 +- src/helpers/contacts.spec.js | 2 +- src/helpers/fetches.spec.js | 2 +- src/helpers/groups.js | 2 +- src/targets/browser/index.jsx | 1 + src/targets/intents/index.jsx | 1 + src/tests/Applike.jsx | 4 +- yarn.lock | 92 +++++++++++-------- 27 files changed, 116 insertions(+), 83 deletions(-) diff --git a/package.json b/package.json index d8ac21026..621d51b4f 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@sentry/integrations": "7.88.0", "@sentry/react": "7.88.0", "classnames": "2.3.1", - "cozy-bar": "^25.0.0", + "cozy-bar": "^27.0.0", "cozy-client": "^60.14.0", "cozy-dataproxy-lib": "^4.11.0", "cozy-device-helper": "^3.8.0", @@ -91,11 +91,12 @@ "cozy-minilog": "^3.10.0", "cozy-pouch-link": "^54.0.0", "cozy-realtime": "^5.0.0", - "cozy-search": "^0.6.0", + "cozy-search": "^0.13.0", "cozy-sharing": "^25.4.0", "cozy-stack-client": "^60.1.0", "cozy-tsconfig": "^1.8.1", - "cozy-ui": "^130.6.1", + "cozy-ui": "^133.0.0", + "cozy-ui-plus": "^2.1.0", "cozy-vcard": "^0.2.18", "final-form": "4.20.9", "final-form-arrays": "3.1.0", diff --git a/src/components/Actions/edit.js b/src/components/Actions/edit.js index eeeb0b6b4..a8113977b 100644 --- a/src/components/Actions/edit.js +++ b/src/components/Actions/edit.js @@ -4,13 +4,13 @@ import PenIcon from 'cozy-ui/transpiled/react/Icons/Pen' import { getAppI18n } from '@/locales/index' -export const edit = () => { +export const edit = ({ client }) => { const { t } = getAppI18n() const name = 'edit' const icon = PenIcon const label = t('edit') - const action = (docs, { client }) => { + const action = docs => { const contactId = docs[0]._id const webLink = generateWebLink({ diff --git a/src/components/Actions/trash.jsx b/src/components/Actions/trash.jsx index 89ab3fab7..17c7fda2d 100644 --- a/src/components/Actions/trash.jsx +++ b/src/components/Actions/trash.jsx @@ -19,11 +19,11 @@ import ConfirmDeleteActions from '../Common/ConfirmDeleteActions' * @param {object} options.t - Translation function * @returns {object} Object with action */ -export const trash = ({ clearSelection, showModal, hideModal, t }) => { +export const trash = ({ client, clearSelection, showModal, hideModal, t }) => { const name = 'trash' const label = t('SelectionBar.trash_action') const icon = TrashIcon - const action = (docs, { client }) => { + const action = docs => { const hasConnectedAccounts = doc => { return getConnectedAccounts(doc).length > 0 } diff --git a/src/components/Actions/view.js b/src/components/Actions/view.js index 002feae96..4a7bc7d2e 100644 --- a/src/components/Actions/view.js +++ b/src/components/Actions/view.js @@ -4,13 +4,13 @@ import People from 'cozy-ui/transpiled/react/Icons/People' import { getAppI18n } from '@/locales/index' -export const view = () => { +export const view = ({ client }) => { const { t } = getAppI18n() const name = 'view' const icon = People const label = t('view-contact') - const action = (docs, { client }) => { + const action = docs => { const contactId = docs[0]._id const webLink = generateWebLink({ diff --git a/src/components/AppProviders.jsx b/src/components/AppProviders.jsx index 0ad30cbd5..b10947dd9 100644 --- a/src/components/AppProviders.jsx +++ b/src/components/AppProviders.jsx @@ -5,15 +5,15 @@ import { BarProvider } from 'cozy-bar' import { CozyProvider } from 'cozy-client' import { DataProxyProvider } from 'cozy-dataproxy-lib' import { WebviewIntentProvider } from 'cozy-intent' -import SelectedGroupProvider from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelectProvider' import AlertProvider from 'cozy-ui/transpiled/react/providers/Alert' import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints' -import CozyTheme from 'cozy-ui/transpiled/react/providers/CozyTheme' import { I18n } from 'cozy-ui/transpiled/react/providers/I18n' import { StylesProvider, createGenerateClassName } from 'cozy-ui/transpiled/react/styles' +import SelectedGroupProvider from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelectProvider' +import CozyTheme from 'cozy-ui-plus/dist/providers/CozyTheme' import { ContactsDiplayedProvider } from './Contexts/ContactsDiplayed' import SearchProvider from './Contexts/Search' diff --git a/src/components/Common/StoreButton.jsx b/src/components/Common/StoreButton.jsx index 9e65f9af0..2e1c4b996 100644 --- a/src/components/Common/StoreButton.jsx +++ b/src/components/Common/StoreButton.jsx @@ -1,9 +1,9 @@ import React from 'react' import { useClient } from 'cozy-client' -import AppIcon from 'cozy-ui/transpiled/react/AppIcon' import Button from 'cozy-ui/transpiled/react/Buttons' import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n' +import AppIcon from 'cozy-ui-plus/dist/AppIcon' import { getFilteredStoreUrl } from '../../helpers/store' diff --git a/src/components/ContactCard/ContactFields/helpers.js b/src/components/ContactCard/ContactFields/helpers.js index 3316fa23a..e9952ee42 100644 --- a/src/components/ContactCard/ContactFields/helpers.js +++ b/src/components/ContactCard/ContactFields/helpers.js @@ -1,4 +1,4 @@ -import { makeCustomLabel } from 'cozy-ui/transpiled/react/Contacts/AddModal/ContactForm/helpers' +import { makeCustomLabel } from 'cozy-ui-plus/dist/Contacts/AddModal/ContactForm/helpers' const makeCustomOrSupportedLabel = ({ type, value, hasPrefix, t }) => { if (!value) return null diff --git a/src/components/ContactsList/ContactListItem.jsx b/src/components/ContactsList/ContactListItem.jsx index 4938715dc..264666fea 100644 --- a/src/components/ContactsList/ContactListItem.jsx +++ b/src/components/ContactsList/ContactListItem.jsx @@ -3,12 +3,12 @@ import PropTypes from 'prop-types' import React, { memo } from 'react' import { models } from 'cozy-client' -import ContactCozy from 'cozy-ui/transpiled/react/ContactsList/Contacts/ContactCozy' -import ContactEmail from 'cozy-ui/transpiled/react/ContactsList/Contacts/ContactEmail' -import ContactIdentity from 'cozy-ui/transpiled/react/ContactsList/Contacts/ContactIdentity' -import ContactPhone from 'cozy-ui/transpiled/react/ContactsList/Contacts/ContactPhone' import ListItem from 'cozy-ui/transpiled/react/ListItem' import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints' +import ContactCozy from 'cozy-ui-plus/dist/ContactsList/Contacts/ContactCozy' +import ContactEmail from 'cozy-ui-plus/dist/ContactsList/Contacts/ContactEmail' +import ContactIdentity from 'cozy-ui-plus/dist/ContactsList/Contacts/ContactIdentity' +import ContactPhone from 'cozy-ui-plus/dist/ContactsList/Contacts/ContactPhone' import ContactWithSelection from './ContactSelection' import { fullContactPropTypes } from '../ContactPropTypes' diff --git a/src/components/ContactsList/ContactsEmptyList.jsx b/src/components/ContactsList/ContactsEmptyList.jsx index eb42923af..3ab0fbd5d 100644 --- a/src/components/ContactsList/ContactsEmptyList.jsx +++ b/src/components/ContactsList/ContactsEmptyList.jsx @@ -2,7 +2,6 @@ import React from 'react' import { useNavigate } from 'react-router-dom' import Button from 'cozy-ui/transpiled/react/Buttons' -import { useSelectedGroup } from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelectProvider' import Empty from 'cozy-ui/transpiled/react/Empty' import Icon from 'cozy-ui/transpiled/react/Icon' import InfoIcon from 'cozy-ui/transpiled/react/Icons/Info' @@ -12,6 +11,7 @@ import Stack from 'cozy-ui/transpiled/react/Stack' import Infos from 'cozy-ui/transpiled/react/deprecated/Infos' import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints' import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n' +import { useSelectedGroup } from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelectProvider' import EmptyIcon from '../../assets/icons/empty-contact-list.svg' import { hasSelectedGroup } from '../../helpers/groups' diff --git a/src/components/ContactsList/Virtualized/Cell.jsx b/src/components/ContactsList/Virtualized/Cell.jsx index 7f395b332..5fdd7336a 100644 --- a/src/components/ContactsList/Virtualized/Cell.jsx +++ b/src/components/ContactsList/Virtualized/Cell.jsx @@ -1,12 +1,12 @@ import React, { useRef, useState } from 'react' import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu' -import ContactIdentity from 'cozy-ui/transpiled/react/ContactsList/Contacts/ContactIdentity' import Icon from 'cozy-ui/transpiled/react/Icon' import IconButton from 'cozy-ui/transpiled/react/IconButton' import DotsIcon from 'cozy-ui/transpiled/react/Icons/Dots' import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon' import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n' +import ContactIdentity from 'cozy-ui-plus/dist/ContactsList/Contacts/ContactIdentity' const Cell = ({ row, column, cell, actions }) => { const { t } = useI18n() diff --git a/src/components/ContactsList/Virtualized/VirtualizedList.jsx b/src/components/ContactsList/Virtualized/VirtualizedList.jsx index b8503826a..ab4dece64 100644 --- a/src/components/ContactsList/Virtualized/VirtualizedList.jsx +++ b/src/components/ContactsList/Virtualized/VirtualizedList.jsx @@ -4,6 +4,7 @@ import React from 'react' import { useNavigate } from 'react-router-dom' import { useClient } from 'cozy-client' +import { splitFilename } from 'cozy-client/dist/models/file' import { makeActions } from 'cozy-ui/transpiled/react/ActionsMenu/Actions' import { addToFavorites } from 'cozy-ui/transpiled/react/ActionsMenu/Actions/addToFavorites' import { removeFromFavorites } from 'cozy-ui/transpiled/react/ActionsMenu/Actions/removeFromFavorites' @@ -45,7 +46,16 @@ const VirtualizedList = ({ const isSelectionEnabled = selection.length > 0 const actions = makeActions( [view, edit, addToFavorites, removeFromFavorites, trash], - { selection, clearSelection, showModal, hideModal, client, t, isMobile } + { + selection, + clearSelection, + showModal, + hideModal, + client, + t, + isMobile, + splitFilename + } ) return ( diff --git a/src/components/ContactsList/__snapshots__/ContactListItem.spec.js.snap b/src/components/ContactsList/__snapshots__/ContactListItem.spec.js.snap index 2bcdd690c..8c4d8bebd 100644 --- a/src/components/ContactsList/__snapshots__/ContactListItem.spec.js.snap +++ b/src/components/ContactsList/__snapshots__/ContactListItem.spec.js.snap @@ -8,7 +8,7 @@ exports[`ContactListItem should match the contact snapshot 1`] = ` className="styles__o-layout___3TSz9 styles__o-layout-main-2panes___3ickD" >
  • JD
    @@ -84,19 +84,19 @@ exports[`ContactListItem should match the contact snapshot 1`] = `

    johndoe@localhost
    0123456789
    http://johndoe.mycozy.cloud diff --git a/src/components/ContentResult.jsx b/src/components/ContentResult.jsx index f790c6408..6c18e62a2 100644 --- a/src/components/ContentResult.jsx +++ b/src/components/ContentResult.jsx @@ -2,9 +2,9 @@ import PropTypes from 'prop-types' import React, { useContext, useEffect, useState } from 'react' import { useNavigate } from 'react-router-dom' -import { useSelectedGroup } from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelectProvider' -import Header from 'cozy-ui/transpiled/react/Contacts/Header' import { Content } from 'cozy-ui/transpiled/react/Layout' +import { useSelectedGroup } from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelectProvider' +import Header from 'cozy-ui-plus/dist/Contacts/Header' import ContactsList from './ContactsList/ContactsList.jsx' import ContactsDiplayedContext from './Contexts/ContactsDiplayed' diff --git a/src/components/ContentResult.spec.jsx b/src/components/ContentResult.spec.jsx index 71ff27dbf..27d1e42df 100644 --- a/src/components/ContentResult.spec.jsx +++ b/src/components/ContentResult.spec.jsx @@ -1,7 +1,7 @@ import { render, screen, fireEvent, act, waitFor } from '@testing-library/react' import React from 'react' -import { johnDoeContact } from 'cozy-ui/transpiled/react/Contacts/AddModal/mocks' +import { johnDoeContact } from 'cozy-ui-plus/dist/Contacts/AddModal/mocks' import ContentResult from './ContentResult' import { groups, contactWithGroup } from '../helpers/testData' diff --git a/src/components/Intents/CreateContact.jsx b/src/components/Intents/CreateContact.jsx index b2c1ee8db..af2cb0241 100644 --- a/src/components/Intents/CreateContact.jsx +++ b/src/components/Intents/CreateContact.jsx @@ -3,9 +3,9 @@ import PropTypes from 'prop-types' import React from 'react' import { withClient } from 'cozy-client' -import ContactForm from 'cozy-ui/transpiled/react/Contacts/AddModal/ContactForm' import IntentHeader from 'cozy-ui/transpiled/react/IntentHeader' import { translate } from 'cozy-ui/transpiled/react/providers/I18n' +import ContactForm from 'cozy-ui-plus/dist/Contacts/AddModal/ContactForm' import IntentMain from './IntentMain' diff --git a/src/components/Modals/ContactFormModal.jsx b/src/components/Modals/ContactFormModal.jsx index b4e8b62f6..1ced4cbcb 100644 --- a/src/components/Modals/ContactFormModal.jsx +++ b/src/components/Modals/ContactFormModal.jsx @@ -2,8 +2,8 @@ import React from 'react' import { useNavigate, useParams } from 'react-router-dom' import { useClient, useQuery, useQueryAll } from 'cozy-client' -import AddModal from 'cozy-ui/transpiled/react/Contacts/AddModal' -import { useSelectedGroup } from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelectProvider' +import AddModal from 'cozy-ui-plus/dist/Contacts/AddModal' +import { useSelectedGroup } from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelectProvider' import { createOrUpdateContact } from '../../connections/allContacts' import { makeContactWithIdentitiesAddresses } from '../../helpers/contacts' diff --git a/src/components/Modals/ContactFormModal/CreateModal.jsx b/src/components/Modals/ContactFormModal/CreateModal.jsx index 4657ca2aa..e51c4e2f3 100644 --- a/src/components/Modals/ContactFormModal/CreateModal.jsx +++ b/src/components/Modals/ContactFormModal/CreateModal.jsx @@ -2,8 +2,8 @@ import React from 'react' import { useNavigate } from 'react-router-dom' import { useClient, useQueryAll } from 'cozy-client' -import AddModal from 'cozy-ui/transpiled/react/Contacts/AddModal' -import { useSelectedGroup } from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelectProvider' +import AddModal from 'cozy-ui-plus/dist/Contacts/AddModal' +import { useSelectedGroup } from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelectProvider' import { createOrUpdateContact } from '@/connections/allContacts' import { buildContactsQueryByFamilyNameGivenNameEmailCozyUrl } from '@/queries/queries' diff --git a/src/components/Modals/ContactFormModal/EditModal.jsx b/src/components/Modals/ContactFormModal/EditModal.jsx index 565d9588e..70ef147fc 100644 --- a/src/components/Modals/ContactFormModal/EditModal.jsx +++ b/src/components/Modals/ContactFormModal/EditModal.jsx @@ -2,8 +2,8 @@ import React from 'react' import { useNavigate, useParams, useSearchParams } from 'react-router-dom' import { useClient, useQuery, useQueryAll } from 'cozy-client' -import AddModal from 'cozy-ui/transpiled/react/Contacts/AddModal' -import { useSelectedGroup } from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelectProvider' +import AddModal from 'cozy-ui-plus/dist/Contacts/AddModal' +import { useSelectedGroup } from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelectProvider' import { createOrUpdateContact } from '@/connections/allContacts' import { makeContactWithIdentitiesAddresses } from '@/helpers/contacts' diff --git a/src/components/Modals/ContactInfoTitle.jsx b/src/components/Modals/ContactInfoTitle.jsx index 1ecd9c077..a8558b97a 100644 --- a/src/components/Modals/ContactInfoTitle.jsx +++ b/src/components/Modals/ContactInfoTitle.jsx @@ -7,8 +7,6 @@ import { useNavigate } from 'react-router-dom' import { useClient } from 'cozy-client' import minilog from 'cozy-minilog' import Button from 'cozy-ui/transpiled/react/Buttons' -import GroupsSelect from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelect' -import Control from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/SelectBox/Control' import Grid from 'cozy-ui/transpiled/react/Grid' import Icon from 'cozy-ui/transpiled/react/Icon' import RenameIcon from 'cozy-ui/transpiled/react/Icons/Rename' @@ -17,6 +15,8 @@ import StarOutlineIcon from 'cozy-ui/transpiled/react/Icons/StarOutline' import TrashIcon from 'cozy-ui/transpiled/react/Icons/Trash' import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert' import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n' +import GroupsSelect from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelect' +import Control from 'cozy-ui-plus/dist/Contacts/GroupsSelect/SelectBox/Control' import { updateContact } from '../../connections/allContacts' import { updateContactGroups } from '../../helpers/groups' diff --git a/src/components/Modals/GroupDeleteConfirmationModal.jsx b/src/components/Modals/GroupDeleteConfirmationModal.jsx index 07ed24329..58b242a76 100644 --- a/src/components/Modals/GroupDeleteConfirmationModal.jsx +++ b/src/components/Modals/GroupDeleteConfirmationModal.jsx @@ -4,13 +4,13 @@ import { useNavigate, useParams } from 'react-router-dom' import { useClient } from 'cozy-client' import Button from 'cozy-ui/transpiled/react/Buttons' import Checkbox from 'cozy-ui/transpiled/react/Checkbox' -import { useSelectedGroup } from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelectProvider' -import { translatedDefaultSelectedGroup } from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/helpers' import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs' import Stack from 'cozy-ui/transpiled/react/Stack' import Typography from 'cozy-ui/transpiled/react/Typography' import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert' import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n' +import { useSelectedGroup } from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelectProvider' +import { translatedDefaultSelectedGroup } from 'cozy-ui-plus/dist/Contacts/GroupsSelect/helpers' import { cancelTrashContactsByGroupId, diff --git a/src/helpers/contacts.spec.js b/src/helpers/contacts.spec.js index 4550c7025..d6c88ab52 100644 --- a/src/helpers/contacts.spec.js +++ b/src/helpers/contacts.spec.js @@ -3,7 +3,7 @@ import MockDate from 'mockdate' import { johnDoeContact, johnDoeContactWithRelated -} from 'cozy-ui/transpiled/react/Contacts/AddModal/mocks' +} from 'cozy-ui-plus/dist/Contacts/AddModal/mocks' import { getConnectedAccounts, diff --git a/src/helpers/fetches.spec.js b/src/helpers/fetches.spec.js index a34f5c5bc..a55529256 100644 --- a/src/helpers/fetches.spec.js +++ b/src/helpers/fetches.spec.js @@ -1,6 +1,6 @@ import CozyClient from 'cozy-client' import { updateIndexFullNameAndDisplayName } from 'cozy-client/dist/models/contact' -import { johnDoeContact } from 'cozy-ui/transpiled/react/Contacts/AddModal/mocks' +import { johnDoeContact } from 'cozy-ui-plus/dist/Contacts/AddModal/mocks' import { fetchContactsToUpdateAndUpdateWith, diff --git a/src/helpers/groups.js b/src/helpers/groups.js index 5080f385d..1a5687f21 100644 --- a/src/helpers/groups.js +++ b/src/helpers/groups.js @@ -2,7 +2,7 @@ import differenceBy from 'lodash/differenceBy' import filter from 'lodash/filter' import get from 'lodash/get' -import { defaultSelectedGroup } from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/helpers' +import { defaultSelectedGroup } from 'cozy-ui-plus/dist/Contacts/GroupsSelect/helpers' export const updateContactGroups = (contact, nextGroups) => { const currentGroups = contact.groups.data diff --git a/src/targets/browser/index.jsx b/src/targets/browser/index.jsx index 905000dbd..1e882777e 100644 --- a/src/targets/browser/index.jsx +++ b/src/targets/browser/index.jsx @@ -1,6 +1,7 @@ /* eslint-disable import/order */ import 'cozy-ui/transpiled/react/stylesheet.css' import 'cozy-ui/dist/cozy-ui.utils.min.css' +import 'cozy-ui-plus/dist/stylesheet.css' import 'cozy-bar/dist/stylesheet.css' import AppProviders from '@/components/AppProviders' diff --git a/src/targets/intents/index.jsx b/src/targets/intents/index.jsx index 3262a1287..fd37c1066 100644 --- a/src/targets/intents/index.jsx +++ b/src/targets/intents/index.jsx @@ -3,6 +3,7 @@ import '@babel/polyfill' import 'cozy-ui/transpiled/react/stylesheet.css' import 'cozy-ui/dist/cozy-ui.utils.min.css' +import 'cozy-ui-plus/dist/stylesheet.css' import '../../styles/index.styl' import '../../styles/intent.styl' diff --git a/src/tests/Applike.jsx b/src/tests/Applike.jsx index d86c1f47e..7c15bb218 100644 --- a/src/tests/Applike.jsx +++ b/src/tests/Applike.jsx @@ -3,12 +3,12 @@ import { Provider } from 'react-redux' import { HashRouter } from 'react-router-dom' import { CozyProvider } from 'cozy-client' -import SelectedGroupProvider from 'cozy-ui/transpiled/react/Contacts/GroupsSelect/GroupsSelectProvider' import { Layout } from 'cozy-ui/transpiled/react/Layout' import AlertProvider from 'cozy-ui/transpiled/react/providers/Alert' import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints' -import CozyTheme from 'cozy-ui/transpiled/react/providers/CozyTheme' import I18n from 'cozy-ui/transpiled/react/providers/I18n' +import SelectedGroupProvider from 'cozy-ui-plus/dist/Contacts/GroupsSelect/GroupsSelectProvider' +import CozyTheme from 'cozy-ui-plus/dist/providers/CozyTheme' import getCozyClient from './client' import { ContactsDiplayedProvider } from '../components/Contexts/ContactsDiplayed' diff --git a/yarn.lock b/yarn.lock index bf6078da7..6c77a95a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5812,13 +5812,6 @@ __metadata: languageName: node linkType: hard -"classnames@npm:2.5.1": - version: 2.5.1 - resolution: "classnames@npm:2.5.1" - checksum: 10c0/afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69 - languageName: node - linkType: hard - "classnames@npm:^2.2.5, classnames@npm:^2.2.6": version: 2.3.2 resolution: "classnames@npm:2.3.2" @@ -5826,6 +5819,13 @@ __metadata: languageName: node linkType: hard +"classnames@npm:^2.5.1": + version: 2.5.1 + resolution: "classnames@npm:2.5.1" + checksum: 10c0/afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69 + languageName: node + linkType: hard + "cli-highlight@npm:2.1.11": version: 2.1.11 resolution: "cli-highlight@npm:2.1.11" @@ -6226,9 +6226,9 @@ __metadata: languageName: node linkType: hard -"cozy-bar@npm:^25.0.0": - version: 25.0.0 - resolution: "cozy-bar@npm:25.0.0" +"cozy-bar@npm:^27.0.0": + version: 27.0.0 + resolution: "cozy-bar@npm:27.0.0" dependencies: lodash.set: "npm:^4.3.2" lodash.unionwith: "npm:4.6.0" @@ -6249,10 +6249,11 @@ __metadata: cozy-realtime: ">=4.0.5" cozy-search: ">=0.4.0" cozy-ui: ">=122.12.1" + cozy-ui-plus: ">=2.1.0" react: ">=16.10.1" react-dom: ">=16.10.1" react-router-dom: ">=6.14.2" - checksum: 10c0/a92f1377bace9dc84fcdde68b2cf4c7653c463e45bbe3506e4a70314bf9005c683c586cdd57040a73ecd86a1aadedbbdaaffe287769f3405a15aa346e753f699 + checksum: 10c0/79bca9ee85926876fffe2940e8a68d6acd48d0b9e33954f414c8ef59991fe990beb08c720a54ab8498b221513713e77b87ac7c9ebe738f4718e9141f0bd167b8 languageName: node linkType: hard @@ -6441,7 +6442,7 @@ __metadata: bundlemon: "npm:3.1.0" classnames: "npm:2.3.1" cozy-app-publish: "npm:^0.41.0" - cozy-bar: "npm:^25.0.0" + cozy-bar: "npm:^27.0.0" cozy-client: "npm:^60.14.0" cozy-dataproxy-lib: "npm:^4.11.0" cozy-device-helper: "npm:^3.8.0" @@ -6456,11 +6457,12 @@ __metadata: cozy-minilog: "npm:^3.10.0" cozy-pouch-link: "npm:^54.0.0" cozy-realtime: "npm:^5.0.0" - cozy-search: "npm:^0.6.0" + cozy-search: "npm:^0.13.0" cozy-sharing: "npm:^25.4.0" cozy-stack-client: "npm:^60.1.0" cozy-tsconfig: "npm:^1.8.1" - cozy-ui: "npm:^130.6.1" + cozy-ui: "npm:^133.0.0" + cozy-ui-plus: "npm:^2.1.0" cozy-vcard: "npm:^0.2.18" eslint: "npm:^8.35.0" eslint-config-cozy-app: "npm:^6.1.0" @@ -6839,17 +6841,17 @@ __metadata: languageName: node linkType: hard -"cozy-search@npm:^0.6.0": - version: 0.6.0 - resolution: "cozy-search@npm:0.6.0" +"cozy-search@npm:^0.13.0": + version: 0.13.0 + resolution: "cozy-search@npm:0.13.0" dependencies: - classnames: "npm:2.5.1" - lodash: "npm:4.17.21" + classnames: "npm:^2.5.1" + lodash: "npm:^4.17.21" mime-types: "npm:2.1.35" react-type-animation: "npm:3.2.0" rooks: "npm:7.14.1" peerDependencies: - cozy-client: ">=54.0.0" + cozy-client: ">=54.8.0" cozy-device-helper: ">=3.7.1" cozy-flags: ">=4.6.1" cozy-intent: ">=2.26.0" @@ -6858,10 +6860,11 @@ __metadata: cozy-pouch-link: 54.0.0 cozy-realtime: ">=5.6.4" cozy-ui: ">=122.0.0" + cozy-ui-plus: ">=1.2.0" react: ">=16.12.0" react-dom: ">=16.12.0" react-router-dom: ^6.28.0 - checksum: 10c0/d725481460f618be508d335ad7d0c3718164d25862c6e6ae643eef76e0bcad5437d611207be77fe312e548e45153d7ffdbcb3cbaf58db1d7f3a7aee3439dc1ea + checksum: 10c0/7bd8f62065bfb97039691523da01a4ab03ee1b710b2009a2b7b70944d219c6993e1da4eef4937e66c716709306e2926c42e25da3aa982f79f0c956b4ee07cffc languageName: node linkType: hard @@ -6955,9 +6958,35 @@ __metadata: languageName: node linkType: hard -"cozy-ui@npm:^130.6.1": - version: 130.6.1 - resolution: "cozy-ui@npm:130.6.1" +"cozy-ui-plus@npm:^2.1.0": + version: 2.1.0 + resolution: "cozy-ui-plus@npm:2.1.0" + dependencies: + classnames: "npm:^2.5.1" + cozy-interapp: "npm:^0.5.4" + filesize: "npm:8.0.7" + final-form: "npm:4.20.9" + final-form-arrays: "npm:3.1.0" + lodash: "npm:^4.17.21" + mime-types: "npm:2.1.35" + react-final-form: "npm:6.5.9" + react-final-form-arrays: "npm:3.1.4" + rooks: "npm:7.14.1" + peerDependencies: + cozy-client: ">=60.5.0" + cozy-device-helper: ">=2.0.0" + cozy-intent: ">=2.30.0" + cozy-logger: ">=1.17.0" + cozy-ui: ">=132.0.0" + react: ^16 || ^17 || ^18 + react-dom: ^16 || ^17 || ^18 + checksum: 10c0/5a95a91b4728c309cbcceac2fc9846fcae815fb50ac1aa0e9434bd6ea50f3eca31b2b0852608c862162726bbc6b72d6250f538d6a8da17f3e36bd85c1e2f28c0 + languageName: node + linkType: hard + +"cozy-ui@npm:^133.0.0": + version: 133.0.0 + resolution: "cozy-ui@npm:133.0.0" dependencies: "@babel/runtime": "npm:^7.3.4" "@date-io/date-fns": "npm:1" @@ -6967,22 +6996,15 @@ __metadata: "@popperjs/core": "npm:^2.4.4" chart.js: "npm:3.7.1" classnames: "npm:^2.2.5" - cozy-interapp: "npm:^0.5.4" date-fns: "npm:2.30.0" - filesize: "npm:8.0.7" - final-form: "npm:4.20.9" - final-form-arrays: "npm:3.1.0" hammerjs: "npm:^2.0.8" intersection-observer: "npm:0.11.0" - mime-types: "npm:2.1.35" mui-bottom-sheet: "git+https://github.com/cozy/mui-bottom-sheet.git#v1.0.9" node-polyglot: "npm:^2.5.0" normalize.css: "npm:^8.0.0" patch-package: "npm:^8.0.0" pdf-lib: "npm:1.17.1" react-chartjs-2: "npm:4.1.0" - react-final-form: "npm:6.5.9" - react-final-form-arrays: "npm:3.1.4" react-markdown: "npm:^4.0.8" react-popper: "npm:^2.2.3" react-remove-scroll: "npm:^2.4.0" @@ -6991,17 +7013,15 @@ __metadata: react-virtuoso: "npm:^4.13.0" rooks: "npm:7.14.1" peerDependencies: - cozy-client: ">=60.5.0" cozy-device-helper: ">=2.0.0" - cozy-flags: ">=2.10.1" cozy-intent: ">=2.29.1" - react: ^16.14.0 + react: ^16 || ^17 || ^18 react-dnd: ^16.0.1 react-dnd-html5-backend: ^16.0.1 - react-dom: ^16.14.0 + react-dom: ^16 || ^17 || ^18 bin: rsg-screenshots: scripts/screenshots.js - checksum: 10c0/e76a5fca586aac8e004e643ff9548f40deb274e949394b006dc38a384844d3454a066d10212e777dbb392ed2807e4168d258412b1859c469e22083b10eeacd8b + checksum: 10c0/ddc9d7b85cc7f64c170055f0a5727f3fc155b904ec6eccd2e25c3d1d111eb46cc0272c0e9c2ad96ce8046c760d14d5fe9acc65ecffdbcef336e10c03223342b5 languageName: node linkType: hard