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

[VO-1184] feat: Update cozy-harvest-lib from 30.6.4 to 31.0.0 #2252

Merged
merged 3 commits into from
Nov 29, 2024
Merged

[VO-1184] feat: Update cozy-harvest-lib from 30.6.4 to 31.0.0 #2252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d722df
feat: Update react-router-dom from 6.6.2 to 6.28.0
cballevre Nov 25, 2024
5ff04c0
feat: Update cozy-harvest-lib from 30.6.1 to 31.0.0
cballevre Nov 25, 2024
e0d4279
feat: Deals with breaking change from [email protected]
cballevre Nov 25, 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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"cozy-devtools": "^1.2.1",
"cozy-doctypes": "1.83.8",
"cozy-flags": "4.0.0",
"cozy-harvest-lib": "^30.6.1",
"cozy-harvest-lib": "^31.0.0",
"cozy-intent": "^2.29.1",
"cozy-interapp": "^0.9.0",
"cozy-keys-lib": "^6.1.1",
Expand All @@ -68,7 +68,7 @@
"react-inspector": "5.1.1",
"react-redux": "7.2.6",
"react-remove-scroll": "^2.5.5",
"react-router-dom": "6.6.2",
"react-router-dom": "6.28.0",
"react-swipeable-views": "0.14.0",
"react-type-animation": "3.2.0",
"redux": "4.2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Konnector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useLocation, useNavigate, useParams } from 'react-router-dom'

import datacardOptions from 'cozy-harvest-lib/dist/datacards/datacardOptions'
import log from 'cozy-logger'
import { Routes as HarvestRoutes } from 'cozy-harvest-lib'
import { HarvestRoutes } from 'cozy-harvest-lib'

import { closeApp, openApp } from 'hooks/useOpenApp'
import { getKonnector } from 'ducks/konnectors'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Konnector.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { StatelessKonnector } from './Konnector'
import { act } from 'react-dom/test-utils'

jest.mock('cozy-harvest-lib', () => ({
Routes: ({ konnector, triggers, onDismiss }) => (
HarvestRoutes: ({ konnector, triggers, onDismiss }) => (
<div konnector={konnector} triggers={triggers} onClick={onDismiss}>
{konnector.slug}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/containers/App.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jest.mock('cozy-device-helper', () => ({
}))

jest.mock('cozy-harvest-lib', () => ({
Routes: ({ konnector, triggers, onDismiss }) => (
HarvestRoutes: ({ konnector, triggers, onDismiss }) => (
<div konnector={konnector} triggers={triggers} onClick={onDismiss}>
{konnector.slug}
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/targets/intents/HarvestRoute.jsx → src/targets/intents/KonnectorRoutes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { useEffect, useState } from 'react'
import { Routes } from 'cozy-harvest-lib'
import { HarvestRoutes } from 'cozy-harvest-lib'
import { useParams } from 'react-router-dom'
import CozyTheme from 'cozy-ui/transpiled/react/providers/CozyTheme'
import { useClient } from 'cozy-client'
import Intents from 'cozy-interapp'
import datacardOptions from 'cozy-harvest-lib/dist/datacards/datacardOptions'

export const HarvestRoutes = ({ intentData, intentId }) => {
export const KonnectorRoutes = ({ intentData, intentId }) => {
const { konnectorSlug } = useParams()
const client = useClient()

Expand All @@ -22,7 +22,7 @@ export const HarvestRoutes = ({ intentData, intentId }) => {

return (
<CozyTheme variant="normal">
<Routes
<HarvestRoutes
konnectorRoot={`/${konnectorSlug}`}
konnectorSlug={konnectorSlug}
onDismiss={() => (service ? service.cancel() : undefined)}
Expand Down
4 changes: 2 additions & 2 deletions src/targets/intents/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import IconSprite from 'cozy-ui/transpiled/react/Icon/Sprite'

import IntentHandler from 'containers/IntentHandler'
import AppWrapper, { AppContext } from 'components/AppWrapper'
import { HarvestRoutes } from './HarvestRoute'
import { KonnectorRoutes } from './KonnectorRoutes'

document.addEventListener('DOMContentLoaded', () => {
const container = document.querySelector('[role=application]')
Expand All @@ -29,7 +29,7 @@ document.addEventListener('DOMContentLoaded', () => {
<Route
path=":konnectorSlug/*"
element={
<HarvestRoutes intentData={data} intentId={intentId} />
<KonnectorRoutes intentData={data} intentId={intentId} />
}
/>
</Routes>
Expand Down
42 changes: 21 additions & 21 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3394,10 +3394,10 @@
"@react-spring/core" "9.0.0-rc.3"
"@react-spring/shared" "9.0.0-rc.3"

"@remix-run/router@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.2.1.tgz#812edd4104a15a493dda1ccac0b352270d7a188c"
integrity sha512-XiY0IsyHR+DXYS5vBxpoBe/8veTeoRpMHP+vDosLZxL5bnpetzI0igkxkLZS235ldLzyfkxF+2divEwWHP3vMQ==
"@remix-run/router@1.21.0":
version "1.21.0"
resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.21.0.tgz#c65ae4262bdcfe415dbd4f64ec87676e4a56e2b5"
integrity sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==

"@samverschueren/stream-to-observable@^0.3.0":
version "0.3.0"
Expand Down Expand Up @@ -6097,10 +6097,10 @@ [email protected]:
dependencies:
microee "^0.0.6"

cozy-harvest-lib@^30.6.1:
version "30.6.1"
resolved "https://registry.yarnpkg.com/cozy-harvest-lib/-/cozy-harvest-lib-30.6.1.tgz#1deb4a9297d7fba2c2d83465ff222b76bc4a73d7"
integrity sha512-360LAWd1monU3YbnZ1NECbHLF9w4ONypgBgMQ6hJBbBQRHaKuYB69OKTot+jUhhv9s01O+ht6/XA9ECkP8O33g==
cozy-harvest-lib@^31.0.0:
version "31.0.0"
resolved "https://registry.yarnpkg.com/cozy-harvest-lib/-/cozy-harvest-lib-31.0.0.tgz#de34ace573377ff7a4e1931cd2c661cc0db4e5ed"
integrity sha512-vB22AIGdl6H1VCAK+U9YFqV8s3pdbT2Pls1mYyzPYpgxCTGmE7jGYoI92m0gMvckEHC+TCCAyBb7NyKEUJKnug==
dependencies:
"@cozy/minilog" "^1.0.0"
classnames "^2.3.1"
Expand Down Expand Up @@ -12348,9 +12348,9 @@ msgpack5@^4.0.2:
readable-stream "^2.3.6"
safe-buffer "^5.1.2"

"mui-bottom-sheet@git+https://github.com/cozy/mui-bottom-sheet.git#v1.0.9":
"mui-bottom-sheet@https://github.com/cozy/mui-bottom-sheet.git#v1.0.9":
version "1.0.8"
resolved "git+https://github.com/cozy/mui-bottom-sheet.git#3dc4c2a245ab39079bc2f73546bccf80847be14c"
resolved "https://github.com/cozy/mui-bottom-sheet.git#3dc4c2a245ab39079bc2f73546bccf80847be14c"
dependencies:
"@juggle/resize-observer" "^3.1.3"
jest-environment-jsdom-sixteen "^1.0.3"
Expand Down Expand Up @@ -14140,20 +14140,20 @@ react-remove-scroll@^2.5.5:
use-callback-ref "^1.3.0"
use-sidecar "^1.1.2"

react-router-dom@6.6.2:
version "6.6.2"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.6.2.tgz#bbf1f9b45855b218d22fc2d294b79408a084740a"
integrity sha512-6SCDXxRQqW5af8ImOqKza7icmQ47/EMbz572uFjzvcArg3lZ+04PxSPp8qGs+p2Y+q+b+S/AjXv8m8dyLndIIA==
react-router-dom@6.28.0:
version "6.28.0"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.28.0.tgz#f73ebb3490e59ac9f299377062ad1d10a9f579e6"
integrity sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==
dependencies:
"@remix-run/router" "1.2.1"
react-router "6.6.2"
"@remix-run/router" "1.21.0"
react-router "6.28.0"

react-router@6.6.2:
version "6.6.2"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.6.2.tgz#556f7b56cff7fe32c5c02429fef3fcb2ecd08111"
integrity sha512-uJPG55Pek3orClbURDvfljhqFvMgJRo59Pktywkk8hUUkTY2aRfza8Yhl/vZQXs+TNQyr6tu+uqz/fLxPICOGQ==
react-router@6.28.0:
version "6.28.0"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.28.0.tgz#29247c86d7ba901d7e5a13aa79a96723c3e59d0d"
integrity sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==
dependencies:
"@remix-run/router" "1.2.1"
"@remix-run/router" "1.21.0"

react-select@^4.3.0:
version "4.3.0"
Expand Down
Loading