Skip to content

Commit f9abc21

Browse files
authored
Merge pull request #218 from cozy/feat/update-deps
Update dependencies (cozy-ui 88, cozy-client 38)
2 parents 5aacc80 + b6a5293 commit f9abc21

File tree

8 files changed

+4611
-4411
lines changed

8 files changed

+4611
-4411
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: node_js
22
node_js:
3-
- '10'
3+
- '14.16'
44
addons:
55
apt:
66
packages:
7-
- libsecret-1-0
7+
- libsecret-1-dev
88
cache:
99
yarn: true
1010
directories:

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@
4949
"babel-plugin-mock-imports": "^1.0.2",
5050
"babel-plugin-rewire": "1.2.0",
5151
"babel-preset-cozy-app": "^1.6.0",
52-
"cozy-client": "^16.10.2",
53-
"cozy-flags": "2.6.0",
52+
"cozy-client": "^38.8.0",
53+
"cozy-flags": "2.8.6",
5454
"cozy-intent": "^2.0.2",
55-
"cozy-ui": "^42.3.0",
55+
"cozy-ui": "^88.1.0",
5656
"enzyme": "^3.10.0",
5757
"enzyme-adapter-react-16": "^1.14.0",
5858
"enzyme-to-json": "3.4.0",
5959
"eslint-config-cozy-app": "^1.2.2",
6060
"jest": "26.2.2",
61-
"react": "^16.8.3",
61+
"react": "^16.9.0",
6262
"react-dom": "^16.9.0",
6363
"semantic-release": "^15.13.24"
6464
},
@@ -73,7 +73,8 @@
7373
"@cozy/minilog": "^1.0.0",
7474
"big-integer": "^1.6.44",
7575
"classnames": "^2.2.6",
76-
"cozy-device-helper": "^1.7.5",
76+
"cozy-device-helper": "^2.1.0",
77+
"cozy-logger": "^1.10.1",
7778
"lodash": "^4.17.15",
7879
"lunr": "^2.3.6",
7980
"microee": "^0.0.6",
@@ -85,11 +86,11 @@
8586
"zxcvbn": "^4.4.2"
8687
},
8788
"peerDependencies": {
88-
"cozy-client": "^16.10.2",
89-
"cozy-flags": "^2.6.0",
89+
"cozy-client": "^38.8.0",
90+
"cozy-flags": "^2.8.6",
9091
"cozy-intent": "^2.0.2",
91-
"cozy-ui": "^42.3.0",
92-
"react": "^16.8.3",
92+
"cozy-ui": "^88.1.0",
93+
"react": "^16.9.0",
9394
"react-dom": "^16.9.0"
9495
}
9596
}

playgrounds/src/common/client.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ const getClient = customOptions => {
4444
clientName: 'Example App',
4545
softwareID: 'io.cozy.example',
4646
redirectURI: 'http://localhost:1234/auth'
47-
}
47+
},
48+
store: false
4849
},
4950
customOptions
5051
)

playgrounds/src/cozy-keys.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { createStore, combineReducers } from 'redux'
55
import App from './common/App'
66
import client from './common/client'
77
import 'cozy-ui/transpiled/react/stylesheet.css'
8-
import { Sprite } from 'cozy-ui/transpiled/react/Icon'
8+
import Sprite from 'cozy-ui/transpiled/react/Icon/Sprite'
99
import { withClient } from 'cozy-client'
1010

1111
import { VaultProvider, VaultUnlocker } from '../../transpiled'

src/components/PasswordField.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React, { useState } from 'react'
2-
import TextField from 'cozy-ui/transpiled/react/MuiCozyTheme/TextField'
2+
import TextField from 'cozy-ui/transpiled/react/TextField'
33
import InputAdornment from '@material-ui/core/InputAdornment'
44
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
55
import Icon from 'cozy-ui/transpiled/react/Icon'
66
import EyeIcon from 'cozy-ui/transpiled/react/Icons/Eye'
77
import EyeClosedIcon from 'cozy-ui/transpiled/react/Icons/EyeClosed'
8-
import MuiButton from 'cozy-ui/transpiled/react/MuiCozyTheme/Buttons'
8+
import MuiButton from 'cozy-ui/transpiled/react/Button'
99

1010
const EyeAdornment = props => {
1111
const { hidden, ...rest } = props

src/components/UnlockForm.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import flag from 'cozy-flags'
88
import Typography from 'cozy-ui/transpiled/react/Typography'
99
import useBreakpoints from 'cozy-ui/transpiled/react/hooks/useBreakpoints'
1010
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
11-
import Button from 'cozy-ui/transpiled/react/Button'
11+
import Button from 'cozy-ui/transpiled/react/deprecated/Button'
1212
import Icon from 'cozy-ui/transpiled/react/Icon'
1313
import CozyTheme from 'cozy-ui/transpiled/react/CozyTheme'
1414
import { IllustrationDialog } from 'cozy-ui/transpiled/react/CozyDialogs'

src/components/VaultUnlocker.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useContext, useState, useEffect } from 'react'
22
import PropTypes from 'prop-types'
33

44
import Spinner from 'cozy-ui/transpiled/react/Spinner'
5-
import Overlay from 'cozy-ui/transpiled/react/Overlay'
5+
import Overlay from 'cozy-ui/transpiled/react/deprecated/Overlay'
66
import withLocales from 'cozy-ui/transpiled/react/I18n/withLocales'
77

88
import localesEn from '../locales/en.json'

0 commit comments

Comments
 (0)