Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cozy-harvest): Upgrade cozy-ui to 115.0.2 #2675

Merged
merged 2 commits into from
Dec 23, 2024
Merged

feat(cozy-harvest): Upgrade cozy-ui to 115.0.2 #2675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b14a1
feat(cozy-harvest): Upgrade cozy-ui to 115.0.2
Merkur39 Dec 20, 2024
38a567e
feat(cozy-harvest): Replace jsdom-sixteen package
Merkur39 Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cozy-harvest-lib/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
roots: ['src'],
resolver: 'jest-resolve-cached',
testPathIgnorePatterns: ['node_modules', 'dist'],
testEnvironment: 'jest-environment-jsdom-sixteen',
testEnvironment: 'jest-environment-jsdom',
testURL: 'http://localhost/',
moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json', 'styl'],
moduleDirectories: ['src', 'node_modules'],
Expand Down
14 changes: 7 additions & 7 deletions packages/cozy-harvest-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,23 @@
"babel-jest": "26.6.3",
"babel-plugin-inline-react-svg": "1.1.2",
"babel-preset-cozy-app": "^2.8.1",
"cozy-client": "^50.0.0",
"cozy-client": "^51.6.1",
"cozy-device-helper": "^3.7.1",
"cozy-flags": "^4.6.1",
"cozy-intent": "^2.29.1",
"cozy-interapp": "^0.15.1",
"cozy-keys-lib": "^6.1.1",
"cozy-realtime": "^5.6.2",
"cozy-tsconfig": "^1.8.1",
"cozy-ui": "^113.1.0",
"cozy-ui": "^115.0.2",
"cozy-viewer": "^11.3.1",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
"form-data": "4.0.0",
"identity-obj-proxy": "3.0.0",
"isomorphic-fetch": "^2.2.1",
"jest": "26.6.3",
"jest-environment-jsdom-sixteen": "1.0.3",
"jest-environment-jsdom": "26.6.2",
"jest-resolve-cached": "1.0.0",
"jsdom": "16.5.0",
"leaflet": "1.8.0",
Expand All @@ -97,15 +97,15 @@
"peerDependencies": {
"@babel/runtime": ">=7.12.5",
"@sentry/react": ">=7.118.0",
"cozy-client": ">=50.0.0",
"cozy-client": ">=51.6.1",
"cozy-device-helper": ">=2.6.0",
"cozy-flags": ">=2.3.5",
"cozy-intent": ">=2.26.0",
"cozy-intent": ">=2.29.1",
"cozy-interapp": ">=0.9.0",
"cozy-keys-lib": ">=6.1.1",
"cozy-realtime": ">=4.2.8",
"cozy-ui": ">=112.2.0",
"cozy-viewer": ">=2.3.0",
"cozy-ui": ">=115.0.2",
"cozy-viewer": ">=11.3.1",
"leaflet": "^1.7.1",
"react-router-dom": ">=6.14.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cozy-harvest-lib/src/datacards/FileDataCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const FileListItem = ({ divider, file, onClick, style }) => {
secondary={
<Typography variant="caption">
{t('datacards.files.imported', {
date: f(get(file, 'cozyMetadata.createdAt'), 'DD/MM/YYYY')
date: f(get(file, 'cozyMetadata.createdAt'), 'dd/LL/yyyy')
})}
</Typography>
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cozy-harvest-lib/src/jest.setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import minilog from '@cozy/minilog'
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom'
import { configure } from 'enzyme'
import Adapter from 'enzyme-adapter-react-16'
import 'isomorphic-fetch'
Expand Down
6 changes: 3 additions & 3 deletions packages/cozy-harvest-lib/src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"handle-synchronization": "Handle my synchronizations",
"desynchronized": {
"message": "you have desynchronized this account on %{date}",
"dateFormat": "MM/DD/YY"
"dateFormat": "LL/dd/yy"
}
},
"contractForm": {
Expand Down Expand Up @@ -100,7 +100,7 @@
"syncing": "Data recovery…",
"unknown": "Last sync. unknown",
"afterSomeTimes": "Sync. %{times} ago",
"format": "MM/DD/YYYY",
"format": "LL/dd/yyyy",
"disconnected": "Disconnected",
"justNow": "Sync. just now"
},
Expand Down Expand Up @@ -144,7 +144,7 @@
}
},
"default": {
"dateFormat": "MM/DD/YYYY",
"dateFormat": "LL/dd/yyyy",
"baseDir": "/Administrative"
},
"error": {
Expand Down
6 changes: 3 additions & 3 deletions packages/cozy-harvest-lib/src/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"handle-synchronization": "Gérer mes synchronisations",
"desynchronized": {
"message": "vous avez désynchronisé ce compte le %{date}",
"dateFormat": "DD/MM/YY"
"dateFormat": "dd/LL/yy"
}
},
"contractForm": {
Expand Down Expand Up @@ -100,7 +100,7 @@
"syncing": "Récupération des données…",
"unknown": "Dernière sync. inconnue",
"afterSomeTimes": "Sync. il y a %{times}",
"format": "DD/MM/YYYY",
"format": "dd/LL/yyyy",
"disconnected": "Déconnecté",
"justNow": "Sync. à l'instant"
},
Expand Down Expand Up @@ -144,7 +144,7 @@
}
},
"default": {
"dateFormat": "DD/MM/YYYY",
"dateFormat": "dd/LL/yyyy",
"baseDir": "/Administratif"
},
"error": {
Expand Down
6 changes: 3 additions & 3 deletions packages/cozy-harvest-lib/src/locales/nl_NL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"handle-synchronization": "Synchronisaties beheren",
"desynchronized": {
"message": "je hebt de synchroniastie met dit account stopgezet op %{date}",
"dateFormat": "DD-MM-YYYY"
"dateFormat": "dd-LL-yyyy"
}
},
"contractForm": {
Expand Down Expand Up @@ -100,7 +100,7 @@
"syncing": "Gegevensherstel…",
"unknown": "Onbekend",
"afterSomeTimes": "%{times} geleden gesynchroniseerd",
"format": "DD-MM-YYYY",
"format": "dd-LL-yyyy",
"disconnected": "Losgekoppeld",
"justNow": "Zojuist gesynchroniseerd"
},
Expand Down Expand Up @@ -144,7 +144,7 @@
}
},
"default": {
"dateFormat": "DD-MM-YYYY",
"dateFormat": "dd-LL-yyyy",
"baseDir": "/Administratief"
},
"error": {
Expand Down
30 changes: 0 additions & 30 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11379,36 +11379,6 @@ cozy-ui@^111.19.0:
react-swipeable-views "^0.13.3"
rooks "^5.11.2"

cozy-ui@^113.1.0:
version "113.1.0"
resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-113.1.0.tgz#0623a55f92069a0959f0a72953d6b2d2c5ef3370"
integrity sha512-Wtq1Tw1D2qIcqPV1FhMFcW0P7DuJa9kgRu7WnxUwf6epYbhGceR0uRn9v1+UV3X4O09LNcjePeTD8exHAuLH9w==
dependencies:
"@babel/runtime" "^7.3.4"
"@material-ui/core" "4.12.3"
"@material-ui/lab" "^4.0.0-alpha.61"
"@popperjs/core" "^2.4.4"
chart.js "3.7.1"
classnames "^2.2.5"
cozy-interapp "^0.5.4"
date-fns "^1.28.5"
filesize "8.0.7"
hammerjs "^2.0.8"
intersection-observer "0.11.0"
mime-types "2.1.35"
mui-bottom-sheet "https://github.com/cozy/mui-bottom-sheet.git#v1.0.9"
node-polyglot "^2.5.0"
normalize.css "^8.0.0"
pdf-lib "1.17.1"
piwik-react-router "0.12.1"
react-chartjs-2 "4.1.0"
react-markdown "^4.0.8"
react-popper "^2.2.3"
react-remove-scroll "^2.4.0"
react-select "^4.3.0"
react-swipeable-views "^0.13.3"
rooks "^5.11.2"

cozy-ui@^115.0.2:
version "115.0.2"
resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-115.0.2.tgz#8976de6e6141bd7255092f6e432ddacdb18d4689"
Expand Down
Loading