Skip to content
Snippets Groups Projects
Commit 8317faa8 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge branch 'renovate/eslint-8.x' into 'dev'

chore(deps): update dependency eslint to v8

See merge request web-et-numerique/llle_project/ecolyo!650
parents 4904b778 0f33dc40
No related branches found
No related tags found
3 merge requests!683chore(release): 1.10.0,!681Draft: Dev,!650chore(deps): update dependency eslint to v8
...@@ -2,8 +2,8 @@ module.exports = { ...@@ -2,8 +2,8 @@ module.exports = {
parser: '@typescript-eslint/parser', // Specifies the ESLint parser parser: '@typescript-eslint/parser', // Specifies the ESLint parser
extends: [ extends: [
'plugin:react/recommended', // Uses the recommended rules from @eslint-plugin-react 'plugin:react/recommended', // Uses the recommended rules from @eslint-plugin-react
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from @typescript-eslint/eslint-plugin 'plugin:@typescript-eslint/eslint-recommended', // Uses the recommended rules from @typescript-eslint/eslint-plugin
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier 'prettier', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
'plugin:prettier/recommended', // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. 'plugin:prettier/recommended', // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
'plugin:react-hooks/recommended', 'plugin:react-hooks/recommended',
], ],
...@@ -17,7 +17,6 @@ module.exports = { ...@@ -17,7 +17,6 @@ module.exports = {
rules: { rules: {
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
'@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-var-requires': 'warn',
'react/prop-types': 'warn', 'react/prop-types': 'warn',
}, },
settings: { settings: {
......
default: default:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:14.15.4-alpine image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:14.19.3-alpine
services: services:
- name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.9-dind - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.9-dind
alias: docker alias: docker
......
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
"@types/react-redux": "^7.1.11", "@types/react-redux": "^7.1.11",
"@types/react-router-dom": "^5.1.3", "@types/react-router-dom": "^5.1.3",
"@types/redux-mock-store": "^1.0.2", "@types/redux-mock-store": "^1.0.2",
"@typescript-eslint/eslint-plugin": "^2.10.0", "@typescript-eslint/eslint-plugin": "^5.30.0",
"@typescript-eslint/parser": "^2.10.0", "@typescript-eslint/parser": "^5.30.0",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"babel-preset-cozy-app": "1.12.0", "babel-preset-cozy-app": "1.12.0",
"copy-webpack-plugin": "6.4.1", "copy-webpack-plugin": "6.4.1",
...@@ -67,9 +67,9 @@ ...@@ -67,9 +67,9 @@
"cozy-jobs-cli": "^1.13.6", "cozy-jobs-cli": "^1.13.6",
"enzyme": "3.11.0", "enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6", "enzyme-adapter-react-16": "1.15.6",
"eslint": "^6.7.2", "eslint": "^8.18.0",
"eslint-config-prettier": "^6.7.0", "eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^3.1.1", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "7.30.1", "eslint-plugin-react": "7.30.1",
"eslint-plugin-react-hooks": "^4.2.0", "eslint-plugin-react-hooks": "^4.2.0",
"git-directory-deploy": "1.5.1", "git-directory-deploy": "1.5.1",
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
"mjml-web": "^4.10.0", "mjml-web": "^4.10.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"prettier": "^1.19.1", "prettier": "^1.19.1",
"prettier-eslint": "^9.0.1", "prettier-eslint": "^15.0.1",
"react-test-renderer": "16.14.0", "react-test-renderer": "16.14.0",
"redux-mock-store": "1.5.4", "redux-mock-store": "1.5.4",
"sass": "^1.49.11", "sass": "^1.49.11",
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
"cozy-ui": "68.8.0", "cozy-ui": "68.8.0",
"d3": "^5.15.0", "d3": "^5.15.0",
"detect-browser": "^5.1.1", "detect-browser": "^5.1.1",
"eslint-config-cozy-app": "1.6.0", "eslint-config-cozy-app": "4.2.0",
"global": "^4.4.0", "global": "^4.4.0",
"handlebars": "^4.7.7", "handlebars": "^4.7.7",
"handlebars-loader": "^1.7.1", "handlebars-loader": "^1.7.1",
......
/* eslint-disable @typescript-eslint/no-explicit-any */
import React, { useEffect } from 'react' import React, { useEffect } from 'react'
import { HashRouter } from 'react-router-dom' import { HashRouter } from 'react-router-dom'
import { Layout, Main, Content } from 'cozy-ui/transpiled/react/Layout' import { Layout, Main, Content } from 'cozy-ui/transpiled/react/Layout'
...@@ -34,7 +33,7 @@ export const App = ({ tracker }: AppProps) => { ...@@ -34,7 +33,7 @@ export const App = ({ tracker }: AppProps) => {
tracker.disconnectFromHistory() tracker.disconnectFromHistory()
} }
} }
}, [termsStatus.accepted, tracker]) }, [termsStatus.accepted, tracker, isDev])
return ( return (
<HashRouter {...history}> <HashRouter {...history}>
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment