Skip to content

Commit

Permalink
Merge pull request #218 from cozy/feat/update-deps
Browse files Browse the repository at this point in the history
Update dependencies (cozy-ui 88, cozy-client 38)
  • Loading branch information
zatteo authored Jun 30, 2023
2 parents 5aacc80 + b6a5293 commit f9abc21
Show file tree
Hide file tree
Showing 8 changed files with 4,611 additions and 4,411 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: node_js
node_js:
- '10'
- '14.16'
addons:
apt:
packages:
- libsecret-1-0
- libsecret-1-dev
cache:
yarn: true
directories:
Expand Down
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@
"babel-plugin-mock-imports": "^1.0.2",
"babel-plugin-rewire": "1.2.0",
"babel-preset-cozy-app": "^1.6.0",
"cozy-client": "^16.10.2",
"cozy-flags": "2.6.0",
"cozy-client": "^38.8.0",
"cozy-flags": "2.8.6",
"cozy-intent": "^2.0.2",
"cozy-ui": "^42.3.0",
"cozy-ui": "^88.1.0",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"enzyme-to-json": "3.4.0",
"eslint-config-cozy-app": "^1.2.2",
"jest": "26.2.2",
"react": "^16.8.3",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"semantic-release": "^15.13.24"
},
Expand All @@ -73,7 +73,8 @@
"@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",
Expand All @@ -85,11 +86,11 @@
"zxcvbn": "^4.4.2"
},
"peerDependencies": {
"cozy-client": "^16.10.2",
"cozy-flags": "^2.6.0",
"cozy-client": "^38.8.0",
"cozy-flags": "^2.8.6",
"cozy-intent": "^2.0.2",
"cozy-ui": "^42.3.0",
"react": "^16.8.3",
"cozy-ui": "^88.1.0",
"react": "^16.9.0",
"react-dom": "^16.9.0"
}
}
3 changes: 2 additions & 1 deletion playgrounds/src/common/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ const getClient = customOptions => {
clientName: 'Example App',
softwareID: 'io.cozy.example',
redirectURI: 'http://localhost:1234/auth'
}
},
store: false
},
customOptions
)
Expand Down
2 changes: 1 addition & 1 deletion playgrounds/src/cozy-keys.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { createStore, combineReducers } from 'redux'
import App from './common/App'
import client from './common/client'
import 'cozy-ui/transpiled/react/stylesheet.css'
import { Sprite } from 'cozy-ui/transpiled/react/Icon'
import Sprite from 'cozy-ui/transpiled/react/Icon/Sprite'
import { withClient } from 'cozy-client'

import { VaultProvider, VaultUnlocker } from '../../transpiled'
Expand Down
4 changes: 2 additions & 2 deletions src/components/PasswordField.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { useState } from 'react'
import TextField from 'cozy-ui/transpiled/react/MuiCozyTheme/TextField'
import TextField from 'cozy-ui/transpiled/react/TextField'
import InputAdornment from '@material-ui/core/InputAdornment'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
import EyeIcon from 'cozy-ui/transpiled/react/Icons/Eye'
import EyeClosedIcon from 'cozy-ui/transpiled/react/Icons/EyeClosed'
import MuiButton from 'cozy-ui/transpiled/react/MuiCozyTheme/Buttons'
import MuiButton from 'cozy-ui/transpiled/react/Button'

const EyeAdornment = props => {
const { hidden, ...rest } = props
Expand Down
2 changes: 1 addition & 1 deletion src/components/UnlockForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import flag from 'cozy-flags'
import Typography from 'cozy-ui/transpiled/react/Typography'
import useBreakpoints from 'cozy-ui/transpiled/react/hooks/useBreakpoints'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
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 CozyTheme from 'cozy-ui/transpiled/react/CozyTheme'
import { IllustrationDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
Expand Down
2 changes: 1 addition & 1 deletion src/components/VaultUnlocker.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext, useState, useEffect } from 'react'
import PropTypes from 'prop-types'

import Spinner from 'cozy-ui/transpiled/react/Spinner'
import Overlay from 'cozy-ui/transpiled/react/Overlay'
import Overlay from 'cozy-ui/transpiled/react/deprecated/Overlay'
import withLocales from 'cozy-ui/transpiled/react/I18n/withLocales'

import localesEn from '../locales/en.json'
Expand Down
Loading

0 comments on commit f9abc21

Please sign in to comment.