diff --git a/app.config.js b/app.config.js index e358ccca9f01aef0b999a736a209bd143d53ec1b..21d137b224ff8a6abcce6759d71ff6716667402e 100644 --- a/app.config.js +++ b/app.config.js @@ -24,7 +24,7 @@ const configs = [ require('cozy-scripts/config/webpack.config.intents'), require('cozy-scripts/config/webpack.config.public'), require('cozy-scripts/config/webpack.config.pictures'), - require('cozy-scripts/config/webpack.config.assets'), + // require('cozy-scripts/config/webpack.config.assets'), require('cozy-scripts/config/webpack.config.manifest'), require('cozy-scripts/config/webpack.config.progress'), addAnalyzer ? require('cozy-scripts/config/webpack.config.analyzer') : null, diff --git a/package.json b/package.json index 9b3078f2a6497ba92e4a5e726f6526f2070ba367..44082238e4e2a1d7727e75ff67b010597afd6882 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "watch": "yarn watch:browser", "watch:browser": "cs watch --browser", "watch:mobile": "cs watch --mobile", - "start:cs": "cs start --hot --browser --no-stack", + "start:cs": "cs start --hot --browser --no-stack --host ecolyo.cozy.tools", "deploy": "git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build} --repo=${DEPLOY_REPOSITORY:-https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git}", "deploy-dev": "git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build-dev} --repo=${DEPLOY_REPOSITORY:-https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git}", "test": "cs test --verbose --coverage", @@ -81,10 +81,10 @@ "@types/react-lottie": "^1.2.3", "axios": "^0.19.0", "cozy-bar": "^7.7.10", - "cozy-client": "6.49.0", + "cozy-client": "13.18.0", "cozy-harvest-lib": "^1.15.3", - "cozy-scripts": "2.0.2", - "cozy-ui": "21.7.0", + "cozy-scripts": "4.3.0", + "cozy-ui": "35.31.0", "d3": "^5.15.0", "detect-browser": "^5.1.1", "eslint-config-cozy-app": "1.1.12", @@ -95,10 +95,10 @@ "moment-timezone": "^0.5.27", "node-sass": "^4.13.0", "object-hash": "^2.0.3", - "react": "16.8.6", - "react-dom": "16.8.6", + "react": "16.12.0", + "react-dom": "16.12.0", "react-lottie": "^1.2.3", - "react-router-dom": "5.0.1", + "react-router-dom": "5.2.0", "react-swipeable-views": "0.13.4", "sass-loader": "^8.0.0" }, diff --git a/src/components/CommonKit/Card/StyledIconCard.tsx b/src/components/CommonKit/Card/StyledIconCard.tsx index fb092e71d431cedc8323841b140c33a36dcc9c4b..9ad31ae5ea936256094ecae5eaeb5ba2b064ce6c 100644 --- a/src/components/CommonKit/Card/StyledIconCard.tsx +++ b/src/components/CommonKit/Card/StyledIconCard.tsx @@ -6,7 +6,7 @@ import CardContent from '@material-ui/core/CardContent' import { withStyles } from '@material-ui/core/styles' import { FluidType } from 'enum/fluid.enum' import { getPicto } from 'utils/utils' -import Icon from 'cozy-ui/react/Icon' +import Icon from 'cozy-ui/transpiled/react/Icon' import Grid from '@material-ui/core/Grid' const CardBase = withStyles({ diff --git a/src/components/CommonKit/Icon/StyledIcon.tsx b/src/components/CommonKit/Icon/StyledIcon.tsx index 33ab7cc19056fa8dd16e7bb48feaa623ba6be166..d543c44124011a1574d9e61e6c32b3b830df921e 100644 --- a/src/components/CommonKit/Icon/StyledIcon.tsx +++ b/src/components/CommonKit/Icon/StyledIcon.tsx @@ -1,5 +1,5 @@ import React from 'react' -import Icon from 'cozy-ui/react/Icon' +import Icon from 'cozy-ui/transpiled/react/Icon' interface StyledIconProps { className?: string diff --git a/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx index 7fb2270c5bbdefe272780ee6e1f5a53d1572e116..989be9fe4515129ec96441ba9c45310e363d3a5c 100644 --- a/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx +++ b/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx @@ -1,8 +1,8 @@ import React from 'react' import { Route, Switch, Redirect, HashRouter } from 'react-router-dom' import { createBrowserHistory } from 'history' -import { Layout, Main, Content } from 'cozy-ui/react/Layout' -import { Sprite as IconSprite } from 'cozy-ui/react/Icon' +import { Layout, Main, Content } from 'cozy-ui/transpiled/react/Layout' +import { Sprite as IconSprite } from 'cozy-ui/transpiled/react/Icon' import { FluidType } from 'enum/fluid.enum' import AppContextProvider from 'components/Contexts/AppContextProvider' diff --git a/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx b/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx index 03b6ed72f469164b8d28f7874a8362bba77963ed..a40c105c19bcf531f15ca866765decdbc3e879da 100644 --- a/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx +++ b/src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx @@ -1,7 +1,7 @@ import React, { useState, useEffect, useContext } from 'react' import { EcogestureType } from 'services/dataChallengeContracts' import StyledEcogestureCard from 'components/CommonKit/Card/StyledEcogestureCard' -import Icon from 'cozy-ui/react/Icon' +import Icon from 'cozy-ui/transpiled/react/Icon' import def from 'assets/icons/visu/ecogesture/default.svg' import { AppContext } from 'components/Contexts/AppContextProvider' diff --git a/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx b/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx index b7d23eaedc7c3129352e0a5c4ee2cb4258e227f7..a1f0c520db66e8aa4145dbda849f9ae5c0c11587 100644 --- a/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx +++ b/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx @@ -4,7 +4,7 @@ import Modal from 'components/CommonKit/Modal/Modal' import { getPicto } from 'utils/utils' import { EcogestureType } from 'services/dataChallengeContracts' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' -import Icon from 'cozy-ui/react/Icon' +import Icon from 'cozy-ui/transpiled/react/Icon' import def from 'assets/icons/visu/ecogesture/default.svg' import { AppContext } from 'components/Contexts/AppContextProvider' diff --git a/src/components/ContentComponents/Navbar/Navbar.tsx b/src/components/ContentComponents/Navbar/Navbar.tsx index 438183a48a9efd78da7089660eca49cf5c579c60..79313475469bcf87576fbae3fa7b041f56a4ea14 100644 --- a/src/components/ContentComponents/Navbar/Navbar.tsx +++ b/src/components/ContentComponents/Navbar/Navbar.tsx @@ -2,7 +2,7 @@ import React, { useContext } from 'react' import { AppContext } from 'components/Contexts/AppContextProvider' import { translate } from 'cozy-ui/react/I18n' import { NavLink } from 'react-router-dom' -import Icon from 'cozy-ui/react/Icon' +import Icon from 'cozy-ui/transpiled/react/Icon' import ConsoIconOff from 'assets/icons/tabbar/conso/off.svg' import ChallengeIconOn from 'assets/icons/tabbar/defi/on.svg' diff --git a/src/cozy-ui.d.ts b/src/cozy-ui.d.ts index 628342b1be09a17632523354098fac469019e6fa..bf96cf6b8ec1363b57a004b9ed9bfe1f4b72b70d 100644 --- a/src/cozy-ui.d.ts +++ b/src/cozy-ui.d.ts @@ -1,4 +1,4 @@ declare module 'cozy-ui/react/I18n' -declare module 'cozy-ui/react/Icon' -declare module 'cozy-ui/react/Spinner' -declare module 'cozy-ui/react/Layout' +declare module 'cozy-ui/transpiled/react/Icon' +declare module 'cozy-ui/transpiled/react/Spinner' +declare module 'cozy-ui/transpiled/react/Layout' diff --git a/src/styles/index.scss b/src/styles/index.scss index ad38f164e4af647d3fb9fa5a91dc3262ad9acb55..c751f6f7cdb36501917389a1ff3b4061887a2032 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,7 +1,7 @@ /* Cozy UI utilities classes */ @import '~cozy-ui/dist/cozy-ui.min.css'; /* Cozy UI React components styles */ -@import '~cozy-ui/react/stylesheet.css'; +@import '~cozy-ui/transpiled/react/stylesheet.css'; /* App styles */ @import 'base/layout'; @import 'base/color';