Merge branch 'feature/US172-update_cozy-scripts' into 'dev'

Feature/us172 update cozy scripts

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

app.config.environment.dev.js

@@ -23,7 +23,7 @@ const stackProvidedLibsConfig = {
   module: {
     rules: [
       {
-        test: /cozy-bar\/dist\/cozy-bar\.min\.js$/,
+        test: /cozy-bar(\/|\\)dist(\/|\\)cozy-bar\.min\.js$/,
         // Automatically import the CSS if the JS is imported.
         // imports-loader@0.8.0 works but imports-loader@1.0.0 does not
         loader: 'imports-loader?css=./cozy-bar.min.css',

app.config.react.js

@@ -22,7 +22,7 @@ module.exports = {
     rules: [
       {
         test: /\.(ts|js)x?$/, // Add TS extensions
-        exclude: /node_modules\/(?!(cozy-ui))/,
+        exclude: /node_modules(\/|\\)(?!(cozy-ui))/,
         loader: require.resolve('cozy-scripts/node_modules/babel-loader'), // Add full path
         options: {
           cacheDirectory: 'node_modules/.cache/babel-loader/react',

src/components/CommonKit/Icon/StyledIcon.tsx

 import React from 'react'
-import { createAlt } from 'utils/utils'
+import Icon from 'cozy-ui/transpiled/react/Icon'
 
 interface StyledIconProps {
   className?: string
@@ -12,16 +12,7 @@ const StyledIcon: React.ComponentType<StyledIconProps> = ({
   icon,
   size = 16,
 }: StyledIconProps) => {
-  return (
-    <img
-      className={className}
-      src={icon}
-      alt={createAlt(icon)}
-      width={size}
-      height={size}
-    />
-  )
-  // return <Icon className={className} icon={icon} size={size} />
+  return <Icon className={className} icon={icon} size={size} />
 }
 
 export default StyledIcon

src/targets/browser/index.ejs

@@ -6,7 +6,7 @@
   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
   <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32">
   <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16">
-  <link rel="manifest" href="/site.webmanifest" crossOrigin="use-credentials">
+  <link rel="manifest" href="/manifest.json" crossOrigin="use-credentials">
   <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2">
   <meta name="theme-color" content="#ffffff">
   <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, viewport-fit=cover">

src/utils/utils.ts

@@ -12,7 +12,6 @@ import WaterParamIcon from 'assets/icons/visu/water-param.svg'
 import GasParamIcon from 'assets/icons/visu/gas-param.svg'
 import { FluidType } from '../enum/fluid.enum'
 import { DateTime } from 'luxon'
-import { ENEDIS_DAY_DOCTYPE } from 'doctypes'
 import { ITimePeriod, TimeStep } from '../services/dataConsumptionContracts'
 import { UserChallenge } from 'services/dataChallengeContracts'
 
@@ -134,8 +133,3 @@ export const convertDateByTimeStep = (
       return ''
   }
 }
-
-export const createAlt = (path: string) => {
-  const arr = path.split('/')
-  return arr[arr.length - 1].split('.')[0]
-}