aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2021-02-22 15:05:24 +0000
committerGitHub <noreply@github.com>2021-02-22 15:05:24 +0000
commit3a1e6122af10265ee3edd976651c1d7575bea406 (patch)
tree0169fe26ae8ff12558546648eb68c23f0facb924
parentdc4a79752c01e1ef76f6be8b9d6ec835cc7c909a (diff)
parent16010dfc0396a29f0eca33ffafa51e243bf70aa5 (diff)
downloadtimeline-3a1e6122af10265ee3edd976651c1d7575bea406.tar.gz
timeline-3a1e6122af10265ee3edd976651c1d7575bea406.tar.bz2
timeline-3a1e6122af10265ee3edd976651c1d7575bea406.zip
Merge pull request #297 from crupest/dependabot/npm_and_yarn/FrontEnd/eslint-config-prettier-8.0.0
-rw-r--r--FrontEnd/.eslintrc.js2
-rw-r--r--FrontEnd/package.json2
2 files changed, 1 insertions, 3 deletions
diff --git a/FrontEnd/.eslintrc.js b/FrontEnd/.eslintrc.js
index 900489ed..9bb22216 100644
--- a/FrontEnd/.eslintrc.js
+++ b/FrontEnd/.eslintrc.js
@@ -10,8 +10,6 @@ module.exports = {
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:prettier/recommended",
- "prettier/react",
- "prettier/@typescript-eslint",
"plugin:react-hooks/recommended",
],
globals: {
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index d618bc9f..3f2aaa52 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -84,7 +84,7 @@
"copy-webpack-plugin": "^7.0.0",
"css-loader": "^5.0.2",
"eslint": "^7.20.0",
- "eslint-config-prettier": "^7.2.0",
+ "eslint-config-prettier": "^8.0.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",