Merge branch 'features/US172' into 'dev'

cozy-script 4.3 seems to close the deal

See merge request web-et-numerique/llle_project/ecolyo!75

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,

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"
   },

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({

src/components/CommonKit/Icon/StyledIcon.tsx

 import React from 'react'
-import Icon from 'cozy-ui/react/Icon'
+import Icon from 'cozy-ui/transpiled/react/Icon'
 
 interface StyledIconProps {
   className?: string

src/components/ContainerComponents/ViewContainer/ViewContainer.tsx

 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'

src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx

 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'
 

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'
 

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'

src/cozy-ui.d.ts

 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'

src/styles/index.scss

 /* 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';